Bump mdsal to 4.0.0

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

diff --git a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/PrefixedShardConfigUpdateHandler.java b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/PrefixedShardConfigUpdateHandler.java
index ac209e3c6dbd532d0febb1f286610ee577874096..7dbdd290e69d9e6fa7be758c0d76b09387d78de2 100644 (file)
--- a/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/PrefixedShardConfigUpdateHandler.java
+++ b/opendaylight/md-sal/sal-distributed-datastore/src/main/java/org/opendaylight/controller/cluster/sharding/PrefixedShardConfigUpdateHandler.java
@@ -19,7 +19,6 @@ import java.util.Collection;
 import java.util.EnumMap;
 import java.util.List;
 import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
 import org.opendaylight.controller.cluster.access.concepts.MemberName;
 import org.opendaylight.controller.cluster.datastore.AbstractDataStore;
 import org.opendaylight.controller.cluster.datastore.config.PrefixShardConfiguration;
@@ -27,8 +26,9 @@ import org.opendaylight.controller.cluster.datastore.shardstrategy.PrefixShardSt
 import org.opendaylight.controller.cluster.datastore.utils.ClusterUtils;
 import org.opendaylight.controller.cluster.sharding.messages.PrefixShardCreated;
 import org.opendaylight.controller.cluster.sharding.messages.PrefixShardRemoved;
-import org.opendaylight.controller.md.sal.dom.api.ClusteredDOMDataTreeChangeListener;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.mdsal.dom.api.ClusteredDOMDataTreeChangeListener;
+import org.opendaylight.mdsal.dom.api.DOMDataTreeChangeListener;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeIdentifier;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
@@ -53,8 +53,7 @@ public class PrefixedShardConfigUpdateHandler {
     private final ActorRef handlingActor;
     private final MemberName memberName;
 
-    private final EnumMap<LogicalDatastoreType,
-            ListenerRegistration<org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeListener>> registrations =
+    private final EnumMap<LogicalDatastoreType,ListenerRegistration<DOMDataTreeChangeListener>> registrations =
             new EnumMap<>(LogicalDatastoreType.class);
 
     public PrefixedShardConfigUpdateHandler(final ActorRef handlingActor, final MemberName memberName) {
@@ -89,7 +88,7 @@ public class PrefixedShardConfigUpdateHandler {
         }
 
         @Override
-        public void onDataTreeChanged(@Nonnull final Collection<DataTreeCandidate> changes) {
+        public void onDataTreeChanged(final Collection<DataTreeCandidate> changes) {
             changes.forEach(this::resolveChange);
         }
 
@@ -97,21 +96,19 @@ public class PrefixedShardConfigUpdateHandler {
             switch (candidate.getRootNode().getModificationType()) {
                 case UNMODIFIED:
                     break;
-                case SUBTREE_MODIFIED:
                 case APPEARED:
-                case WRITE:
-                    resolveWrite(candidate.getRootNode());
-                    break;
                 case DELETE:
                 case DISAPPEARED:
-                    resolveDelete(candidate.getRootNode());
+                case SUBTREE_MODIFIED:
+                case WRITE:
+                    resolveModifiedRoot(candidate.getRootNode());
                     break;
                 default:
                     break;
             }
         }
 
-        private void resolveWrite(final DataTreeCandidateNode rootNode) {
+        private void resolveModifiedRoot(final DataTreeCandidateNode rootNode) {
 
             LOG.debug("{}: New config received {}", logName, rootNode);
             LOG.debug("{}: Data after: {}", logName, rootNode.getDataAfter());
@@ -183,10 +180,6 @@ public class PrefixedShardConfigUpdateHandler {
             handlingActor.tell(message, noSender());
         }
 
-        private void resolveDelete(final DataTreeCandidateNode rootNode) {
-
-        }
-
         @Override
         public String toString() {
             return "ShardConfigHandler [logName=" + logName + ", handlingActor=" + handlingActor + "]";