From bb926984d56b3cf22ab1b8708e64e5ab0b4fc63c Mon Sep 17 00:00:00 2001
From: "guillaume.lambert" <guillaume.lambert@orange.com>
Date: Fri, 6 Aug 2021 10:16:15 +0200
Subject: [PATCH] Refactor DeviceRenderingTask classes

JIRA: TRNSPRTPCE-491
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: Ia1ad6f9cde2f6e68510bd62336c7c8e6b8419427
---
 .../tasks/DeviceRenderingTask.java            | 32 +++++++++----------
 .../tasks/OtnDeviceRenderingTask.java         | 28 ++++++++--------
 2 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingTask.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingTask.java
index a997336c6..a45ebe865 100644
--- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingTask.java
+++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/DeviceRenderingTask.java
@@ -37,30 +37,30 @@ public class DeviceRenderingTask implements Callable<DeviceRenderingResult> {
     @Override
     public DeviceRenderingResult call() throws Exception {
         ServicePathOutput output;
+        String operation;
+        List<Nodes> olmList = null;
         switch (this.servicePathInputData.getServicePathInput().getOperation()) {
             case Create:
+                operation = "setup";
                 output = this.deviceRenderer.setupServicePath(this.servicePathInputData.getServicePathInput(),
                     this.direction);
-                if (!output.getSuccess()) {
-                    LOG.error("Device rendering setup service path failed.");
-                    return DeviceRenderingResult.failed("Operation Failed");
-                }
-                List<Nodes> olmList = this.servicePathInputData.getNodeLists().getOlmNodeList();
-                LOG.info("Device rendering setup service path finished successfully.");
-                return DeviceRenderingResult.ok(olmList, new ArrayList<>(output.nonnullNodeInterface().values()),
-                    new ArrayList<>(output.nonnullLinkTp()));
+                olmList = this.servicePathInputData.getNodeLists().getOlmNodeList();
+                break;
             case Delete:
+                operation = "delete";
                 output = this.deviceRenderer.deleteServicePath(this.servicePathInputData.getServicePathInput());
-                if (!output.getSuccess()) {
-                    LOG.error("Device rendering delete service path failed.");
-                    return DeviceRenderingResult.failed("Operation Failed");
-                }
-                LOG.info("Device rendering delete service path finished successfully.");
-                return DeviceRenderingResult.ok(null, new ArrayList<>(output.nonnullNodeInterface().values()),
-                    new ArrayList<>(output.nonnullLinkTp()));
+                break;
             default:
-                return DeviceRenderingResult.failed("Device rendering failed - unknwon operation");
+                return DeviceRenderingResult.failed("Device rendering failed - unknown operation");
         }
+        if (!output.getSuccess()) {
+            LOG.error("Device rendering {} service path failed.", operation);
+            return DeviceRenderingResult.failed("Operation Failed");
+        }
+        LOG.info("Device rendering {} service path finished successfully.", operation);
+        return DeviceRenderingResult.ok(olmList, new ArrayList<>(output.nonnullNodeInterface().values()),
+            new ArrayList<>(output.nonnullLinkTp()));
+
     }
 
 }
diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/OtnDeviceRenderingTask.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/OtnDeviceRenderingTask.java
index 34365fb7b..221f8a360 100644
--- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/OtnDeviceRenderingTask.java
+++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/tasks/OtnDeviceRenderingTask.java
@@ -32,27 +32,25 @@ public class OtnDeviceRenderingTask implements Callable<OtnDeviceRenderingResult
     @Override
     public OtnDeviceRenderingResult call() throws Exception {
         OtnServicePathOutput output;
+        String operation;
         switch (this.otnServicePathInput.getOperation()) {
             case Create:
+                operation = "setup";
                 output = this.otnDeviceRenderer.setupOtnServicePath(this.otnServicePathInput);
-                if (!output.getSuccess()) {
-                    LOG.error("Device rendering setup otn service path failed.");
-                    return OtnDeviceRenderingResult.failed("Operation Failed");
-                }
-                LOG.info("Device rendering setup otn service path finished successfully.");
-                return OtnDeviceRenderingResult.ok(new ArrayList<>(output.nonnullNodeInterface().values()),
-                    new ArrayList<>(output.nonnullLinkTp()));
+                break;
             case Delete:
+                operation = "delete";
                 output = this.otnDeviceRenderer.deleteOtnServicePath(this.otnServicePathInput);
-                if (!output.getSuccess()) {
-                    LOG.error("Device rendering delete otn service path failed.");
-                    return OtnDeviceRenderingResult.failed("Operation Failed");
-                }
-                LOG.info("Device rendering delete otn service path finished successfully.");
-                return OtnDeviceRenderingResult.ok(new ArrayList<>(output.nonnullNodeInterface().values()),
-                    new ArrayList<>(output.nonnullLinkTp()));
+                break;
             default:
-                return OtnDeviceRenderingResult.failed("Device rendering failed - unknwon operation");
+                return OtnDeviceRenderingResult.failed("Device rendering failed - unknown operation");
         }
+        if (!output.getSuccess()) {
+            LOG.error("Device rendering {} otn service path failed.", operation);
+            return OtnDeviceRenderingResult.failed("Operation Failed");
+        }
+        LOG.info("Device rendering {} otn service path finished successfully.", operation);
+        return OtnDeviceRenderingResult.ok(new ArrayList<>(output.nonnullNodeInterface().values()),
+            new ArrayList<>(output.nonnullLinkTp()));
     }
 }
-- 
2.36.6