Migrate callers of NormalizedNode.getIdentifier()

Use NormalizedNode.name() instead.

Change-Id: Ide0d0fc4c2b6c4921e7cfb36d2f162c84b84fc09
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
(cherry picked from commit 99ce57522c75b9e34b18bcbfff861f3aec72a506)

diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/DeviceActionFactoryImpl.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/DeviceActionFactoryImpl.java
index 7845fd238e501445e4589d5fbfb4c11f2c7233e7..e0f551098ce5d8006f31e8a056241d8177dc3196 100644 (file)
--- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/DeviceActionFactoryImpl.java
+++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/DeviceActionFactoryImpl.java
@@ -41,8 +41,7 @@ public class DeviceActionFactoryImpl implements DeviceActionFactory {
             requireNonNull(input);
 
             final var actionResultFuture = listener.sendRequest(
-                messageTransformer.toActionRequest(schemaPath, dataTreeIdentifier, input),
-                input.getIdentifier().getNodeType());
+                messageTransformer.toActionRequest(schemaPath, dataTreeIdentifier, input), input.name().getNodeType());
 
             return Futures.transform(actionResultFuture, netconfMessageRpcResult -> {
                 if (netconfMessageRpcResult != null) {

diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/LibraryModulesSchemas.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/LibraryModulesSchemas.java
index b275f763febe3d1d8fff5aa86232fbf32e7c1637..697b3502ae38e323dac39a81b5515f087a9a21f0 100644 (file)
--- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/LibraryModulesSchemas.java
+++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/LibraryModulesSchemas.java
@@ -274,7 +274,7 @@ public final class LibraryModulesSchemas implements NetconfDeviceSchemas {
         checkState(modulesStateNode instanceof ContainerNode, "Expecting container containing module list, but was %s",
             modulesStateNode);
         final ContainerNode modulesState = (ContainerNode) modulesStateNode;
-        final NodeIdentifier nodeName = modulesState.getIdentifier();
+        final NodeIdentifier nodeName = modulesState.name();
         checkState(MODULES_STATE_NID.equals(nodeName), "Wrong container identifier %s", nodeName);
 
         return create((ContainerNode) modulesStateNode);
@@ -335,7 +335,7 @@ public final class LibraryModulesSchemas implements NetconfDeviceSchemas {
     }
 
     private static @Nullable Entry<QName, URL> createFromEntry(final MapEntryNode moduleNode) {
-        final QName moduleNodeId = moduleNode.getIdentifier().getNodeType();
+        final QName moduleNodeId = moduleNode.name().getNodeType();
         checkArgument(moduleNodeId.equals(Module.QNAME), "Wrong QName %s", moduleNodeId);
 
         final String moduleName = getSingleChildNodeValue(moduleNode, NAME_NID).orElseThrow();

diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfDevice.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfDevice.java
index 11b735b986c1dd0d578479f2eeb07e9ea73d8e24..67e5535940b19596f45596bce1eaf866a62f8158 100644 (file)
--- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfDevice.java
+++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfDevice.java
@@ -188,7 +188,7 @@ public class NetconfDevice implements RemoteDevice<NetconfDeviceCommunicator> {
             @Override
             public void onSuccess(final DOMRpcResult domRpcResult) {
                 notificationHandler.addNotificationFilter(notification -> {
-                    if (NetconfCapabilityChange.QNAME.equals(notification.getBody().getIdentifier().getNodeType())) {
+                    if (NetconfCapabilityChange.QNAME.equals(notification.getBody().name().getNodeType())) {
                         LOG.info("{}: Schemas change detected, reconnecting", id);
                         // Only disconnect is enough,
                         // the reconnecting nature of the connector will take care of reconnecting

diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfStateSchemas.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfStateSchemas.java
index eb78b1f2dccf9359df4156ec4c7f1dc718b4f681..449041b5151560ef0063a98f20a56c1d4de11134 100644 (file)
--- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfStateSchemas.java
+++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/NetconfStateSchemas.java
@@ -269,7 +269,7 @@ public final class NetconfStateSchemas implements NetconfDeviceSchemas {
 
         static Optional<RemoteYangSchema> createFromNormalizedNode(final RemoteDeviceId id,
                                                                    final MapEntryNode schemaNode) {
-            final QName schemaNodeId = schemaNode.getIdentifier().getNodeType();
+            final QName schemaNodeId = schemaNode.name().getNodeType();
             checkArgument(schemaNodeId.equals(Schema.QNAME), "Wrong QName %s", schemaNodeId);
 
             QName childNode = NetconfMessageTransformUtil.IETF_NETCONF_MONITORING_SCHEMA_FORMAT;

diff --git a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformer.java b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformer.java
index 95d05a604194a0579834bcc50adc31fd5b3e21ea..a909d2ba264fabc910ec54f794cce3d3e68d7887 100644 (file)
--- a/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformer.java
+++ b/plugins/netconf-client-mdsal/src/main/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformer.java
@@ -497,7 +497,7 @@ public class NetconfMessageTransformer
         NetconfDeviceNotification(final ContainerNode content, final Instant eventTime) {
             this.content = content;
             this.eventTime = eventTime;
-            schemaPath = Absolute.of(content.getIdentifier().getNodeType());
+            schemaPath = Absolute.of(content.name().getNodeType());
         }
 
         NetconfDeviceNotification(final ContainerNode content, final Absolute schemaPath, final Instant eventTime) {

diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfToNotificationTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfToNotificationTest.java
index 6d52e85b7632d52c098d7343ae4dafd90b1c7426..2c9c86bc12c2b94aec6b154c7a377441b81cf219 100644 (file)
--- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfToNotificationTest.java
+++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/NetconfToNotificationTest.java
@@ -79,7 +79,7 @@ public class NetconfToNotificationTest extends AbstractBaseSchemasTest {
         final ContainerNode root = domNotification.getBody();
         assertNotNull(root);
         assertEquals(6, root.body().size());
-        assertEquals("user-visited-page", root.getIdentifier().getNodeType().getLocalName());
+        assertEquals("user-visited-page", root.name().getNodeType().getLocalName());
         assertEquals(NotificationMessage.RFC3339_DATE_PARSER.apply("2015-10-23T09:42:27.67175+00:00"),
                 ((DOMEvent) domNotification).getEventInstant());
     }

diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/BaseRpcSchemalessTransformerTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/BaseRpcSchemalessTransformerTest.java
index 444b0d01efd629724c440989f265e5579cff5b89..6252741b3117da9c67c25bb5069bc1048034ed41 100644 (file)
--- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/BaseRpcSchemalessTransformerTest.java
+++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/BaseRpcSchemalessTransformerTest.java
@@ -114,7 +114,7 @@ public class BaseRpcSchemalessTransformerTest extends AbstractBaseSchemasTest {
             NetconfMessageTransformUtil.NETCONF_GET_CONFIG_QNAME);
         assertNotNull(result.value());
         final ContainerNode rpcReply = result.value();
-        assertEquals(NetconfMessageTransformUtil.NETCONF_RPC_REPLY_QNAME, rpcReply.getIdentifier().getNodeType());
+        assertEquals(NetconfMessageTransformUtil.NETCONF_RPC_REPLY_QNAME, rpcReply.name().getNodeType());
         final DOMSourceAnyxmlNode data =
             (DOMSourceAnyxmlNode) rpcReply.getChildByArg(NetconfMessageTransformUtil.NETCONF_DATA_NODEID);
         final Diff diff = XMLUnit.compareXML(dataElement.getOwnerDocument(), (Document) data.body().getNode());

diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfBaseOpsTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfBaseOpsTest.java
index 4b1b4cb23b3ab1218003e191213d754d26aef91e..b29b98807560f933d246bedd3396fc245052d794 100644 (file)
--- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfBaseOpsTest.java
+++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfBaseOpsTest.java
@@ -193,14 +193,14 @@ public class NetconfBaseOpsTest extends AbstractTestModelTest {
     public void testGetConfigRunningData() throws Exception {
         final var dataOpt = baseOps.getConfigRunningData(callback, Optional.of(YangInstanceIdentifier.of())).get();
         assertTrue(dataOpt.isPresent());
-        assertEquals(NormalizedDataUtil.NETCONF_DATA_QNAME, dataOpt.orElseThrow().getIdentifier().getNodeType());
+        assertEquals(NormalizedDataUtil.NETCONF_DATA_QNAME, dataOpt.orElseThrow().name().getNodeType());
     }
 
     @Test
     public void testGetData() throws Exception {
         final var dataOpt = baseOps.getData(callback, Optional.of(YangInstanceIdentifier.of())).get();
         assertTrue(dataOpt.isPresent());
-        assertEquals(NormalizedDataUtil.NETCONF_DATA_QNAME, dataOpt.orElseThrow().getIdentifier().getNodeType());
+        assertEquals(NormalizedDataUtil.NETCONF_DATA_QNAME, dataOpt.orElseThrow().name().getNodeType());
     }
 
     @Test

diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformerTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformerTest.java
index b28a39d778aa8e30ef12e30c735686246c26843d..fe25de3e5e570b3c0e3ccd732f2c6d51d9c2dbfe 100644 (file)
--- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformerTest.java
+++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/impl/NetconfMessageTransformerTest.java
@@ -321,7 +321,7 @@ public class NetconfMessageTransformerTest extends AbstractBaseSchemasTest {
 
         final Map<QName, Object> keys = new HashMap<>();
         for (final DataContainerChild value : values) {
-            keys.put(value.getIdentifier().getNodeType(), value.body());
+            keys.put(value.name().getNodeType(), value.body());
         }
 
         final NodeIdentifierWithPredicates identifierWithPredicates =
@@ -403,7 +403,7 @@ public class NetconfMessageTransformerTest extends AbstractBaseSchemasTest {
 
         final Map<QName, Object> keys = new HashMap<>();
         for (final DataContainerChild value : values) {
-            keys.put(value.getIdentifier().getNodeType(), value.body());
+            keys.put(value.name().getNodeType(), value.body());
         }
 
         final NodeIdentifierWithPredicates identifierWithPredicates =

diff --git a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceRpcTest.java b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceRpcTest.java
index 7fbd3e01284271a71e91a6c2ac0c9e5633816397..3571b8305ecc4c3bcc131d4ffb08bcaa4dd59229 100644 (file)
--- a/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceRpcTest.java
+++ b/plugins/netconf-client-mdsal/src/test/java/org/opendaylight/netconf/client/mdsal/spi/NetconfDeviceRpcTest.java
@@ -113,7 +113,7 @@ public class NetconfDeviceRpcTest extends AbstractBaseSchemasTest {
     public void testInvokeRpc() throws Exception {
         ContainerNode input = createNode("urn:ietf:params:xml:ns:netconf:base:1.0", "2011-06-01", "filter");
         final DOMRpcResult result = rpc.invokeRpc(type, input).get();
-        assertEquals(expectedReply.value().getIdentifier(), result.value().getIdentifier());
+        assertEquals(expectedReply.value().name(), result.value().name());
         assertEquals(resolveNode(expectedReply), resolveNode(result));
     }