Merge "Fixed as per Java Code Conventions"
diff --git a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java
index 5fd2e2a..b9df86e 100644
--- a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java
@@ -266,7 +266,7 @@
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 @@
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);
}
}
}
@@ -325,18 +325,16 @@
archiveDir.mkdirs();
}
}
-
- String curFileName = "";
+
LOG.debug("Scanning {} - {} for downloaded files", incomingDir.getPath(), incomingDir.toPath());
try (DirectoryStream<Path> stream = Files.newDirectoryStream(incomingDir.toPath())) {
for (Path file: stream) {
- curFileName = file.toString();
handleSuccessfulDownload(null,null, null, null, file.toFile(), archiveDir);
}
- } catch (Exception x) {
+ } catch (IOException x) {
// IOException can never be thrown by the iteration.
// In this snippet, it can only be thrown by newDirectoryStream.
- LOG.warn("Cannot process spool file {}", curFileName, x);
+ LOG.warn("Cannot process spool file", x);
}
// Deploy scheduled deployments
@@ -377,7 +375,7 @@
}
}
- 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
@@ -437,22 +435,21 @@
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) {
@@ -477,7 +474,7 @@
}
if (toscaCsarType) {
- processToscaCsar (data, svcName, resourceName, artifact, spoolFile, archiveDir);
+ processToscaCsar (data, resourceName, artifact, spoolFile, archiveDir);
try {
Path source = spoolFile.toPath();
@@ -543,7 +540,7 @@
}
- 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
@@ -857,23 +854,24 @@
}
private void scheduleDeployment(SdncArtifactType type, String svcName, String resourceName, IArtifactInfo artifactInfo, String spoolFileName, File spoolFile) {
+ if (deployList != null) {
+ if (type.getPass() < deployList.length) {
- if (type.getPass() < deployList.length) {
+ if (artifactInfo != null) {
+ LOG.debug("Scheduling "+artifactInfo.getArtifactName()+" version "+artifactInfo.getArtifactVersion()+" for deployment");
- if (artifactInfo != null) {
- LOG.debug("Scheduling "+artifactInfo.getArtifactName()+" version "+artifactInfo.getArtifactVersion()+" for deployment");
-
- deployList[type.getPass()].add(new DeployableArtifact(type, svcName, resourceName, artifactInfo, spoolFile));
+ deployList[type.getPass()].add(new DeployableArtifact(type, svcName, resourceName, artifactInfo, spoolFile));
+ } else {
+ SimpleDateFormat sdfDate = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss.SSS");//dd/MM/yyyy
+ Date now = new Date();
+ String artifactVersion = sdfDate.format(now);
+ LOG.debug("Scheduling "+spoolFileName+" version "+artifactVersion+" for deployment");
+ deployList[type.getPass()].add(new DeployableArtifact(type, svcName, resourceName, spoolFileName,
+ artifactVersion, spoolFile));
+ }
} else {
- SimpleDateFormat sdfDate = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss.SSS");//dd/MM/yyyy
- Date now = new Date();
- String artifactVersion = sdfDate.format(now);
- LOG.debug("Scheduling "+spoolFileName+" version "+artifactVersion+" for deployment");
- deployList[type.getPass()].add(new DeployableArtifact(type, svcName, resourceName, spoolFileName,
- artifactVersion, spoolFile));
+ LOG.info("Pass for type "+type.getTag()+" is "+type.getPass()+" which is not <= "+deployList.length);
}
- } else {
- LOG.info("Pass for type "+type.getTag()+" is "+type.getPass()+" which is not <= "+deployList.length);
}
}