From: Jim Hahn <jrh3@att.com>
Date: Tue, 25 Feb 2020 18:53:28 +0000 (-0500)
Subject: Remove ActorService singleton
X-Git-Tag: 2.2.1~53^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=b527e4b2dba2d95231934180129d088e1c73c91c;p=policy%2Fmodels.git

Remove ActorService singleton

The ActorService singleton is not needed at this time, so it was
removed.

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

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.
      */
@@ -84,15 +80,6 @@ public class ActorService extends StartConfigPartial<Map<String, Map<String, Obj
         name2actor = ImmutableMap.copyOf(map);
     }
 
-    /**
-     * Get the single instance.
-     *
-     * @return the instance
-     */
-    public static ActorService getInstance() {
-        return LazyHolder.INSTANCE;
-    }
-
     /**
      * Gets a particular actor.
      *
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
@@ -214,14 +214,6 @@ public class ActorServiceTest {
         iter.next();
     }
 
-    @Test
-    public void testGetInstance() {
-        service = ActorService.getInstance();
-        assertNotNull(service);
-
-        assertSame(service, ActorService.getInstance());
-    }
-
     @Test
     public void testGetActor() {
         assertSame(actor1, service.getActor(ACTOR1));
@@ -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()));
     }
 
     /**