Rename XxxActorServiceProvider to XxxActor

Renamed the actors and their test classes.

Addressed review comments:
- some license dates

Issue-ID: POLICY-2684
Change-Id: Ic9d83e146ef36bb305496d541166cb9f80544025
Signed-off-by: Jim Hahn <jrh3@att.com>

2 files changed, 5 insertions, 5 deletions

diff --git a/models-interactions/model-actors/actor.sdnr/src/main/java/org/onap/policy/controlloop/actor/sdnr/SdnrActorServiceProvider.java b/models-interactions/model-actors/actor.sdnr/src/main/java/org/onap/policy/controlloop/actor/sdnr/SdnrActor.java
index a43dcf774..b9f477d30 100644
--- a/models-interactions/model-actors/actor.sdnr/src/main/java/org/onap/policy/controlloop/actor/sdnr/SdnrActorServiceProvider.java
+++ b/models-interactions/model-actors/actor.sdnr/src/main/java/org/onap/policy/controlloop/actor/sdnr/SdnrActor.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * SdnrActorServiceProvider
+ * ONAP
  * ================================================================================
  * Copyright (C) 2018 Wipro Limited Intellectual Property. All rights reserved.
  * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved.
@@ -48,13 +48,13 @@ import org.slf4j.LoggerFactory;
  * SDNR is an unusual actor in that it uses a single, generic operator to initiate all
  * operation types. The action taken is always the same, only the operation name changes.
  */
-public class SdnrActorServiceProvider extends BidirectionalTopicActor<BidirectionalTopicActorParams>  {
+public class SdnrActor extends BidirectionalTopicActor<BidirectionalTopicActorParams>  {
 
     public static final String NAME = "SDNR";
 
     // TODO old code: remove lines down to **HERE**
 
-    private static final Logger logger = LoggerFactory.getLogger(SdnrActorServiceProvider.class);
+    private static final Logger logger = LoggerFactory.getLogger(SdnrActor.class);
 
     // Strings for targets
     private static final String TARGET_VNF = "VNF";
@@ -77,7 +77,7 @@ public class SdnrActorServiceProvider extends BidirectionalTopicActor<Bidirectio
     /**
      * Constructor.
      */
-    public SdnrActorServiceProvider() {
+    public SdnrActor() {
         super(NAME, BidirectionalTopicActorParams.class);
 
         addOperator(new BidirectionalTopicOperator(NAME, SdnrOperation.NAME, this, SdnrOperation.SELECTOR_KEYS,
diff --git a/models-interactions/model-actors/actor.sdnr/src/main/resources/META-INF/services/org.onap.policy.controlloop.actorserviceprovider.spi.Actor b/models-interactions/model-actors/actor.sdnr/src/main/resources/META-INF/services/org.onap.policy.controlloop.actorserviceprovider.spi.Actor
index c8d5e4c41..af71a9ff3 100644
--- a/models-interactions/model-actors/actor.sdnr/src/main/resources/META-INF/services/org.onap.policy.controlloop.actorserviceprovider.spi.Actor
+++ b/models-interactions/model-actors/actor.sdnr/src/main/resources/META-INF/services/org.onap.policy.controlloop.actorserviceprovider.spi.Actor
@@ -1 +1 @@
-org.onap.policy.controlloop.actor.sdnr.SdnrActorServiceProvider
+org.onap.policy.controlloop.actor.sdnr.SdnrActor