From 4fc89fcbfd72f38e02bff533cab5fa3e4794cfcc Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sat, 27 Jan 2024 14:58:52 +0100
Subject: [PATCH] Migrate DataTreeModification method users

Use new methods instead of the deprecated ones.

Change-Id: If56da4296584228d0e6d18482d0b8b6f2b871c20
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../dom/adapter/AbstractDataObjectModification.java    |  2 +-
 .../dom/adapter/DataTreeChangeListenerTest.java        |  8 ++++----
 .../test/AbstractDataTreeChangeListenerTest.java       | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractDataObjectModification.java b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractDataObjectModification.java
index 6fe65414f6..94f24c047f 100644
--- a/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractDataObjectModification.java
+++ b/binding/mdsal-binding-dom-adapter/src/main/java/org/opendaylight/mdsal/binding/dom/adapter/AbstractDataObjectModification.java
@@ -238,7 +238,7 @@ abstract sealed class AbstractDataObjectModification<T extends DataObject, N ext
     @SuppressWarnings("unchecked")
     private <C extends DataObject> Stream<LazyDataObjectModification<C>> streamModifiedChildren(
             final Class<C> childType) {
-        return getModifiedChildren().stream()
+        return modifiedChildren().stream()
             .filter(child -> childType.isAssignableFrom(child.dataType()))
             .map(child -> (LazyDataObjectModification<C>) child);
     }
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 e2e03620b2..f8b90e5909 100644
--- 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
@@ -162,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 DataObjectStep<?> pathArg, final ModificationType eventType) {
-        assertEquals(pathArg.type(), barWrite.getDataType());
-        assertEquals(eventType,barWrite.getModificationType());
-        assertEquals(pathArg, barWrite.getIdentifier());
+        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) {
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 e2b4887f83..b7db42fddf 100644
--- 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
@@ -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().path(), rootNode.getDataBefore(),
-                        rootNode.getDataAfter()));
+                        rootNode.modificationType(), mod.getRootPath().path(), rootNode.dataBefore(),
+                        rootNode.dataAfter()));
                     return;
                 }
             }
@@ -163,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()
+        return modification -> type == modification.getRootNode().modificationType()
                 && path.equals(modification.getRootPath().path())
-                && checkDataBefore.apply(modification.getRootNode().getDataBefore())
-                && checkDataAfter.apply(modification.getRootNode().getDataAfter());
+                && checkDataBefore.apply(modification.getRootNode().dataBefore())
+                && checkDataAfter.apply(modification.getRootNode().dataAfter());
     }
 
     public static <T extends DataObject> @NonNull Matcher<T> match(final ModificationType type,
-- 
2.36.6