Migrate DataTreeModification method users

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

diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/DataTreeChangeListenerTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/DataTreeChangeListenerTest.java
index 99867ca96d5999f22ab202fb894e725986470df6..f8b90e59094b4c1fc667905ef2dcbc4a1eee33a8 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/DataTreeChangeListenerTest.java
+++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/DataTreeChangeListenerTest.java
@@ -22,6 +22,7 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
 import com.google.common.util.concurrent.SettableFuture;
 import java.util.Collection;
+import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import org.junit.Test;
@@ -40,19 +41,19 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.te
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.TwoLevelList;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsal.test.binding.rev140701.two.level.list.TopLevelList;
 import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yangtools.yang.binding.DataObjectStep;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.binding.YangModuleInfo;
 
 public class DataTreeChangeListenerTest extends AbstractDataBrokerTest {
 
     private static final InstanceIdentifier<Top> TOP_PATH = InstanceIdentifier.create(Top.class);
-    private static final PathArgument TOP_ARGUMENT = TOP_PATH.getPathArguments().iterator().next();
+    private static final DataObjectStep<?> TOP_ARGUMENT = TOP_PATH.getPathArguments().iterator().next();
     private static final InstanceIdentifier<TopLevelList> FOO_PATH = path(TOP_FOO_KEY);
-    private static final PathArgument FOO_ARGUMENT = Iterables.getLast(FOO_PATH.getPathArguments());
+    private static final DataObjectStep<?> FOO_ARGUMENT = Iterables.getLast(FOO_PATH.getPathArguments());
     private static final TopLevelList FOO_DATA = topLevelList(TOP_FOO_KEY, complexUsesAugment(USES_ONE_KEY));
     private static final InstanceIdentifier<TopLevelList> BAR_PATH = path(TOP_BAR_KEY);
-    private static final PathArgument BAR_ARGUMENT = Iterables.getLast(BAR_PATH.getPathArguments());
+    private static final DataObjectStep<?> BAR_ARGUMENT = Iterables.getLast(BAR_PATH.getPathArguments());
     private static final TopLevelList BAR_DATA = topLevelList(TOP_BAR_KEY);
     private static final DataTreeIdentifier<Top> TOP_IDENTIFIER
             = DataTreeIdentifier.of(LogicalDatastoreType.OPERATIONAL, TOP_PATH);
@@ -62,17 +63,15 @@ public class DataTreeChangeListenerTest extends AbstractDataBrokerTest {
     private BindingDOMDataBrokerAdapter dataBrokerImpl;
 
     private static final class EventCapturingListener<T extends DataObject> implements DataTreeChangeListener<T> {
-
-        private SettableFuture<Collection<DataTreeModification<T>>> futureChanges = SettableFuture.create();
+        private SettableFuture<List<DataTreeModification<T>>> futureChanges = SettableFuture.create();
 
         @Override
-        public void onDataTreeChanged(final Collection<DataTreeModification<T>> changes) {
+        public void onDataTreeChanged(final List<DataTreeModification<T>> changes) {
             futureChanges.set(changes);
-
         }
 
         Collection<DataTreeModification<T>> nextEvent() throws Exception {
-            final Collection<DataTreeModification<T>> result = futureChanges.get(200,TimeUnit.MILLISECONDS);
+            final var result = futureChanges.get(200,TimeUnit.MILLISECONDS);
             futureChanges = SettableFuture.create();
             return result;
         }
@@ -163,14 +162,14 @@ public class DataTreeChangeListenerTest extends AbstractDataBrokerTest {
         final DataTreeModification<Top> initialWrite = Iterables.getOnlyElement(events);
         final DataObjectModification<? extends DataObject> initialNode = initialWrite.getRootNode();
         verifyModification(initialNode,TOP_PATH.getPathArguments().iterator().next(),ModificationType.WRITE);
-        assertEquals(TOP_INITIAL_DATA, initialNode.getDataAfter());
+        assertEquals(TOP_INITIAL_DATA, initialNode.dataAfter());
     }
 
     private static void verifyModification(final DataObjectModification<? extends DataObject> barWrite,
-            final PathArgument pathArg, final ModificationType eventType) {
-        assertEquals(pathArg.getType(), barWrite.getDataType());
-        assertEquals(eventType,barWrite.getModificationType());
-        assertEquals(pathArg, barWrite.getIdentifier());
+            final DataObjectStep<?> pathArg, final ModificationType eventType) {
+        assertEquals(pathArg.type(), barWrite.dataType());
+        assertEquals(eventType,barWrite.modificationType());
+        assertEquals(pathArg, barWrite.step());
     }
 
     private <T extends DataObject> WriteTransaction putTx(final InstanceIdentifier<T> path, final T data) {