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, 7 insertions, 7 deletions

diff --git a/models-interactions/model-actors/actor.guard/src/main/java/org/onap/policy/controlloop/actor/guard/GuardActorServiceProvider.java b/models-interactions/model-actors/actor.guard/src/main/java/org/onap/policy/controlloop/actor/guard/GuardActor.java
index 1cf09d399..59b509291 100644
--- a/models-interactions/model-actors/actor.guard/src/main/java/org/onap/policy/controlloop/actor/guard/GuardActorServiceProvider.java
+++ b/models-interactions/model-actors/actor.guard/src/main/java/org/onap/policy/controlloop/actor/guard/GuardActor.java
@@ -1,6 +1,6 @@
 /*-
  * ============LICENSE_START=======================================================
- * SdncActorServiceProvider
+ * ONAP
  * ================================================================================
  * Copyright (C) 2018-2019 Huawei Intellectual Property. All rights reserved.
  * Modifications Copyright (C) 2019 Nordix Foundation.
@@ -25,14 +25,14 @@ package org.onap.policy.controlloop.actor.guard;
 import org.onap.policy.controlloop.actorserviceprovider.impl.HttpActor;
 import org.onap.policy.controlloop.actorserviceprovider.impl.OperationPartial;
 
-public class GuardActorServiceProvider extends HttpActor<GuardActorParams> {
+public class GuardActor extends HttpActor<GuardActorParams> {
     // actor name
     public static final String NAME = OperationPartial.GUARD_ACTOR_NAME;
 
     /**
      * Constructs the object.
      */
-    public GuardActorServiceProvider() {
+    public GuardActor() {
         super(NAME, GuardActorParams.class);
 
         addOperator(new DecisionOperator(NAME, DecisionOperation.NAME, DecisionOperation::new));
diff --git a/models-interactions/model-actors/actor.guard/src/main/resources/META-INF/services/org.onap.policy.controlloop.actorserviceprovider.spi.Actor b/models-interactions/model-actors/actor.guard/src/main/resources/META-INF/services/org.onap.policy.controlloop.actorserviceprovider.spi.Actor
index dd4368504..16d7591fa 100644
--- a/models-interactions/model-actors/actor.guard/src/main/resources/META-INF/services/org.onap.policy.controlloop.actorserviceprovider.spi.Actor
+++ b/models-interactions/model-actors/actor.guard/src/main/resources/META-INF/services/org.onap.policy.controlloop.actorserviceprovider.spi.Actor
@@ -1 +1 @@
-org.onap.policy.controlloop.actor.guard.GuardActorServiceProvider
+org.onap.policy.controlloop.actor.guard.GuardActor
diff --git a/models-interactions/model-actors/actor.guard/src/test/java/org/onap/policy/controlloop/actor/guard/GuardActorServiceProviderTest.java b/models-interactions/model-actors/actor.guard/src/test/java/org/onap/policy/controlloop/actor/guard/GuardActorTest.java
index 0ad8161c6..e5c3f139d 100644
--- a/models-interactions/model-actors/actor.guard/src/test/java/org/onap/policy/controlloop/actor/guard/GuardActorServiceProviderTest.java
+++ b/models-interactions/model-actors/actor.guard/src/test/java/org/onap/policy/controlloop/actor/guard/GuardActorTest.java
@@ -28,11 +28,11 @@ import java.util.stream.Collectors;
 import org.junit.Test;
 import org.onap.policy.controlloop.actor.test.BasicActor;
 
-public class GuardActorServiceProviderTest extends BasicActor {
+public class GuardActorTest extends BasicActor {
 
     @Test
     public void test() {
-        final GuardActorServiceProvider prov = new GuardActorServiceProvider();
+        final GuardActor prov = new GuardActor();
 
         // verify that it has the operators we expect
         var expected = Arrays.asList(DecisionOperation.NAME).stream().sorted().collect(Collectors.toList());
@@ -41,7 +41,7 @@ public class GuardActorServiceProviderTest extends BasicActor {
         assertEquals(expected.toString(), actual.toString());
 
         // verify that it all plugs into the ActorService
-        verifyActorService(GuardActorServiceProvider.NAME, "service.yaml");
+        verifyActorService(GuardActor.NAME, "service.yaml");
 
         assertTrue(prov.getOperator(DecisionOperation.NAME) instanceof DecisionOperator);
     }