Shift Builder<P> from toInstance() to build()

[yangtools.git] / integration-test / yang-runtime-tests / src / test / java / org / opendaylight / yangtools / it / yang / runtime / tests / BindingReadingTest.java

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..89c67c81af9b3739022f2451a1a3d115c67a69af 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
@@ -39,32 +39,30 @@ public class BindingReadingTest {
     private static final NodeId SOURCE_NODE_ID = new NodeId("node:id");
     private static final TpId SOURCE_TP_ID = new TpId("source:tp");
     private static final InstanceIdentifier<NetworkTopology> NETWORK_TOPOLOGY_PATH = InstanceIdentifier.builder(
-            NetworkTopology.class).toInstance();
+            NetworkTopology.class).build();
     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) //