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>

3 files changed, 6 insertions, 6 deletions

diff --git a/models-interactions/model-actors/actor.aai/src/main/java/org/onap/policy/controlloop/actor/aai/AaiActorServiceProvider.java b/models-interactions/model-actors/actor.aai/src/main/java/org/onap/policy/controlloop/actor/aai/AaiActor.java
index 0fe70b7ea..e8d1241f7 100644
--- a/models-interactions/model-actors/actor.aai/src/main/java/org/onap/policy/controlloop/actor/aai/AaiActorServiceProvider.java
+++ b/models-interactions/model-actors/actor.aai/src/main/java/org/onap/policy/controlloop/actor/aai/AaiActor.java
@@ -28,13 +28,13 @@ import org.onap.policy.controlloop.actorserviceprovider.parameters.HttpActorPara
 /**
  * A&AI Actor.
  */
-public class AaiActorServiceProvider extends HttpActor<HttpActorParams> {
+public class AaiActor extends HttpActor<HttpActorParams> {
     public static final String NAME = AaiConstants.ACTOR_NAME;
 
     /**
      * Constructs the object.
      */
-    public AaiActorServiceProvider() {
+    public AaiActor() {
         super(NAME, HttpActorParams.class);
 
         addOperator(new HttpOperator(NAME, AaiCustomQueryOperation.NAME, AaiCustomQueryOperation::new));
diff --git a/models-interactions/model-actors/actor.aai/src/main/resources/META-INF/services/org.onap.policy.controlloop.actorserviceprovider.spi.Actor b/models-interactions/model-actors/actor.aai/src/main/resources/META-INF/services/org.onap.policy.controlloop.actorserviceprovider.spi.Actor
index 6a52e3f17..eb6ec902e 100644
--- a/models-interactions/model-actors/actor.aai/src/main/resources/META-INF/services/org.onap.policy.controlloop.actorserviceprovider.spi.Actor
+++ b/models-interactions/model-actors/actor.aai/src/main/resources/META-INF/services/org.onap.policy.controlloop.actorserviceprovider.spi.Actor
@@ -1 +1 @@
-org.onap.policy.controlloop.actor.aai.AaiActorServiceProvider
+org.onap.policy.controlloop.actor.aai.AaiActor
diff --git a/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiActorServiceProviderTest.java b/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiActorTest.java
index 97a8491b2..e56a55139 100644
--- a/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiActorServiceProviderTest.java
+++ b/models-interactions/model-actors/actor.aai/src/test/java/org/onap/policy/controlloop/actor/aai/AaiActorTest.java
@@ -29,11 +29,11 @@ import java.util.stream.Collectors;
 import org.junit.Test;
 import org.onap.policy.controlloop.actor.test.BasicActor;
 
-public class AaiActorServiceProviderTest extends BasicActor {
+public class AaiActorTest extends BasicActor {
 
     @Test
     public void testAaiActorServiceProvider() {
-        final AaiActorServiceProvider prov = new AaiActorServiceProvider();
+        final AaiActor prov = new AaiActor();
 
         // verify that it has the operators we expect
         List<String> expected = new LinkedList<>();
@@ -48,6 +48,6 @@ public class AaiActorServiceProviderTest extends BasicActor {
         assertEquals(expected.toString(), actual.toString());
 
         // verify that it all plugs into the ActorService
-        verifyActorService(AaiActorServiceProvider.NAME, "service.yaml");
+        verifyActorService(AaiActor.NAME, "service.yaml");
     }
 }