Migrate callers of deprecated DataTreeCandidateNode methods

DataTreeCandidateNode has deprecated a number of methods, migrate its
callers.

Change-Id: Ie190e4bfa6c4e37c3f242d9b6220a5dcc9e3d20d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/AbstractDOMStoreTreeChangePublisher.java b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/AbstractDOMStoreTreeChangePublisher.java
index c4f43d19ebf1c7e5944b31ad03fb26134e4f243d..d7dbeed74456d7aa9d4da3449b56dce067d38a32 100644 (file)
--- a/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/AbstractDOMStoreTreeChangePublisher.java
+++ b/dom/mdsal-dom-spi/src/main/java/org/opendaylight/mdsal/dom/spi/store/AbstractDOMStoreTreeChangePublisher.java
@@ -68,7 +68,7 @@ public abstract class AbstractDOMStoreTreeChangePublisher
      */
     protected final boolean processCandidateTree(final @NonNull DataTreeCandidate candidate) {
         final DataTreeCandidateNode node = candidate.getRootNode();
-        if (node.getModificationType() == ModificationType.UNMODIFIED) {
+        if (node.modificationType() == ModificationType.UNMODIFIED) {
             LOG.debug("Skipping unmodified candidate {}", candidate);
             return false;
         }
@@ -137,27 +137,25 @@ public abstract class AbstractDOMStoreTreeChangePublisher
             final RegistrationTreeNode<AbstractDOMDataTreeChangeListenerRegistration<?>> regNode,
             final DataTreeCandidateNode candNode,
             final Multimap<AbstractDOMDataTreeChangeListenerRegistration<?>, DataTreeCandidate> listenerChanges) {
-        if (candNode.getModificationType() == ModificationType.UNMODIFIED) {
+        if (candNode.modificationType() == ModificationType.UNMODIFIED) {
             LOG.debug("Skipping unmodified candidate {}", path);
             return;
         }
 
-        final Collection<AbstractDOMDataTreeChangeListenerRegistration<?>> regs = regNode.getRegistrations();
+        final var regs = regNode.getRegistrations();
         if (!regs.isEmpty()) {
             addToListenerChanges(regs, path, candNode, listenerChanges);
         }
 
-        for (DataTreeCandidateNode candChild : candNode.getChildNodes()) {
-            if (candChild.getModificationType() != ModificationType.UNMODIFIED) {
-                final RegistrationTreeNode<AbstractDOMDataTreeChangeListenerRegistration<?>> regChild =
-                        regNode.getExactChild(candChild.getIdentifier());
+        for (var candChild : candNode.childNodes()) {
+            if (candChild.modificationType() != ModificationType.UNMODIFIED) {
+                final var regChild = regNode.getExactChild(candChild.name());
                 if (regChild != null) {
-                    notifyNode(path.node(candChild.getIdentifier()), regChild, candChild, listenerChanges);
+                    notifyNode(path.node(candChild.name()), regChild, candChild, listenerChanges);
                 }
 
-                for (RegistrationTreeNode<AbstractDOMDataTreeChangeListenerRegistration<?>> rc :
-                    regNode.getInexactChildren(candChild.getIdentifier())) {
-                    notifyNode(path.node(candChild.getIdentifier()), rc, candChild, listenerChanges);
+                for (var rc : regNode.getInexactChildren(candChild.name())) {
+                    notifyNode(path.node(candChild.name()), rc, candChild, listenerChanges);
                 }
             }
         }

diff --git a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/AbstractDOMStoreTreeChangePublisherTest.java b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/AbstractDOMStoreTreeChangePublisherTest.java
index d0d4611ad041cddbc1f26a0f1f1604816d28e1aa..483133a575ed1638e72c7b681babb0ea459fbb25 100644 (file)
--- a/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/AbstractDOMStoreTreeChangePublisherTest.java
+++ b/dom/mdsal-dom-spi/src/test/java/org/opendaylight/mdsal/dom/spi/store/AbstractDOMStoreTreeChangePublisherTest.java
@@ -24,7 +24,6 @@ import org.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidateNode;
 import org.opendaylight.yangtools.yang.data.tree.api.ModificationType;
 
 public class AbstractDOMStoreTreeChangePublisherTest extends AbstractDOMStoreTreeChangePublisher {
-
     private static boolean removeInvoked = false;
     private static boolean notifyInvoked = false;
 
@@ -36,22 +35,22 @@ public class AbstractDOMStoreTreeChangePublisherTest extends AbstractDOMStoreTre
                 .node(QName.create("", "node1")).node(QName.create("", "node2")).build();
 
         doReturn(dataTreeCandidateNode).when(dataTreeCandidate).getRootNode();
-        doReturn(ModificationType.WRITE).when(dataTreeCandidateNode).getModificationType();
+        doReturn(ModificationType.WRITE).when(dataTreeCandidateNode).modificationType();
         doReturn(yangInstanceIdentifier).when(dataTreeCandidate).getRootPath();
-        doReturn(ImmutableList.of(dataTreeCandidateNode)).when(dataTreeCandidateNode).getChildNodes();
-        doReturn(yangInstanceIdentifier.getLastPathArgument()).when(dataTreeCandidateNode).getIdentifier();
+        doReturn(ImmutableList.of(dataTreeCandidateNode)).when(dataTreeCandidateNode).childNodes();
+        doReturn(yangInstanceIdentifier.getLastPathArgument()).when(dataTreeCandidateNode).name();
 
         final DOMDataTreeChangeListener domDataTreeChangeListener = mock(DOMDataTreeChangeListener.class);
 
-        final AbstractDOMDataTreeChangeListenerRegistration<?> abstractDOMDataTreeChangeListenerRegistration =
-                this.registerTreeChangeListener(yangInstanceIdentifier, domDataTreeChangeListener);
+        final var abstractDOMDataTreeChangeListenerRegistration =
+                registerTreeChangeListener(yangInstanceIdentifier, domDataTreeChangeListener);
 
         assertFalse(removeInvoked);
         assertFalse(notifyInvoked);
 
-        this.processCandidateTree(dataTreeCandidate);
-        doReturn(ModificationType.UNMODIFIED).when(dataTreeCandidateNode).getModificationType();
-        this.processCandidateTree(dataTreeCandidate);
+        processCandidateTree(dataTreeCandidate);
+        doReturn(ModificationType.UNMODIFIED).when(dataTreeCandidateNode).modificationType();
+        processCandidateTree(dataTreeCandidate);
 
         abstractDOMDataTreeChangeListenerRegistration.close();