Cleanup warnings around methods being potentially static

[controller.git] / opendaylight / md-sal / sal-distributed-datastore / src / main / java / org / opendaylight / controller / cluster / datastore / entityownership / EntityOwnershipListenerSupport.java

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipListenerSupport.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipListenerSupport.java
index dd83e65f1d169a74175ee65fc8eeaf823a012e66..be82582e06d2e356b4446e0e51d86c4f7a125f7b 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipListenerSupport.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnershipListenerSupport.java
@@ -18,9 +18,10 @@ import java.util.HashSet;
 import java.util.IdentityHashMap;
 import java.util.Map;
 import java.util.Set;
-import org.opendaylight.controller.md.sal.common.api.clustering.Entity;
-import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipChange;
-import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipListener;
+import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChangeState;
+import org.opendaylight.mdsal.eos.dom.api.DOMEntity;
+import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipChange;
+import org.opendaylight.mdsal.eos.dom.api.DOMEntityOwnershipListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -34,9 +35,10 @@ class EntityOwnershipListenerSupport {
 
     private final String logId;
     private final ActorContext actorContext;
-    private final Map<EntityOwnershipListener, ListenerActorRefEntry> listenerActorMap = new IdentityHashMap<>();
-    private final Set<Entity> entitiesWithCandidateSet = new HashSet<>();
-    private final Multimap<String, EntityOwnershipListener> entityTypeListenerMap = HashMultimap.create();
+    private final Map<DOMEntityOwnershipListener, ListenerActorRefEntry> listenerActorMap = new IdentityHashMap<>();
+    private final Set<DOMEntity> entitiesWithCandidateSet = new HashSet<>();
+    private final Multimap<String, DOMEntityOwnershipListener> entityTypeListenerMap = HashMultimap.create();
+    private volatile boolean inJeopardy = false;
 
     EntityOwnershipListenerSupport(ActorContext actorContext, String logId) {
         this.actorContext = actorContext;
@@ -47,50 +49,63 @@ class EntityOwnershipListenerSupport {
         return logId;
     }
 
-    boolean hasCandidateForEntity(Entity entity) {
+    /**
+     * Set the in-jeopardy flag and indicate its previous state.
+     *
+     * @param inJeopardy new value of the in-jeopardy flag
+     * @return Previous value of the flag.
+     */
+    boolean setInJeopardy(final boolean inJeopardy) {
+        final boolean wasInJeopardy = this.inJeopardy;
+        this.inJeopardy = inJeopardy;
+        return wasInJeopardy;
+    }
+
+    boolean hasCandidateForEntity(DOMEntity entity) {
         return entitiesWithCandidateSet.contains(entity);
     }
 
-    void setHasCandidateForEntity(Entity entity) {
+    void setHasCandidateForEntity(DOMEntity entity) {
         entitiesWithCandidateSet.add(entity);
     }
 
-    void unsetHasCandidateForEntity(Entity entity) {
+    void unsetHasCandidateForEntity(DOMEntity entity) {
         entitiesWithCandidateSet.remove(entity);
     }
 
-    void addEntityOwnershipListener(String entityType, EntityOwnershipListener listener) {
+    void addEntityOwnershipListener(String entityType, DOMEntityOwnershipListener listener) {
         LOG.debug("{}: Adding EntityOwnershipListener {} for entity type {}", logId, listener, entityType);
 
         addListener(listener, entityType);
     }
 
-    void removeEntityOwnershipListener(String entityType, EntityOwnershipListener listener) {
+    void removeEntityOwnershipListener(String entityType, DOMEntityOwnershipListener listener) {
         LOG.debug("{}: Removing EntityOwnershipListener {} for entity type {}", logId, listener, entityType);
 
         removeListener(listener, entityType);
     }
 
-    void notifyEntityOwnershipListeners(Entity entity, boolean wasOwner, boolean isOwner, boolean hasOwner) {
+    void notifyEntityOwnershipListeners(DOMEntity entity, boolean wasOwner, boolean isOwner, boolean hasOwner) {
         notifyListeners(entity, entity.getType(), wasOwner, isOwner, hasOwner);
     }
 
-    void notifyEntityOwnershipListener(Entity entity, boolean wasOwner, boolean isOwner, boolean hasOwner,
-            EntityOwnershipListener listener) {
+    void notifyEntityOwnershipListener(DOMEntity entity, boolean wasOwner, boolean isOwner, boolean hasOwner,
+            DOMEntityOwnershipListener listener) {
         notifyListeners(entity, wasOwner, isOwner, hasOwner, Collections.singleton(listener));
     }
 
-    private void notifyListeners(Entity entity, String mapKey, boolean wasOwner, boolean isOwner, boolean hasOwner) {
-        Collection<EntityOwnershipListener> listeners = entityTypeListenerMap.get(mapKey);
-        if(!listeners.isEmpty()) {
+    private void notifyListeners(DOMEntity entity, String mapKey, boolean wasOwner, boolean isOwner, boolean hasOwner) {
+        Collection<DOMEntityOwnershipListener> listeners = entityTypeListenerMap.get(mapKey);
+        if (!listeners.isEmpty()) {
             notifyListeners(entity, wasOwner, isOwner, hasOwner, listeners);
         }
     }
 
-    private void notifyListeners(Entity entity, boolean wasOwner, boolean isOwner, boolean hasOwner,
-            Collection<EntityOwnershipListener> listeners) {
-        EntityOwnershipChange changed = new EntityOwnershipChange(entity, wasOwner, isOwner, hasOwner);
-        for(EntityOwnershipListener listener: listeners) {
+    private void notifyListeners(DOMEntity entity, boolean wasOwner, boolean isOwner, boolean hasOwner,
+            Collection<DOMEntityOwnershipListener> listeners) {
+        DOMEntityOwnershipChange changed = new DOMEntityOwnershipChange(entity,
+                EntityOwnershipChangeState.from(wasOwner, isOwner, hasOwner), inJeopardy);
+        for (DOMEntityOwnershipListener listener: listeners) {
             ActorRef listenerActor = listenerActorFor(listener);
 
             LOG.debug("{}: Notifying EntityOwnershipListenerActor {} with {}", logId, listenerActor, changed);
@@ -99,10 +114,10 @@ class EntityOwnershipListenerSupport {
         }
     }
 
-    private void addListener(EntityOwnershipListener listener, String mapKey) {
+    private void addListener(DOMEntityOwnershipListener listener, String mapKey) {
         if (entityTypeListenerMap.put(mapKey, listener)) {
             ListenerActorRefEntry listenerEntry = listenerActorMap.get(listener);
-            if(listenerEntry == null) {
+            if (listenerEntry == null) {
                 listenerActorMap.put(listener, new ListenerActorRefEntry());
             } else {
                 listenerEntry.referenceCount++;
@@ -110,17 +125,17 @@ class EntityOwnershipListenerSupport {
         }
     }
 
-    private void removeListener(EntityOwnershipListener listener, String mapKey) {
+    private void removeListener(DOMEntityOwnershipListener listener, String mapKey) {
         if (entityTypeListenerMap.remove(mapKey, listener)) {
             ListenerActorRefEntry listenerEntry = listenerActorMap.get(listener);
 
             LOG.debug("{}: Found {}", logId, listenerEntry);
 
             listenerEntry.referenceCount--;
-            if(listenerEntry.referenceCount <= 0) {
+            if (listenerEntry.referenceCount <= 0) {
                 listenerActorMap.remove(listener);
 
-                if(listenerEntry.actorRef != null) {
+                if (listenerEntry.actorRef != null) {
                     LOG.debug("Killing EntityOwnershipListenerActor {}", listenerEntry.actorRef);
                     listenerEntry.actorRef.tell(PoisonPill.getInstance(), ActorRef.noSender());
                 }
@@ -128,7 +143,7 @@ class EntityOwnershipListenerSupport {
         }
     }
 
-    private ActorRef listenerActorFor(EntityOwnershipListener listener) {
+    private ActorRef listenerActorFor(DOMEntityOwnershipListener listener) {
         return listenerActorMap.get(listener).actorFor(listener);
     }
 
@@ -136,8 +151,8 @@ class EntityOwnershipListenerSupport {
         ActorRef actorRef;
         int referenceCount = 1;
 
-        ActorRef actorFor(EntityOwnershipListener listener) {
-            if(actorRef == null) {
+        ActorRef actorFor(DOMEntityOwnershipListener listener) {
+            if (actorRef == null) {
                 actorRef = actorContext.actorOf(EntityOwnershipListenerActor.props(listener));
 
                 LOG.debug("{}: Created EntityOwnershipListenerActor {} for listener {}", logId, actorRef, listener);