summaryrefslogtreecommitdiffstats
path: root/models-interactions/model-actors/actor.sdnc/src
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2020-07-02 09:30:52 -0400
committerJim Hahn <jrh3@att.com>2020-07-02 12:49:44 -0400
commitc6012167b9692eb38bcb479f233543e93c51c998 (patch)
tree7a2a590eb659cd036f8815de9ce894e6099cf92b /models-interactions/model-actors/actor.sdnc/src
parente7ba97a66db5c0a45626aff62f9a167f88da62c1 (diff)
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>
Diffstat (limited to 'models-interactions/model-actors/actor.sdnc/src')
-rw-r--r--models-interactions/model-actors/actor.sdnc/src/main/java/org/onap/policy/controlloop/actor/sdnc/SdncActor.java (renamed from models-interactions/model-actors/actor.sdnc/src/main/java/org/onap/policy/controlloop/actor/sdnc/SdncActorServiceProvider.java)8
-rw-r--r--models-interactions/model-actors/actor.sdnc/src/main/resources/META-INF/services/org.onap.policy.controlloop.actorserviceprovider.spi.Actor2
-rw-r--r--models-interactions/model-actors/actor.sdnc/src/test/java/org/onap/policy/controlloop/actor/sdnc/SdncActorTest.java (renamed from models-interactions/model-actors/actor.sdnc/src/test/java/org/onap/policy/controlloop/actor/sdnc/SdncActorServiceProviderTest.java)12
3 files changed, 11 insertions, 11 deletions
diff --git a/models-interactions/model-actors/actor.sdnc/src/main/java/org/onap/policy/controlloop/actor/sdnc/SdncActorServiceProvider.java b/models-interactions/model-actors/actor.sdnc/src/main/java/org/onap/policy/controlloop/actor/sdnc/SdncActor.java
index cd9ad1ac2..a5cf65f34 100644
--- a/models-interactions/model-actors/actor.sdnc/src/main/java/org/onap/policy/controlloop/actor/sdnc/SdncActorServiceProvider.java
+++ b/models-interactions/model-actors/actor.sdnc/src/main/java/org/onap/policy/controlloop/actor/sdnc/SdncActor.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.
@@ -47,8 +47,8 @@ import org.onap.policy.sdnc.SdncRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class SdncActorServiceProvider extends HttpActor<HttpActorParams> {
- private static final Logger logger = LoggerFactory.getLogger(SdncActorServiceProvider.class);
+public class SdncActor extends HttpActor<HttpActorParams> {
+ private static final Logger logger = LoggerFactory.getLogger(SdncActor.class);
public static final String NAME = "SDNC";
@@ -75,7 +75,7 @@ public class SdncActorServiceProvider extends HttpActor<HttpActorParams> {
/**
* Constructs the object.
*/
- public SdncActorServiceProvider() {
+ public SdncActor() {
super(NAME, HttpActorParams.class);
addOperator(new HttpOperator(NAME, RerouteOperation.NAME, RerouteOperation::new));
diff --git a/models-interactions/model-actors/actor.sdnc/src/main/resources/META-INF/services/org.onap.policy.controlloop.actorserviceprovider.spi.Actor b/models-interactions/model-actors/actor.sdnc/src/main/resources/META-INF/services/org.onap.policy.controlloop.actorserviceprovider.spi.Actor
index f4d1e975e..0c66fdf75 100644
--- a/models-interactions/model-actors/actor.sdnc/src/main/resources/META-INF/services/org.onap.policy.controlloop.actorserviceprovider.spi.Actor
+++ b/models-interactions/model-actors/actor.sdnc/src/main/resources/META-INF/services/org.onap.policy.controlloop.actorserviceprovider.spi.Actor
@@ -1 +1 @@
-org.onap.policy.controlloop.actor.sdnc.SdncActorServiceProvider \ No newline at end of file
+org.onap.policy.controlloop.actor.sdnc.SdncActor
diff --git a/models-interactions/model-actors/actor.sdnc/src/test/java/org/onap/policy/controlloop/actor/sdnc/SdncActorServiceProviderTest.java b/models-interactions/model-actors/actor.sdnc/src/test/java/org/onap/policy/controlloop/actor/sdnc/SdncActorTest.java
index 752cb9125..020b09e8c 100644
--- a/models-interactions/model-actors/actor.sdnc/src/test/java/org/onap/policy/controlloop/actor/sdnc/SdncActorServiceProviderTest.java
+++ b/models-interactions/model-actors/actor.sdnc/src/test/java/org/onap/policy/controlloop/actor/sdnc/SdncActorTest.java
@@ -1,6 +1,6 @@
/*-
* ============LICENSE_START=======================================================
- * TestSdncActorServiceProvider
+ * ONAP
* ================================================================================
* Copyright (C) 2018-2019 Huawei. All rights reserved.
* Modifications Copyright (C) 2018-2020 AT&T Corp. All rights reserved.
@@ -40,7 +40,7 @@ import org.onap.policy.controlloop.actor.test.BasicActor;
import org.onap.policy.controlloop.policy.Policy;
import org.onap.policy.sdnc.SdncRequest;
-public class SdncActorServiceProviderTest extends BasicActor {
+public class SdncActorTest extends BasicActor {
private static final String REROUTE = RerouteOperation.NAME;
@@ -61,7 +61,7 @@ public class SdncActorServiceProviderTest extends BasicActor {
@Test
public void testSdncActorServiceProvider() {
- final SdncActorServiceProvider prov = new SdncActorServiceProvider();
+ final SdncActor prov = new SdncActor();
// verify that it has the operators we expect
var expected = Arrays.asList(BandwidthOnDemandOperation.NAME, RerouteOperation.NAME).stream().sorted()
@@ -71,7 +71,7 @@ public class SdncActorServiceProviderTest extends BasicActor {
assertEquals(expected.toString(), actual.toString());
// verify that it all plugs into the ActorService
- verifyActorService(SdncActorServiceProvider.NAME, "service.yaml");
+ verifyActorService(SdncActor.NAME, "service.yaml");
}
@Test
@@ -82,7 +82,7 @@ public class SdncActorServiceProviderTest extends BasicActor {
Policy policy = new Policy();
policy.setRecipe(REROUTE);
- SdncActorServiceProvider provider = new SdncActorServiceProvider();
+ SdncActor provider = new SdncActor();
assertNull(provider.constructRequest(onset, operation, policy));
onset.getAai().put("network-information.network-id", "network-5555");
@@ -113,7 +113,7 @@ public class SdncActorServiceProviderTest extends BasicActor {
@Test
public void testMethods() {
- SdncActorServiceProvider sp = new SdncActorServiceProvider();
+ SdncActor sp = new SdncActor();
assertEquals("SDNC", sp.actor());
assertEquals(1, sp.recipes().size());