BUG-592: Migrate users to new build() method

The static builder method is deprecated, move users off of it.

Change-Id: I2b6758c13e2eb4c6357b97f37de327594a1a7faf
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/integration-test/yang-runtime-tests/src/test/java/org/opendaylight/yangtools/it/yang/runtime/tests/BindingReadingTest.java b/integration-test/yang-runtime-tests/src/test/java/org/opendaylight/yangtools/it/yang/runtime/tests/BindingReadingTest.java
index 520b7e53f3daeb54c7b60a6e0f646874692d0cd9..4ce63b2b5b3bcb8b233cbfdfc3da5528f53faae5 100644 (file)
--- a/integration-test/yang-runtime-tests/src/test/java/org/opendaylight/yangtools/it/yang/runtime/tests/BindingReadingTest.java
+++ b/integration-test/yang-runtime-tests/src/test/java/org/opendaylight/yangtools/it/yang/runtime/tests/BindingReadingTest.java
@@ -43,28 +43,26 @@ public class BindingReadingTest {
     private NetworkTopology networkModel;
     private Link linkModel;
 
-    private static final InstanceIdentifier<Topology> TOPOLOGY_BAR_PATH = InstanceIdentifier.builder(NETWORK_TOPOLOGY_PATH) //
-            .child(Topology.class, new TopologyKey(TOPOLOGY_BAR_ID)) //
-            .build();
+    private static final InstanceIdentifier<Topology> TOPOLOGY_BAR_PATH = NETWORK_TOPOLOGY_PATH //
+            .child(Topology.class, new TopologyKey(TOPOLOGY_BAR_ID));
 
-    private static final InstanceIdentifier<Link> LINK_BAR_PATH = InstanceIdentifier.builder(NETWORK_TOPOLOGY_PATH) //
+    private static final InstanceIdentifier<Link> LINK_BAR_PATH = NETWORK_TOPOLOGY_PATH.builder() //
             .child(Topology.class, new TopologyKey(TOPOLOGY_BAR_ID)) //
             .child(Link.class, new LinkKey(LINK_BAR_ID)) //
             .build();
 
-    private static final InstanceIdentifier<Link> WILDCARDED_LINK_PATH = InstanceIdentifier
-            .builder(NETWORK_TOPOLOGY_PATH) //
+    private static final InstanceIdentifier<Link> WILDCARDED_LINK_PATH = NETWORK_TOPOLOGY_PATH.builder() //
             .child(Topology.class) //
             .child(Link.class) //
             .build();
 
-    private static final InstanceIdentifier<Source> ABSOLUTE_SOURCE_PATH = InstanceIdentifier.builder(TOPOLOGY_BAR_PATH)
+    private static final InstanceIdentifier<Source> ABSOLUTE_SOURCE_PATH = TOPOLOGY_BAR_PATH.builder() //
             .child(Link.class, new LinkKey(LINK_BAR_ID)) //
             .child(Source.class) //
             .build();
 
-    private static final InstanceIdentifier<Source> WILDCARDED_SOURCE_PATH = InstanceIdentifier
-            .builder(NETWORK_TOPOLOGY_PATH).child(Topology.class) //
+    private static final InstanceIdentifier<Source> WILDCARDED_SOURCE_PATH = NETWORK_TOPOLOGY_PATH.builder() //
+            .child(Topology.class) //
             .child(Link.class, new LinkKey(LINK_BAR_ID)) //
             .child(Source.class) //
             .build();
@@ -139,7 +137,7 @@ public class BindingReadingTest {
 
     @Test
     public void testInstanceIdentifierReadNonExistingValue() {
-        InstanceIdentifier<Source> sourcePath = InstanceIdentifier.builder(NETWORK_TOPOLOGY_PATH) //
+        InstanceIdentifier<Source> sourcePath = NETWORK_TOPOLOGY_PATH.builder() //
                 .child(Topology.class, new TopologyKey(TOPOLOGY_BAZ_ID)) //
                 .child(Link.class, new LinkKey(LINK_BAR_ID)) //
                 .child(Source.class) //

diff --git a/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/DataObjectReadingUtil.java b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/DataObjectReadingUtil.java
index db4127f214393148dafa618d88982bfc548d355c..4fd4e17c2b25c56655da9ea479727462d10e42e0 100644 (file)
--- a/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/DataObjectReadingUtil.java
+++ b/yang/yang-binding/src/main/java/org/opendaylight/yangtools/yang/binding/util/DataObjectReadingUtil.java
@@ -194,8 +194,7 @@ public class DataObjectReadingUtil {
             final DataContainer result = read(parent, childArgument.getType());
             if (result != null) {
                 @SuppressWarnings("unchecked")
-                InstanceIdentifier childPath = InstanceIdentifier.builder(parentPath).child(childArgument.getType())
-                        .build();
+                InstanceIdentifier childPath = parentPath.child(childArgument.getType());
                 return Collections.singletonMap(childPath, result);
             }
             return Collections.emptyMap();
@@ -259,9 +258,7 @@ public class DataObjectReadingUtil {
                     .<InstanceIdentifier, DataContainer> builder();
             for (Identifiable item : dataList) {
                 @SuppressWarnings("unchecked")
-                InstanceIdentifier childPath = InstanceIdentifier.builder(parentPath) //
-                        .child(getChildType(), item.getKey())//
-                        .build();
+                InstanceIdentifier childPath = parentPath.child(getChildType(), item.getKey());
                 result.put(childPath, (DataContainer) item);
             }
             return result.build();
@@ -275,8 +272,8 @@ public class DataObjectReadingUtil {
                 if (key.equals(item.getKey()) && item instanceof DataContainer) {
                     checkState(childArgument.getType().isInstance(item),
                             "Found child is not instance of requested type");
-                    InstanceIdentifier childPath = InstanceIdentifier.builder(parentPath)
-                            .child(childArgument.getType(), item.getKey()).build();
+                    InstanceIdentifier childPath = parentPath
+                            .child(childArgument.getType(), item.getKey());
                     return Collections.singletonMap(childPath, (DataContainer) item);
                 }
             }
@@ -301,8 +298,7 @@ public class DataObjectReadingUtil {
             DataContainer aug = read(parent, childArgument.getType());
             if (aug != null) {
                 @SuppressWarnings("unchecked")
-                final InstanceIdentifier childPath = InstanceIdentifier.builder(builder).child(childArgument.getType())
-                        .build();
+                final InstanceIdentifier childPath = builder.child(childArgument.getType());
                 return Collections.singletonMap(childPath, aug);
             } else {
                 return Collections.emptyMap();