Refactor few TAPI rpcs

Change-Id: Ib6d5843c674ea7f2c5eacffe4df7a6c3b6b45b3a
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>

diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/GetTopologyListImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/GetTopologyListImpl.java
index f925869540616b0a58a5171e5ce20016f7d3f8df..9ebc6a56c35f4077d23244b86a7671200c1ac269 100644 (file)
--- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/GetTopologyListImpl.java
+++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/GetTopologyListImpl.java
@@ -15,6 +15,8 @@ import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.Ge
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.GetTopologyListInput;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.GetTopologyListOutput;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.GetTopologyListOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.get.topology.list.output.TopologyBuilder;
+import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.context.Topology;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.context.TopologyKey;
 import org.opendaylight.yangtools.yang.common.ErrorType;
 import org.opendaylight.yangtools.yang.common.RpcResult;
@@ -35,9 +37,7 @@ public class GetTopologyListImpl implements GetTopologyList {
     public ListenableFuture<RpcResult<GetTopologyListOutput>> invoke(GetTopologyListInput input) {
         // TODO Auto-generated method stub
         // TODO -> maybe we get errors when having CEPs?
-        Map<TopologyKey,
-                org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.context.Topology>
-                topologyMap = this.tapiContext.getTopologyContext();
+        Map<TopologyKey, Topology> topologyMap = this.tapiContext.getTopologyContext();
         if (topologyMap.isEmpty()) {
             LOG.error("No topologies exist in tapi context");
             return RpcResultBuilder.<GetTopologyListOutput>failed()
@@ -47,11 +47,9 @@ public class GetTopologyListImpl implements GetTopologyList {
         Map<org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.get.topology.list.output.TopologyKey,
             org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.get.topology.list.output.Topology>
                 newTopoMap = new HashMap<>();
-        for (org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.topology.context.Topology
-                topo:topologyMap.values()) {
+        for (Topology topo : topologyMap.values()) {
             org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev221121.get.topology.list.output.Topology
-                newTopo = new org.opendaylight.yang.gen.v1.urn
-                    .onf.otcc.yang.tapi.topology.rev221121.get.topology.list.output.TopologyBuilder(topo).build();
+                    newTopo = new TopologyBuilder(topo).build();
             newTopoMap.put(newTopo.key(), newTopo);
         }
         return RpcResultBuilder

diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/InitRoadmRoadmTapiLinkImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/InitRoadmRoadmTapiLinkImpl.java
index 16c2f02374fb98141de1d494271e68d44b9369ca..d46075ef496e686c69df0eb3540d930ebf40b5de 100644 (file)
--- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/InitRoadmRoadmTapiLinkImpl.java
+++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/InitRoadmRoadmTapiLinkImpl.java
@@ -50,16 +50,15 @@ public class InitRoadmRoadmTapiLinkImpl implements InitRoadmRoadmTapiLink {
             this.tapiLink.getOperState(sourceNode, sourceTp, destNode, destTp),
             Set.of(LayerProtocolName.PHOTONICMEDIA), Set.of(LayerProtocolName.PHOTONICMEDIA.getName()),
             tapiNetworkUtilsImpl.getTapiTopoUuid());
-        InitRoadmRoadmTapiLinkOutputBuilder output = new InitRoadmRoadmTapiLinkOutputBuilder();
         if (link == null) {
             LOG.error("Error creating link object");
             return RpcResultBuilder.<InitRoadmRoadmTapiLinkOutput>failed()
                 .withError(ErrorType.RPC, "Failed to create link in topology")
                 .buildFuture();
         }
+        InitRoadmRoadmTapiLinkOutputBuilder output = new InitRoadmRoadmTapiLinkOutputBuilder();
         if (tapiNetworkUtilsImpl.putLinkInTopology(link)) {
-            output = new InitRoadmRoadmTapiLinkOutputBuilder()
-                .setResult("Link created in tapi topology. Link-uuid = " + link.getUuid());
+            output.setResult("Link created in tapi topology. Link-uuid = " + link.getUuid());
         }
         return RpcResultBuilder.success(output.build()).buildFuture();
     }

diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/InitXpdrRdmTapiLinkImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/InitXpdrRdmTapiLinkImpl.java
index e2ab0c3279865415d414705081d0140f7f663341..90c3d61f1d9df391aa87d0eb574c20b4af4adcde 100644 (file)
--- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/InitXpdrRdmTapiLinkImpl.java
+++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/impl/rpc/InitXpdrRdmTapiLinkImpl.java
@@ -50,16 +50,15 @@ public class InitXpdrRdmTapiLinkImpl implements InitXpdrRdmTapiLink {
             this.tapiLink.getOperState(sourceNode, sourceTp, destNode, destTp),
             Set.of(LayerProtocolName.PHOTONICMEDIA), Set.of(LayerProtocolName.PHOTONICMEDIA.getName()),
             tapiNetworkUtilsImpl.getTapiTopoUuid());
-        InitXpdrRdmTapiLinkOutputBuilder output = new InitXpdrRdmTapiLinkOutputBuilder();
         if (link == null) {
             LOG.error("Error creating link object");
             return RpcResultBuilder.<InitXpdrRdmTapiLinkOutput>failed()
                 .withError(ErrorType.RPC, "Failed to create link in topology")
                 .buildFuture();
         }
+        InitXpdrRdmTapiLinkOutputBuilder output = new InitXpdrRdmTapiLinkOutputBuilder();
         if (tapiNetworkUtilsImpl.putLinkInTopology(link)) {
-            output = new InitXpdrRdmTapiLinkOutputBuilder()
-                .setResult("Link created in tapi topology. Link-uuid = " + link.getUuid());
+            output.setResult("Link created in tapi topology. Link-uuid = " + link.getUuid());
         }
         return RpcResultBuilder.success(output.build()).buildFuture();
     }