summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dt5972@att.com>2018-07-25 14:47:48 +0000
committerGerrit Code Review <gerrit@onap.org>2018-07-25 14:47:48 +0000
commitdcbfe0d9bebc371623518c162a568361e61bc519 (patch)
treed18679743db7ddfda4a56e4cbbbbc6d40fc87267
parent7e6d57e2c6dcf22567b7ef130d2a3c3a6866fe5f (diff)
parent75a7aa446b04504739cc2249d81116811a136111 (diff)
Merge "Fix sonar issues"
-rw-r--r--asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiProvider.java4
-rw-r--r--ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java26
2 files changed, 10 insertions, 20 deletions
diff --git a/asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiProvider.java b/asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiProvider.java
index 0c2ce2fc2..27280d2d3 100644
--- a/asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiProvider.java
+++ b/asdcApi/provider/src/main/java/org/onap/ccsdk/sli/northbound/asdcapi/AsdcApiProvider.java
@@ -179,14 +179,12 @@ public class AsdcApiProvider implements AutoCloseable, ASDCAPIService {
InstanceIdentifier artifactInstanceId =
InstanceIdentifier.<Artifacts>builder(Artifacts.class)
.child(Artifact.class, new ArtifactKey(aName, aVersion)).build();
- ReadOnlyTransaction readTx = dataBroker.newReadOnlyTransaction();
Optional<Artifact> data = null;
- try {
+ try(ReadOnlyTransaction readTx = dataBroker.newReadOnlyTransaction()) {
data = (Optional<Artifact>) readTx.read(LogicalDatastoreType.CONFIGURATION, artifactInstanceId).get();
} catch (InterruptedException | ExecutionException e) {
LOG.error("Caught Exception reading MD-SAL for ["+aName+","+ aVersion+"] " ,e);
return false;
-
}
return data.isPresent();
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 866fd14d7..224a51998 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
@@ -482,24 +482,19 @@ public class SdncUebCallback implements INotificationCallback {
// Save zip if TOSCA_CSAR
if (artifact.getArtifactType().contains("TOSCA_CSAR") || artifact.getArtifactName().contains(".csar")) {
- try {
-
- FileOutputStream outFile = new FileOutputStream(incomingDir.getAbsolutePath() + "/" + artifact.getArtifactName());
- outFile.write(payloadBytes, 0, payloadBytes.length);
- outFile.close();
- writeSucceeded = true;
- } catch (Exception e) {
- LOG.error("Unable to save downloaded zip file to spool directory ("+ incomingDir.getAbsolutePath() +")", e);
- }
+ try(FileOutputStream outFile = new FileOutputStream(incomingDir.getAbsolutePath() + "/" + artifact.getArtifactName())) {
+ outFile.write(payloadBytes, 0, payloadBytes.length);
+ writeSucceeded = true;
+ } catch (Exception e) {
+ LOG.error("Unable to save downloaded zip file to spool directory ("+ incomingDir.getAbsolutePath() +")", e);
+ }
} else {
String payload = new String(payloadBytes);
- try {
- FileWriter spoolFileWriter = new FileWriter(spoolFile);
+ try(FileWriter spoolFileWriter = new FileWriter(spoolFile)) {
spoolFileWriter.write(payload);
- spoolFileWriter.close();
writeSucceeded = true;
} catch (Exception e) {
LOG.error("Unable to save downloaded file to spool directory ("+ incomingDir.getAbsolutePath() +")", e);
@@ -943,9 +938,8 @@ public class SdncUebCallback implements INotificationCallback {
msgBuffer.append("<artifact-version>"+artifact.getArtifactVersion()+"</artifact-version>\n");
}
- try {
- BufferedReader rdr = new BufferedReader(new FileReader(artifact.getFile()));
-
+ try(BufferedReader rdr = new BufferedReader(new FileReader(artifact.getFile()))) {
+
String curLine = rdr.readLine();
while (curLine != null) {
@@ -966,8 +960,6 @@ public class SdncUebCallback implements INotificationCallback {
}
curLine = rdr.readLine();
}
- rdr.close();
-
} catch (Exception e) {
LOG.error("Could not process spool file "+artifact.getFile().getName(), e);
return(DistributionStatusEnum.DEPLOY_ERROR);