Naming convention

Refactor the names in SDC controller

Issue-ID: CLAMP-81
Change-Id: I715e0274efe5ac10e8bcc1f5b8a0171231e55265
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>

diff --git a/src/main/java/org/onap/clamp/clds/sdc/controller/SdcSingleController.java b/src/main/java/org/onap/clamp/clds/sdc/controller/SdcSingleController.java
index d093626..c02edbb 100644 (file)
--- a/src/main/java/org/onap/clamp/clds/sdc/controller/SdcSingleController.java
+++ b/src/main/java/org/onap/clamp/clds/sdc/controller/SdcSingleController.java
@@ -56,7 +56,7 @@ import org.openecomp.sdc.utils.DistributionStatusEnum;
 public class SdcSingleController {\r
 \r
     private static final EELFLogger logger = EELFManager.getInstance().getLogger(SdcSingleController.class);\r
-    private boolean isAsdcClientAutoManaged = false;\r
+    private boolean isSdcClientAutoManaged = false;\r
     private CsarInstaller csarInstaller;\r
     private ClampProperties refProp;\r
     public static final String CONFIG_SDC_FOLDER = "sdc.csarFolder";\r
@@ -68,12 +68,12 @@ public class SdcSingleController {
     /**\r
      * Inner class for Notification callback\r
      */\r
-    private final class ASDCNotificationCallBack implements INotificationCallback {\r
+    private final class SdcNotificationCallBack implements INotificationCallback {\r
 \r
-        private SdcSingleController asdcController;\r
+        private SdcSingleController sdcController;\r
 \r
-        ASDCNotificationCallBack(SdcSingleController controller) {\r
-            asdcController = controller;\r
+        SdcNotificationCallBack(SdcSingleController controller) {\r
+            sdcController = controller;\r
         }\r
 \r
         /**\r
@@ -83,9 +83,9 @@ public class SdcSingleController {
         @Override\r
         public void activateCallback(INotificationData iNotif) {\r
             Date startTime = new Date();\r
-            String event = "Receive a callback notification in ASDC, nb of resources: " + iNotif.getResources().size();\r
+            String event = "Receive a callback notification in SDC, nb of resources: " + iNotif.getResources().size();\r
             logger.debug(event);\r
-            asdcController.treatNotification(iNotif);\r
+            sdcController.treatNotification(iNotif);\r
             LoggingUtils.setTimeContext(startTime, new Date());\r
             LoggingUtils.setResponseContext("0", "SDC Notification received and processed successfully",\r
                     this.getClass().getName());\r
@@ -126,7 +126,7 @@ public class SdcSingleController {
 \r
     public SdcSingleController(ClampProperties clampProp, CsarInstaller csarInstaller,\r
             SdcSingleControllerConfiguration sdcSingleConfig, boolean isClientAutoManaged) {\r
-        this.isAsdcClientAutoManaged = isClientAutoManaged;\r
+        this.isSdcClientAutoManaged = isClientAutoManaged;\r
         this.sdcConfig = sdcSingleConfig;\r
         this.refProp = clampProp;\r
         this.csarInstaller = csarInstaller;\r
@@ -150,9 +150,9 @@ public class SdcSingleController {
         if (this.distributionClient == null) {\r
             distributionClient = DistributionClientFactory.createDistributionClient();\r
         }\r
-        IDistributionClientResult result = this.distributionClient.init(sdcConfig, new ASDCNotificationCallBack(this));\r
+        IDistributionClientResult result = this.distributionClient.init(sdcConfig, new SdcNotificationCallBack(this));\r
         if (!result.getDistributionActionResult().equals(DistributionActionResultEnum.SUCCESS)) {\r
-            logger.error("ASDC distribution client init failed with reason:" + result.getDistributionMessageResult());\r
+            logger.error("SDC distribution client init failed with reason:" + result.getDistributionMessageResult());\r
             this.changeControllerStatus(SdcSingleControllerStatus.STOPPED);\r
             throw new SdcControllerException("Initialization of the SDC Controller failed with reason: "\r
                     + result.getDistributionMessageResult());\r
@@ -176,15 +176,15 @@ public class SdcSingleController {
      */\r
     public void closeSdc() throws SdcControllerException {\r
         if (this.getControllerStatus() == SdcSingleControllerStatus.BUSY) {\r
-            throw new SdcControllerException("Cannot close the ASDC controller as it's currently in BUSY state");\r
+            throw new SdcControllerException("Cannot close the SDC controller as it's currently in BUSY state");\r
         }\r
         if (this.distributionClient != null) {\r
             this.distributionClient.stop();\r
             // If auto managed we can set it to Null, SdcController controls it.\r
             // In the other case the client of this class has specified it, so\r
             // we can't reset it\r
-            if (isAsdcClientAutoManaged) {\r
-                // Next init will initialize it with a new Sdc Client\r
+            if (isSdcClientAutoManaged) {\r
+                // Next init will initialize it with a new SDC Client\r
                 this.distributionClient = null;\r
             }\r
         }\r
@@ -206,39 +206,39 @@ public class SdcSingleController {
                     refProp.getStringValue(CONFIG_SDC_FOLDER));\r
             if (csarInstaller.isCsarAlreadyDeployed(csar)) {\r
                 csar.save(downloadTheArtifact(csar.getArtifactElement()));\r
-                this.sendASDCNotification(NotificationType.DOWNLOAD, csar.getArtifactElement().getArtifactURL(),\r
+                this.sendSdcNotification(NotificationType.DOWNLOAD, csar.getArtifactElement().getArtifactURL(),\r
                         sdcConfig.getConsumerID(), iNotif.getDistributionID(), DistributionStatusEnum.DOWNLOAD_OK, null,\r
                         System.currentTimeMillis());\r
                 csarInstaller.installTheCsar(csar);\r
-                this.sendASDCNotification(NotificationType.DEPLOY, csar.getArtifactElement().getArtifactURL(),\r
+                this.sendSdcNotification(NotificationType.DEPLOY, csar.getArtifactElement().getArtifactURL(),\r
                         sdcConfig.getConsumerID(), iNotif.getDistributionID(), DistributionStatusEnum.DEPLOY_OK, null,\r
                         System.currentTimeMillis());\r
             } else {\r
-                this.sendASDCNotification(NotificationType.DOWNLOAD, csar.getArtifactElement().getArtifactURL(),\r
+                this.sendSdcNotification(NotificationType.DOWNLOAD, csar.getArtifactElement().getArtifactURL(),\r
                         sdcConfig.getConsumerID(), iNotif.getDistributionID(),\r
                         DistributionStatusEnum.ALREADY_DOWNLOADED, null, System.currentTimeMillis());\r
-                this.sendASDCNotification(NotificationType.DOWNLOAD, csar.getArtifactElement().getArtifactURL(),\r
+                this.sendSdcNotification(NotificationType.DOWNLOAD, csar.getArtifactElement().getArtifactURL(),\r
                         sdcConfig.getConsumerID(), iNotif.getDistributionID(), DistributionStatusEnum.ALREADY_DEPLOYED,\r
                         null, System.currentTimeMillis());\r
             }\r
         } catch (SdcArtifactInstallerException e) {\r
             logger.error("SdcArtifactInstallerException exception caught during the notification processing", e);\r
-            this.sendASDCNotification(NotificationType.DEPLOY, csar.getArtifactElement().getArtifactURL(),\r
+            this.sendSdcNotification(NotificationType.DEPLOY, csar.getArtifactElement().getArtifactURL(),\r
                     sdcConfig.getConsumerID(), iNotif.getDistributionID(), DistributionStatusEnum.DEPLOY_ERROR,\r
                     e.getMessage(), System.currentTimeMillis());\r
         } catch (SdcDownloadException e) {\r
             logger.error("SdcDownloadException exception caught during the notification processing", e);\r
-            this.sendASDCNotification(NotificationType.DOWNLOAD, csar.getArtifactElement().getArtifactURL(),\r
+            this.sendSdcNotification(NotificationType.DOWNLOAD, csar.getArtifactElement().getArtifactURL(),\r
                     sdcConfig.getConsumerID(), iNotif.getDistributionID(), DistributionStatusEnum.DOWNLOAD_ERROR,\r
                     e.getMessage(), System.currentTimeMillis());\r
         } catch (CsarHandlerException e) {\r
             logger.error("CsarHandlerException exception caught during the notification processing", e);\r
-            this.sendASDCNotification(NotificationType.DOWNLOAD, null, sdcConfig.getConsumerID(),\r
+            this.sendSdcNotification(NotificationType.DOWNLOAD, null, sdcConfig.getConsumerID(),\r
                     iNotif.getDistributionID(), DistributionStatusEnum.DOWNLOAD_ERROR, e.getMessage(),\r
                     System.currentTimeMillis());\r
         } catch (SdcToscaParserException e) {\r
             logger.error("SdcToscaParserException exception caught during the notification processing", e);\r
-            this.sendASDCNotification(NotificationType.DEPLOY, csar.getArtifactElement().getArtifactURL(),\r
+            this.sendSdcNotification(NotificationType.DEPLOY, csar.getArtifactElement().getArtifactURL(),\r
                     sdcConfig.getConsumerID(), iNotif.getDistributionID(), DistributionStatusEnum.DEPLOY_ERROR,\r
                     e.getMessage(), System.currentTimeMillis());\r
         } catch (RuntimeException e) {\r
@@ -270,17 +270,17 @@ public class SdcSingleController {
                     + artifact.getArtifactUUID() + "Size of payload " + downloadResult.getArtifactPayload().length);\r
         } else {\r
             throw new SdcDownloadException("Artifact " + artifact.getArtifactName()\r
-                    + " could not be downloaded from ASDC URL " + artifact.getArtifactURL() + " UUID "\r
+                    + " could not be downloaded from SDC URL " + artifact.getArtifactURL() + " UUID "\r
                     + artifact.getArtifactUUID() + ")" + System.lineSeparator() + "Error message is "\r
                     + downloadResult.getDistributionMessageResult() + System.lineSeparator());\r
         }\r
         return downloadResult;\r
     }\r
 \r
-    private void sendASDCNotification(NotificationType notificationType, String artifactURL, String consumerID,\r
+    private void sendSdcNotification(NotificationType notificationType, String artifactURL, String consumerID,\r
             String distributionID, DistributionStatusEnum status, String errorReason, long timestamp) {\r
         String event = "Sending " + notificationType.name() + "(" + status.name() + ")"\r
-                + " notification to ASDC for artifact:" + artifactURL;\r
+                + " notification to SDC for artifact:" + artifactURL;\r
         if (errorReason != null) {\r
             event = event + "(" + errorReason + ")";\r
         }\r
@@ -302,9 +302,9 @@ public class SdcSingleController {
                     break;\r
             }\r
         } catch (RuntimeException e) {\r
-            logger.warn("Unable to send the Sdc Notification (" + action + ") due to an exception", e);\r
+            logger.warn("Unable to send the SDC Notification (" + action + ") due to an exception", e);\r
         }\r
-        logger.info("Sdc Notification sent successfully(" + action + ")");\r
+        logger.info("SDC Notification sent successfully(" + action + ")");\r
     }\r
 \r
     private void sendDownloadStatus(IDistributionStatusMessage message, String errorReason) {\r