diff options
Diffstat (limited to 'models-interactions')
3 files changed, 7 insertions, 32 deletions
diff --git a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/ActorService.java b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/ActorService.java index 22c7d3365..82f744421 100644 --- a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/ActorService.java +++ b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/ActorService.java @@ -47,10 +47,6 @@ public class ActorService extends StartConfigPartial<Map<String, Map<String, Obj private final Map<String, Actor> name2actor; - private static class LazyHolder { - static final ActorService INSTANCE = new ActorService(); - } - /** * Constructs the object and loads the list of actors. */ @@ -85,15 +81,6 @@ public class ActorService extends StartConfigPartial<Map<String, Map<String, Obj } /** - * Get the single instance. - * - * @return the instance - */ - public static ActorService getInstance() { - return LazyHolder.INSTANCE; - } - - /** * Gets a particular actor. * * @param name name of the actor of interest diff --git a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/ActorServiceProviderTest.java b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/ActorServiceProviderTest.java index 139c5179b..cca0694d7 100644 --- a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/ActorServiceProviderTest.java +++ b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/ActorServiceProviderTest.java @@ -23,7 +23,7 @@ package org.onap.policy.controlloop.actorserviceprovider; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import org.junit.Test; import org.onap.policy.controlloop.actorserviceprovider.spi.Actor; @@ -36,16 +36,11 @@ public class ActorServiceProviderTest { @Test public void testActorServiceProvider() { - ActorService actorService = ActorService.getInstance(); - assertNotNull(actorService); + ActorService actorService = new ActorService(); - assertEquals(1, actorService.getActors().size()); + assertTrue(actorService.getActors().size() >= 1); - actorService = ActorService.getInstance(); - assertNotNull(actorService); - - Actor dummyActor = ActorService.getInstance().getActors().iterator().next(); - assertNotNull(dummyActor); + Actor dummyActor = actorService.getActor(DummyActor.class.getSimpleName()); assertEquals("DummyActor", dummyActor.actor()); diff --git a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/ActorServiceTest.java b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/ActorServiceTest.java index efc7bb830..989fc8d6e 100644 --- a/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/ActorServiceTest.java +++ b/models-interactions/model-actors/actorServiceProvider/src/test/java/org/onap/policy/controlloop/actorserviceprovider/ActorServiceTest.java @@ -215,14 +215,6 @@ public class ActorServiceTest { } @Test - public void testGetInstance() { - service = ActorService.getInstance(); - assertNotNull(service); - - assertSame(service, ActorService.getInstance()); - } - - @Test public void testGetActor() { assertSame(actor1, service.getActor(ACTOR1)); assertSame(actor3, service.getActor(ACTOR3)); @@ -360,8 +352,9 @@ public class ActorServiceTest { @Test public void testLoadActors() { - assertFalse(ActorService.getInstance().getActors().isEmpty()); - assertNotNull(ActorService.getInstance().getActor("DummyActor")); + ActorService service = new ActorService(); + assertFalse(service.getActors().isEmpty()); + assertNotNull(service.getActor(DummyActor.class.getSimpleName())); } /** |