Migrate DataTreeModification method users

[mdsal.git] / binding / mdsal-binding-dom-adapter / src / test / java / org / opendaylight / mdsal / binding / dom / adapter / test / AbstractDataTreeChangeListenerTest.java

diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AbstractDataTreeChangeListenerTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AbstractDataTreeChangeListenerTest.java
index 42e723fd2f79f4c54f17fbba40a5f060ec0aec53..b7db42fddfcc8e877c56635e27de77f0aa7dcd4f 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AbstractDataTreeChangeListenerTest.java
+++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/test/AbstractDataTreeChangeListenerTest.java
@@ -14,8 +14,8 @@ import com.google.common.base.Stopwatch;
 import com.google.common.util.concurrent.Uninterruptibles;
 import java.util.ArrayDeque;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Deque;
+import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 import org.eclipse.jdt.annotation.NonNull;
@@ -66,8 +66,8 @@ public class AbstractDataTreeChangeListenerTest extends AbstractConcurrentDataBr
                 if (!matcher.apply(mod)) {
                     final var rootNode = mod.getRootNode();
                     fail("Received unexpected notification: type: %s, path: %s, before: %s, after: %s".formatted(
-                        rootNode.getModificationType(), mod.getRootPath().getRootIdentifier(), rootNode.getDataBefore(),
-                        rootNode.getDataAfter()));
+                        rootNode.modificationType(), mod.getRootPath().path(), rootNode.dataBefore(),
+                        rootNode.dataAfter()));
                     return;
                 }
             }
@@ -90,7 +90,7 @@ public class AbstractDataTreeChangeListenerTest extends AbstractConcurrentDataBr
         private boolean synced;
 
         @Override
-        public synchronized void onDataTreeChanged(final Collection<DataTreeModification<T>> changes) {
+        public synchronized void onDataTreeChanged(final List<DataTreeModification<T>> changes) {
             accumulatedChanges.addAll(changes);
             synced = true;
         }
@@ -155,8 +155,7 @@ public class AbstractDataTreeChangeListenerTest extends AbstractConcurrentDataBr
     protected final <T extends DataObject> @NonNull ModificationCollector<T> createCollector(
             final LogicalDatastoreType store, final InstanceIdentifier<T> path) {
         final var listener = new TestListener<T>();
-        final var reg = getDataBroker().registerDataTreeChangeListener(DataTreeIdentifier.create(store, path),
-            listener);
+        final var reg = getDataBroker().registerDataTreeChangeListener(DataTreeIdentifier.of(store, path), listener);
         listener.awaitSync();
         return new ModificationCollector<>(listener, reg);
     }
@@ -164,10 +163,10 @@ public class AbstractDataTreeChangeListenerTest extends AbstractConcurrentDataBr
     public static <T extends DataObject> @NonNull Matcher<T> match(final ModificationType type,
             final InstanceIdentifier<T> path, final DataMatcher<T> checkDataBefore,
             final DataMatcher<T> checkDataAfter) {
-        return modification -> type == modification.getRootNode().getModificationType()
-                && path.equals(modification.getRootPath().getRootIdentifier())
-                && checkDataBefore.apply(modification.getRootNode().getDataBefore())
-                && checkDataAfter.apply(modification.getRootNode().getDataAfter());
+        return modification -> type == modification.getRootNode().modificationType()
+                && path.equals(modification.getRootPath().path())
+                && checkDataBefore.apply(modification.getRootNode().dataBefore())
+                && checkDataAfter.apply(modification.getRootNode().dataAfter());
     }
 
     public static <T extends DataObject> @NonNull Matcher<T> match(final ModificationType type,