Use singleton NodeIdentifierWithPredicates

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnerChangeListener.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnerChangeListener.java
index 428c42817ecf56f2fa96577b2f0f9a99b46a48e2..38dbae3865fca68afa2cec03424157027c6c4ac9 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnerChangeListener.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/datastore/entityownership/EntityOwnerChangeListener.java
@@ -7,14 +7,14 @@
  */
 package org.opendaylight.controller.cluster.datastore.entityownership;
 
+import static com.google.common.base.Verify.verifyNotNull;
+import static java.util.Objects.requireNonNull;
 import static org.opendaylight.controller.cluster.datastore.entityownership.EntityOwnersModel.createEntity;
 
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
-import com.google.common.base.Verify;
 import java.util.Collection;
 import java.util.Objects;
+import java.util.Optional;
 import org.opendaylight.controller.cluster.access.concepts.MemberName;
 import org.opendaylight.mdsal.eos.dom.api.DOMEntity;
 import org.opendaylight.yangtools.yang.data.api.schema.LeafNode;
@@ -33,11 +33,11 @@ class EntityOwnerChangeListener extends AbstractEntityOwnerChangeListener {
     private static final Logger LOG = LoggerFactory.getLogger(EntityOwnerChangeListener.class);
 
     private final String localMemberName;
-    private final EntityOwnershipListenerSupport listenerSupport;
+    private final EntityOwnershipChangePublisher publisher;
 
-    EntityOwnerChangeListener(final MemberName localMemberName, final EntityOwnershipListenerSupport listenerSupport) {
-        this.localMemberName = Verify.verifyNotNull(localMemberName.getName());
-        this.listenerSupport = Preconditions.checkNotNull(listenerSupport);
+    EntityOwnerChangeListener(final MemberName localMemberName, final EntityOwnershipChangePublisher publisher) {
+        this.localMemberName = verifyNotNull(localMemberName.getName());
+        this.publisher = requireNonNull(publisher);
     }
 
     @Override
@@ -70,12 +70,12 @@ class EntityOwnerChangeListener extends AbstractEntityOwnerChangeListener {
                     "{}: Calling notifyEntityOwnershipListeners: entity: {}, wasOwner: {}, isOwner: {}, hasOwner: {}",
                     logId(), entity, wasOwner, isOwner, hasOwner);
 
-                listenerSupport.notifyEntityOwnershipListeners(entity, wasOwner, isOwner, hasOwner);
+                publisher.notifyEntityOwnershipListeners(entity, wasOwner, isOwner, hasOwner);
             }
         }
     }
 
     private String logId() {
-        return listenerSupport.getLogId();
+        return publisher.getLogId();
     }
 }