Refactor a few renderer RPCs

JIRA: TRNSPRTPCE-764
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Icdd66a41bfea36d66a2e9f7686d492f3065d253a

diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/CreateOtsOmsImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/CreateOtsOmsImpl.java
index f0e4af13639d1a2943da606df62ed43e8960eb57..2ed02560d73a8aea05d78ea53fdb7efcfae33538 100644 (file)
--- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/CreateOtsOmsImpl.java
+++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/CreateOtsOmsImpl.java
@@ -32,13 +32,13 @@ public class CreateOtsOmsImpl implements CreateOtsOms {
 
     @Override
     public ListenableFuture<RpcResult<CreateOtsOmsOutput>> invoke(CreateOtsOmsInput input) {
-        LOG.info("Request received to create oms and ots interfaces on {}: {}", input.getNodeId(), input
-            .getLogicalConnectionPoint());
+        LOG.info("Request received to create oms and ots interfaces on {}: {}",
+            input.getNodeId(), input.getLogicalConnectionPoint());
         try {
             return RpcResultBuilder.success(deviceRendererService.createOtsOms(input)).buildFuture();
         } catch (OpenRoadmInterfaceException e) {
-            LOG.error("failed to send request to create oms and ots interfaces on {}: {}", input.getNodeId(),
-                    input.getLogicalConnectionPoint(),e);
+            LOG.error("failed to send request to create oms and ots interfaces on {}: {}",
+                input.getNodeId(), input.getLogicalConnectionPoint(),e);
         }
         return RpcResultBuilder.<CreateOtsOmsOutput>failed()
             .withError(ErrorType.RPC, "to create oms and ots interfaces")

diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/OtnServicePathImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/OtnServicePathImpl.java
index 8e3e5e341ac55f3fc24f71ca3ed7964639370e12..90202d16a34fcf11880e646e0fdbbd7c92be0224 100644 (file)
--- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/OtnServicePathImpl.java
+++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/OtnServicePathImpl.java
@@ -32,21 +32,24 @@ public class OtnServicePathImpl implements OtnServicePath {
 
     @Override
     public ListenableFuture<RpcResult<OtnServicePathOutput>> invoke(OtnServicePathInput input) {
-        if (input.getOperation() != null && input.getServiceFormat() != null && input.getServiceRate() != null) {
-            String serviceType = ServiceTypes.getOtnServiceType(input.getServiceFormat(), input.getServiceRate());
-            if (input.getOperation().getIntValue() == 1) {
+        if (input.getOperation() == null || input.getServiceFormat() == null || input.getServiceRate() == null) {
+            LOG.debug("A mandatory input argument is null");
+            return RpcResultBuilder
+                .success(new OtnServicePathOutputBuilder().setResult("Invalid operation").build())
+                .buildFuture();
+        }
+        String serviceType = ServiceTypes.getOtnServiceType(input.getServiceFormat(), input.getServiceRate());
+        return switch (input.getOperation()) {
+            case Create -> {
                 LOG.info("Create operation request received");
-                return RpcResultBuilder.success(this.otnDeviceRendererService
-                        .setupOtnServicePath(input, serviceType)).buildFuture();
-            } else if (input.getOperation().getIntValue() == 2) {
+                yield RpcResultBuilder.success(this.otnDeviceRendererService
+                    .setupOtnServicePath(input, serviceType)).buildFuture();
+            }
+            case Delete -> {
                 LOG.info("Delete operation request received");
-                return RpcResultBuilder.success(this.otnDeviceRendererService
-                        .deleteOtnServicePath(input, serviceType)).buildFuture();
+                yield RpcResultBuilder.success(this.otnDeviceRendererService
+                    .deleteOtnServicePath(input, serviceType)).buildFuture();
             }
-        }
-        return RpcResultBuilder
-            .success(new OtnServicePathOutputBuilder().setResult("Invalid operation").build())
-            .buildFuture();
+        };
     }
-
 }

diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/ServicePathImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/ServicePathImpl.java
index 52da3b560c7933bd31768611df26cafc521203d7..0bea07169f949785cf7865dfd8d2efc33a864b8b 100644 (file)
--- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/ServicePathImpl.java
+++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/rpcs/ServicePathImpl.java
@@ -50,22 +50,23 @@ public class ServicePathImpl implements ServicePath {
 
     @Override
     public ListenableFuture<RpcResult<ServicePathOutput>> invoke(ServicePathInput input) {
-        if (input.getOperation() != null) {
-            if (input.getOperation().getIntValue() == 1) {
+        if (input.getOperation() == null) {
+            LOG.debug("A mandatory input argument is null");
+            return RpcResultBuilder
+                .success(new ServicePathOutputBuilder().setResult("Invalid operation").build())
+                .buildFuture();
+        }
+        return switch (input.getOperation()) {
+            case Create -> {
                 LOG.info("Create operation request received");
-                return RpcResultBuilder.success(
-                        this.deviceRendererService.setupServicePath(input, null))
-                        .buildFuture();
-            } else if (input.getOperation().getIntValue() == 2) {
+                yield RpcResultBuilder.success(this.deviceRendererService.setupServicePath(input, null))
+                    .buildFuture();
+            }
+            case Delete -> {
                 LOG.info("Delete operation request received");
-                return RpcResultBuilder
-                        .success(this.deviceRendererService.deleteServicePath(input))
-                        .buildFuture();
+                yield RpcResultBuilder.success(this.deviceRendererService.deleteServicePath(input))
+                    .buildFuture();
             }
-        }
-        return RpcResultBuilder
-            .success(new ServicePathOutputBuilder().setResult("Invalid operation").build())
-            .buildFuture();
+        };
     }
-
 }