Fix TAPI Sonar issues

[transportpce.git] / tapi / src / main / java / org / opendaylight / transportpce / tapi / topology / TapiTopologyImpl.java

diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java
index 5fd5c4d43cb2f93ac7c191d47c102501c61b039b..59773c0831be610a18b038df4272370d15c80daf 100644 (file)
--- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java
+++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java
@@ -136,14 +136,12 @@ public class TapiTopologyImpl implements TapiTopologyService {
             LOG.error("Impossible to retrieve openroadm-topology from mdsal", e);
             return null;
         }
-        Network openroadmTopo = null;
-        if (optionalOpenroadmTop.isPresent()) {
-            openroadmTopo = optionalOpenroadmTop.get();
-        } else {
+
+        if (!optionalOpenroadmTop.isPresent()) {
             LOG.warn("Openroadm topology is not present, returning null");
             return null;
         }
-
+        Network openroadmTopo = optionalOpenroadmTop.get();
         List<Node> nodeList = openroadmTopo.getNode();
         List<Link> linkList = null;
         if (openroadmTopo.augmentation(Network1.class) != null) {
@@ -180,14 +178,13 @@ public class TapiTopologyImpl implements TapiTopologyService {
         }
         List<String> goodTpList = extractGoodTpList(clientPortMap);
         // tapi topology creation
-        List<Name> names = new ArrayList<Name>();
+        List<Name> names = new ArrayList<>();
         names.add(new NameBuilder().setValue("topo ethernet").setValueName("Topo Name").build());
         Uuid uuid = new Uuid(UUID.randomUUID().toString());
         List<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node>
             tapiNodeList = new ArrayList<>();
         tapiNodeList.add(createTapiNode(goodTpList));
-        Topology topology = new TopologyBuilder().setName(names).setUuid(uuid).setNode(tapiNodeList).build();
-        return topology;
+        return new TopologyBuilder().setName(names).setUuid(uuid).setNode(tapiNodeList).build();
 
     }
 
@@ -234,13 +231,12 @@ public class TapiTopologyImpl implements TapiTopologyService {
                 tapiNodeList.addAll(tapiFactory.getTapiNodes());
                 tapiLinkList.addAll(tapiFactory.getTapiLinks());
             }
-            Topology topology = new TopologyBuilder()
-                .setName(Arrays.asList(new NameBuilder().setValue("T0 - Multi-layer topology")
-                    .setValueName("TAPI Topology Name").build()))
-                .setUuid(topoUuid)
-                .setNode(tapiNodeList)
-                .setLink(tapiLinkList).build();
-            return topology;
+            return new TopologyBuilder()
+                    .setName(Arrays.asList(new NameBuilder().setValue("T0 - Multi-layer topology")
+                            .setValueName("TAPI Topology Name").build()))
+                    .setUuid(topoUuid)
+                    .setNode(tapiNodeList)
+                    .setLink(tapiLinkList).build();
         } else {
             return null;
         }
@@ -267,14 +263,14 @@ public class TapiTopologyImpl implements TapiTopologyService {
 
     private org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node createTapiNode(List<
         String> tpList) {
-        List<Name> names = new ArrayList<Name>();
+        List<Name> names = new ArrayList<>();
         Name name = new NameBuilder().setValueName("node name").setValue("TapiNode1").build();
         names.add(name);
         List<LayerProtocolName> layerProtocols = new ArrayList<>();
         layerProtocols.add(LayerProtocolName.ETH);
-        List<OwnedNodeEdgePoint> onepl = new ArrayList<OwnedNodeEdgePoint>();
+        List<OwnedNodeEdgePoint> onepl = new ArrayList<>();
         for (int i = 0; i < tpList.size(); i++) {
-            List<Name> onedNames = new ArrayList<Name>();
+            List<Name> onedNames = new ArrayList<>();
             onedNames.add(new NameBuilder().setValueName("OwnedNodeEdgePoint " + i).setValue(tpList.get(i)).build());
             OwnedNodeEdgePoint onep = new OwnedNodeEdgePointBuilder().setUuid(new Uuid(UUID.randomUUID().toString()))
                 .setLayerProtocolName(LayerProtocolName.ETH).setMappedServiceInterfacePoint(createSIP(1))
@@ -285,11 +281,15 @@ public class TapiTopologyImpl implements TapiTopologyService {
                 .build();
             onepl.add(onep);
         }
-        org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.topology.Node node = new NodeBuilder()
-            .setUuid(new Uuid(UUID.randomUUID().toString())).setName(names).setLayerProtocolName(layerProtocols)
-            .setAdministrativeState(AdministrativeState.UNLOCKED).setOperationalState(OperationalState.ENABLED)
-            .setLifecycleState(LifecycleState.INSTALLED).setOwnedNodeEdgePoint(onepl).build();
-        return node;
+
+        return new NodeBuilder()
+                .setUuid(new Uuid(UUID.randomUUID().toString()))
+                .setName(names).setLayerProtocolName(layerProtocols)
+                .setAdministrativeState(AdministrativeState.UNLOCKED)
+                .setOperationalState(OperationalState.ENABLED)
+                .setLifecycleState(LifecycleState.INSTALLED)
+                .setOwnedNodeEdgePoint(onepl)
+                .build();
     }
 
     private List<MappedServiceInterfacePoint> createSIP(int nb) {