Remove use of deprecated createCursor() method

This method has been superseded by openCursor(), use that.

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

diff --git a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ChoiceNodeCodecContext.java b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ChoiceNodeCodecContext.java
index 76853ed5729ab6fcf2848af874431f13ca4cb279..8cba2466fa6db59ad54e42dd815a172e3afa9944 100644 (file)
--- a/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ChoiceNodeCodecContext.java
+++ b/binding/mdsal-binding-dom-codec/src/main/java/org/opendaylight/mdsal/binding/dom/codec/impl/ChoiceNodeCodecContext.java
@@ -37,6 +37,7 @@ import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdent
 import org.opendaylight.yangtools.yang.data.api.schema.ChoiceNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
 import org.opendaylight.yangtools.yang.data.impl.schema.SchemaUtils;
+import org.opendaylight.yangtools.yang.data.util.DataSchemaContextNode;
 import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode;
 import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode;
@@ -127,7 +128,8 @@ final class ChoiceNodeCodecContext<D extends DataObject> extends DataContainerCo
                         final AugmentationSchemaNode augment = SchemaUtils.findCorrespondingAugment(cazeDef.getSchema(),
                             cazeChild);
                         if (augment != null) {
-                            byYangCaseChildBuilder.put(SchemaUtils.getNodeIdentifierForAugmentation(augment), cazeDef);
+                            byYangCaseChildBuilder.put(DataSchemaContextNode.augmentationIdentifierFrom(augment),
+                                cazeDef);
                             continue;
                         }
                     }

diff --git a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/ShardRootModificationContext.java b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/ShardRootModificationContext.java
index f6cc727eb40ae3341fcfb451b492f414dd829a26..c497f9f425355b5619777f3170b6ab1ef0c16977 100644 (file)
--- a/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/ShardRootModificationContext.java
+++ b/dom/mdsal-dom-inmemory-datastore/src/main/java/org/opendaylight/mdsal/dom/store/inmemory/ShardRootModificationContext.java
@@ -45,7 +45,7 @@ class ShardRootModificationContext implements Identifiable<DOMDataTreeIdentifier
             }
 
             // FIXME: Should there be non-root path?
-            DataTreeModificationCursor dataTreeCursor = modification.createCursor(YangInstanceIdentifier.EMPTY);
+            DataTreeModificationCursor dataTreeCursor = modification.openCursor(YangInstanceIdentifier.EMPTY).get();
             cursor = DataTreeModificationCursorAdaptor.of(dataTreeCursor);
         }
         return cursor;

diff --git a/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/mdsal/dom/store/inmemory/ShardRootModificationContextTest.java b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/mdsal/dom/store/inmemory/ShardRootModificationContextTest.java
index 1f44960ea542902326f8d5b5263932771065b680..d507201ac5f9f5a6bd426dbbc90a0142ffec8c8d 100644 (file)
--- a/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/mdsal/dom/store/inmemory/ShardRootModificationContextTest.java
+++ b/dom/mdsal-dom-inmemory-datastore/src/test/java/org/opendaylight/mdsal/dom/store/inmemory/ShardRootModificationContextTest.java
@@ -17,6 +17,7 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.opendaylight.mdsal.dom.store.inmemory.TestUtils.DOM_DATA_TREE_IDENTIFIER;
 
+import java.util.Optional;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.schema.tree.CursorAwareDataTreeModification;
@@ -33,8 +34,8 @@ public class ShardRootModificationContextTest {
         final DataTreeModificationCursor dataTreeModificationCursor = mock(DataTreeModificationCursor.class);
         doReturn(cursorAwareDataTreeModification).when(cursorAwareDataTreeSnapshot).newModification();
         doNothing().when(cursorAwareDataTreeModification).ready();
-        doReturn(dataTreeModificationCursor)
-                .when(cursorAwareDataTreeModification).createCursor(YangInstanceIdentifier.EMPTY);
+        doReturn(Optional.of(dataTreeModificationCursor))
+                .when(cursorAwareDataTreeModification).openCursor(YangInstanceIdentifier.EMPTY);
         doNothing().when(dataTreeModificationCursor).close();
 
         final ShardRootModificationContext shardRootModificationContext =
@@ -47,7 +48,7 @@ public class ShardRootModificationContextTest {
         assertNotNull(dataTreeModificationCursorAdaptor);
         assertTrue(shardRootModificationContext.isModified());
         verify(cursorAwareDataTreeSnapshot).newModification();
-        verify(cursorAwareDataTreeModification).createCursor(YangInstanceIdentifier.EMPTY);
+        verify(cursorAwareDataTreeModification).openCursor(YangInstanceIdentifier.EMPTY);
 
         shardRootModificationContext.ready();
         verify(cursorAwareDataTreeModification).ready();