Removed use of toInstance in NETCONF.

Change-Id: Ibbea950159f32a9ed6d053be7f015489f2a82acd
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>

diff --git a/opendaylight/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/reader/impl/ListEntryReader.java b/opendaylight/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/reader/impl/ListEntryReader.java
index aeb971a580ff385764737b2dd95c955681c8fb7b..7a8930429eb6fea2bd3d26db54af7aba8a563805 100644 (file)
--- a/opendaylight/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/reader/impl/ListEntryReader.java
+++ b/opendaylight/netconf/tools/netconf-cli/src/main/java/org/opendaylight/netconf/cli/reader/impl/ListEntryReader.java
@@ -98,7 +98,7 @@ class ListEntryReader extends AbstractReader<ListSchemaNode> implements GenericL
                     ImmutableMapNodeBuilder.create()
                             .withNodeIdentifier(new NodeIdentifier(listNode.getQName()))
                             .withChild(builder.build()).build());
-//            return Collections.<DataContainerChild<?, ?>> singletonList(compositeNodeBuilder.toInstance());
+//            return Collections.<DataContainerChild<?, ?>> singletonList(compositeNodeBuilder.build());
         } else {
             return Collections.emptyList();
         }

diff --git a/opendaylight/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/ControllerContext.java b/opendaylight/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/ControllerContext.java
index acec2f9bfa80ef0b1aabd7b2d9a24637807a3a2d..123309c1f9b4fe6d18a75086574e92fb359918d7 100644 (file)
--- a/opendaylight/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/ControllerContext.java
+++ b/opendaylight/restconf/sal-rest-connector/src/main/java/org/opendaylight/netconf/sal/restconf/impl/ControllerContext.java
@@ -511,7 +511,7 @@ public class ControllerContext implements SchemaContextListener {
         }
 
         if (strings.isEmpty()) {
-            return createContext(builder.toInstance(), ((DataSchemaNode) parentNode), mountPoint,mountPoint != null ? mountPoint.getSchemaContext() : globalSchema);
+            return createContext(builder.build(), ((DataSchemaNode) parentNode), mountPoint,mountPoint != null ? mountPoint.getSchemaContext() : globalSchema);
         }
 
         final String head = strings.iterator().next();
@@ -549,7 +549,7 @@ public class ControllerContext implements SchemaContextListener {
                 }
 
                 if (returnJustMountPoint || strings.size() == 1) {
-                    final YangInstanceIdentifier instance = YangInstanceIdentifier.builder().toInstance();
+                    final YangInstanceIdentifier instance = YangInstanceIdentifier.builder().build();
                     return new InstanceIdentifierContext<>(instance, mountPointSchema, mount,mountPointSchema);
                 }