BUG-592: use new InstanceIdentifier APIs

[bgpcep.git] / pcep / tunnel-provider / src / main / java / org / opendaylight / bgpcep / pcep / tunnel / provider / TunnelProgramming.java

diff --git a/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgramming.java b/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgramming.java
index 0322b4c817a35c2db418cf5339410b74f0daf5aa..8f88ed0e6805c79091b9090e60273ea162c4cad8 100644 (file)
--- a/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgramming.java
+++ b/pcep/tunnel-provider/src/main/java/org/opendaylight/bgpcep/pcep/tunnel/provider/TunnelProgramming.java
@@ -100,8 +100,8 @@ public final class TunnelProgramming implements TopologyTunnelPcepProgrammingSer
                TpReader(final DataModificationTransaction t, final InstanceIdentifier<Topology> topo, final TpReference ref) {
                        this.t = Preconditions.checkNotNull(t);
 
-                       this.nii = InstanceIdentifier.builder(topo).child(Node.class, new NodeKey(ref.getNode())).toInstance();
-                       this.tii = InstanceIdentifier.builder(this.nii).child(TerminationPoint.class, new TerminationPointKey(ref.getTp())).toInstance();
+                       this.nii = topo.child(Node.class, new NodeKey(ref.getNode()));
+                       this.tii = this.nii.child(TerminationPoint.class, new TerminationPointKey(ref.getTp()));
                }
 
                private Node getNode() {
@@ -263,9 +263,7 @@ public final class TunnelProgramming implements TopologyTunnelPcepProgrammingSer
        }
 
        private Node sourceNode(final DataModificationTransaction t, final InstanceIdentifier<Topology> topology, final Link link) {
-               final InstanceIdentifier<Node> nii = InstanceIdentifier.builder(topology).child(Node.class,
-                               new NodeKey(link.getSource().getSourceNode())).toInstance();
-               return (Node) t.readOperationalData(nii);
+               return (Node) t.readOperationalData(topology.child(Node.class, new NodeKey(link.getSource().getSourceNode())));
        }
 
        @Override