Merge "Use plain HashMap instead of IdentityHashMap"

2 files changed, 6 insertions, 5 deletions

diff --git a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/pipeline/FutureManager.java b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/pipeline/FutureManager.java
index aac2f77b7..42aaa820d 100644
--- a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/pipeline/FutureManager.java
+++ b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/pipeline/FutureManager.java
@@ -20,7 +20,8 @@
 
 package org.onap.policy.controlloop.actorserviceprovider.pipeline;
 
-import java.util.IdentityHashMap;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.Future;
 import lombok.NoArgsConstructor;
 
@@ -38,8 +39,7 @@ public class FutureManager extends ListenerManager {
      * needed if {@link #remove(Future)} is invoked, so that the same {@link Runnable} is
      * used each time.
      */
-    @SuppressWarnings("rawtypes")
-    private final IdentityHashMap<Future, Runnable> future2listener = new IdentityHashMap<>(5);
+    private final Map<Future<?>, Runnable> future2listener = new HashMap<>(5);
 
     /**
      * Adds a future that is to be canceled when this controller is stopped. Note: if the
diff --git a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/pipeline/ListenerManager.java b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/pipeline/ListenerManager.java
index 1d64a8710..b810de393 100644
--- a/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/pipeline/ListenerManager.java
+++ b/models-interactions/model-actors/actorServiceProvider/src/main/java/org/onap/policy/controlloop/actorserviceprovider/pipeline/ListenerManager.java
@@ -21,7 +21,8 @@
 package org.onap.policy.controlloop.actorserviceprovider.pipeline;
 
 import java.util.ArrayList;
-import java.util.IdentityHashMap;
+import java.util.HashMap;
+import java.util.Map;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import org.onap.policy.controlloop.actorserviceprovider.Util;
@@ -40,7 +41,7 @@ public class ListenerManager {
     /**
      * Listeners to be executed when {@link #stop()} is invoked.
      */
-    private final IdentityHashMap<Runnable, Void> listeners = new IdentityHashMap<>(5);
+    private final Map<Runnable, Void> listeners = new HashMap<>(5);
 
     /**
      * Indicates that operations within the pipeline should stop executing.