Removal of unused variable
authorprakash.e <prakash.e@huawei.com>
Tue, 2 Jan 2018 06:25:42 +0000 (11:55 +0530)
committerprakash.e <prakash.e@huawei.com>
Tue, 2 Jan 2018 06:25:42 +0000 (11:55 +0530)
Change-Id: Idaf07c98ef0fef3923ddd7a9e185b727cb93b16f
Issue-ID: CCSDK-151
Signed-off-by: prakash.e <prakash.e@huawei.com>
ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java

index 0db96f5..89459bc 100644 (file)
@@ -266,7 +266,7 @@ public class SdncUebCallback implements INotificationCallback {
 
                 LOG.info("Received artifact " + curArtifact.getArtifactName());
 
-                               handleArtifact(data, data.getServiceName(), null, null, curArtifact, incomingDir, archiveDir);
+                               handleArtifact(data, data.getServiceName(), null, curArtifact, incomingDir, archiveDir);
             }
         }
 
@@ -295,7 +295,7 @@ public class SdncUebCallback implements INotificationCallback {
 
                     LOG.info("Received artifact " + curArtifact.getArtifactName());
 
-                                       handleArtifact(data, data.getServiceName(), curResource.getResourceName(), curResource.getResourceType(), curArtifact, incomingDir, archiveDir);
+                                       handleArtifact(data, data.getServiceName(), curResource.getResourceName(), curArtifact, incomingDir, archiveDir);
                 }
             }
         }
@@ -367,8 +367,7 @@ public class SdncUebCallback implements INotificationCallback {
                     IArtifactInfo artifactInfo = artifact.getArtifactInfo();
 
                                        if ((artifactInfo != null) && (data != null)) {
-                        IDistributionClientResult deploymentStatus;
-                            deploymentStatus = client.sendDeploymentStatus(buildStatusMessage(
+                        client.sendDeploymentStatus(buildStatusMessage(
                                     client, data, artifactInfo,
                                     deployResult));
                     }
@@ -378,7 +377,7 @@ public class SdncUebCallback implements INotificationCallback {
         }
     }
 
-       private void handleArtifact(INotificationData data, String svcName, String resourceName, String resourceType,
+       private void handleArtifact(INotificationData data, String svcName, String resourceName,
         IArtifactInfo artifact, File incomingDir, File archiveDir) {
 
         // Download Artifact
@@ -438,22 +437,21 @@ public class SdncUebCallback implements INotificationCallback {
     private void handleFailedDownload(INotificationData data,
             IArtifactInfo relevantArtifact) {
         // Send Download Status
-        IDistributionClientResult sendDownloadStatus = client
-                .sendDownloadStatus(buildStatusMessage(client, data,
+        client.sendDownloadStatus(buildStatusMessage(client, data,
                         relevantArtifact, DistributionStatusEnum.DOWNLOAD_ERROR));
     }
 
     private void handleSuccessfulDownload(INotificationData data, String svcName, String resourceName,
-            IArtifactInfo artifact, File spoolFile, File archiveDir) {
+            IArtifactInfo artifact, File inpSpoolFile, File archiveDir) {
 
                if ((data != null) && (artifact != null)) {
             // Send Download Status
-            IDistributionClientResult sendDownloadStatus = client
-                    .sendDownloadStatus(buildStatusMessage(client, data, artifact, DistributionStatusEnum.DOWNLOAD_OK));
+            client.sendDownloadStatus(buildStatusMessage(client, data, artifact, DistributionStatusEnum.DOWNLOAD_OK));
         }
 
         // If an override file exists, read that instead of the file we just downloaded
         ArtifactTypeEnum artifactEnum = ArtifactTypeEnum.YANG_XML;
+        File spoolFile = inpSpoolFile;
 
                boolean toscaCsarType = false;
         if (artifact != null) {
@@ -478,7 +476,7 @@ public class SdncUebCallback implements INotificationCallback {
         }
 
                if (toscaCsarType) {
-                       processToscaCsar (data, svcName, resourceName, artifact, spoolFile, archiveDir);
+                       processToscaCsar (data, resourceName, artifact, spoolFile, archiveDir);
 
                        try {
                                Path source = spoolFile.toPath();
@@ -544,7 +542,7 @@ public class SdncUebCallback implements INotificationCallback {
     }
 
 
-       private void processToscaCsar(INotificationData data, String svcName, String resourceName,
+       private void processToscaCsar(INotificationData data, String resourceName,
                        IArtifactInfo artifact, File spoolFile, File archiveDir) {
 
                // Use ASDC Dist Client 1.1.5 with TOSCA parsing APIs to extract relevant TOSCA model data