Phosphorus migration

[transportpce.git] / networkmodel / src / main / java / org / opendaylight / transportpce / networkmodel / service / NetworkModelServiceImpl.java

diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java
index 867f341e6a0d6aec15f0db94dd71708e0044e10d..542ca1885126fd72d41870f8a6d86cb8e3926615 100644 (file)
--- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java
+++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/service/NetworkModelServiceImpl.java
@@ -764,28 +764,27 @@ public class NetworkModelServiceImpl implements NetworkModelService {
                 .stream().filter(lk -> lk.getLinkId().getValue().startsWith("ODTU4"))
                 .collect(Collectors.toList());
         }
+        if (odu4links == null) {
+            return null;
+        }
         List<Link> links = new ArrayList<>();
-        if (odu4links != null) {
-            for (LinkTp linkTp : nodesTopoTps) {
-                String tp = linkTp.getTpId();
-                String nodeId = new StringBuilder(linkTp.getNodeId()).append("-")
-                    .append(tp.split("-")[0]).toString();
-                Link slink = odu4links.stream().filter(lk -> lk.getSource().getSourceNode().getValue()
-                    .equals(nodeId) && lk.getSource().getSourceTp().toString().equals(tp)).findFirst().get();
-                if (!links.contains(slink)) {
-                    links.add(slink);
-                }
-                Link dlink = odu4links.stream().filter(lk -> lk.getDestination().getDestNode().getValue()
-                    .equals(nodeId) && lk.getDestination().getDestTp().toString().equals(tp)).findFirst().get();
-                if (!links.contains(dlink)) {
-                    links.add(dlink);
-                }
+        for (LinkTp linkTp : nodesTopoTps) {
+            String tp = linkTp.getTpId();
+            String nodeId = new StringBuilder(linkTp.getNodeId()).append("-")
+                .append(tp.split("-")[0]).toString();
+            Link slink = odu4links.stream().filter(lk -> lk.getSource().getSourceNode().getValue()
+                .equals(nodeId) && lk.getSource().getSourceTp().getValue().equals(tp)).findFirst().get();
+            if (!links.contains(slink)) {
+                links.add(slink);
+            }
+            Link dlink = odu4links.stream().filter(lk -> lk.getDestination().getDestNode().getValue()
+                .equals(nodeId) && lk.getDestination().getDestTp().getValue().equals(tp)).findFirst().get();
+            if (!links.contains(dlink)) {
+                links.add(dlink);
             }
-            LOG.debug("odu4links = {}", links.toString());
-            return links;
-        } else {
-            return null;
         }
+        LOG.debug("odu4links = {}", links.toString());
+        return links;
     }
 
     private void createOpenRoadmOtnNode(String nodeId) {