X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=networkmodel%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fnetworkmodel%2Futil%2FOpenRoadmTopology.java;h=9ae72d27cc97613496c0bc434cc693f28a1e4388;hb=f491d31004724b998a9f3ce64eed5e37168413f5;hp=112fce17162bd3b948d4f0abf794cd1fad53d6d6;hpb=10fad3c9f6b3613cf44a097c51d2d0514102ea5b;p=transportpce.git

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java
index 112fce171..9ae72d27c 100644
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology.java
@@ -63,7 +63,6 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.top
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPointBuilder;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPointKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.InstanceIdentifierBuilder;
 import org.opendaylight.yangtools.yang.common.Uint16;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -426,13 +425,13 @@ public final class OpenRoadmTopology {
                                 .ietf.network.topology.rev180226.Node1.class)
                         .nonnullTerminationPoint().values().stream()
                         .filter(tp -> tp.getTpId().getValue().contains("CP") || tp.getTpId().getValue().contains("CTP"))
-                        .findFirst().get().getTpId().getValue();
+                        .findFirst().orElseThrow().getTpId().getValue();
                 destTp = nodes.get(j)
                         .augmentation(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang
                                 .ietf.network.topology.rev180226.Node1.class)
                         .nonnullTerminationPoint().values().stream()
                         .filter(tp -> tp.getTpId().getValue().contains("CP") || tp.getTpId().getValue().contains("CTP"))
-                        .findFirst().get().getTpId().getValue();
+                        .findFirst().orElseThrow().getTpId().getValue();
                 Link1Builder ocnAzLinkBldr = new Link1Builder();
                 Link1Builder ocnZaLinkBldr = new Link1Builder();
                 int srcNodeType = nodes.get(i).augmentation(org.opendaylight.yang.gen.v1.http
@@ -460,7 +459,7 @@ public final class OpenRoadmTopology {
                             .ietf.network.topology.rev180226.Node1.class)
                         .getTerminationPoint().values().stream()
                         .filter(tp -> tp.getTpId().getValue().contains("CP") || tp.getTpId().getValue().contains("CTP"))
-                        .findFirst().get()
+                        .findFirst().orElseThrow()
                         .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210
                             .TerminationPoint1.class)
                         .getOperationalState();
@@ -469,7 +468,7 @@ public final class OpenRoadmTopology {
                             .ietf.network.topology.rev180226.Node1.class)
                         .getTerminationPoint().values().stream()
                         .filter(tp -> tp.getTpId().getValue().contains("CP") || tp.getTpId().getValue().contains("CTP"))
-                        .findFirst().get()
+                        .findFirst().orElseThrow()
                         .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210
                             .TerminationPoint1.class)
                         .getOperationalState();
@@ -516,7 +515,7 @@ public final class OpenRoadmTopology {
     public static boolean deleteLinkLinkId(LinkId linkId , NetworkTransactionService networkTransactionService) {
         LOG.info("deleting link for LinkId: {}", linkId.getValue());
         try {
-            InstanceIdentifierBuilder<Link> linkIID = InstanceIdentifier.builder(Networks.class)
+            InstanceIdentifier.Builder<Link> linkIID = InstanceIdentifier.builder(Networks.class)
                 .child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)))
                 .augmentation(Network1.class)
                 .child(Link.class, new LinkKey(linkId));
@@ -526,7 +525,7 @@ public final class OpenRoadmTopology {
                 LOG.error("No link found for given LinkId: {}", linkId);
                 return false;
             }
-            LinkBuilder linkBuilder = new LinkBuilder(link.get());
+            LinkBuilder linkBuilder = new LinkBuilder(link.orElseThrow());
             networkTransactionService.merge(
                 LogicalDatastoreType.CONFIGURATION,
                 linkIID.build(),
@@ -554,7 +553,7 @@ public final class OpenRoadmTopology {
      * @param tpId String
      * @return InstanceIdentifierBuilder
      */
-    public static InstanceIdentifierBuilder<org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210
+    public static InstanceIdentifier.Builder<org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev211210
             .TerminationPoint1> createCommonNetworkTerminationPointIIDBuilder(String nodeId, String tpId) {
         return InstanceIdentifier.builder(Networks.class)
                 .child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)))