From b7375b2488df93ba9df57ad13ec628bbff663819 Mon Sep 17 00:00:00 2001 From: vempo Date: Thu, 7 Sep 2017 10:52:29 +0300 Subject: Fixed a few static analysis violations Fixed mostly not closing resources (InputStream, ResultSet) and catching Throwable instead of Exception in some modules. Issue-ID: SDC-291 Change-Id: I34e331cc3b45c4bb3a71c301f50e1706a7b623fd Signed-off-by: vempo --- .../impl/external/artifact/ExternalArtifactEnricher.java | 8 ++------ .../impl/external/artifact/MonitoringMibEnricherTest.java | 5 ++--- .../impl/external/artifact/ProcessArtifactEnricherTest.java | 6 ++---- 3 files changed, 6 insertions(+), 13 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src') diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ExternalArtifactEnricher.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ExternalArtifactEnricher.java index fb0622cd67..ffc27106bb 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ExternalArtifactEnricher.java +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ExternalArtifactEnricher.java @@ -22,7 +22,6 @@ package org.openecomp.sdc.enrichment.impl.external.artifact; import org.openecomp.core.utilities.file.FileUtils; import org.openecomp.core.utilities.json.JsonUtil; -import org.openecomp.sdc.common.utils.CommonUtil; import org.openecomp.sdc.datatypes.error.ErrorMessage; import org.openecomp.sdc.enrichment.inter.Enricher; import org.openecomp.sdc.enrichment.inter.ExternalArtifactEnricherInterface; @@ -30,7 +29,6 @@ import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage; -import java.io.InputStream; import java.lang.reflect.Constructor; import java.util.Collection; import java.util.HashMap; @@ -48,11 +46,9 @@ public class ExternalArtifactEnricher extends Enricher { private static Logger logger = LoggerFactory.getLogger(ExternalArtifactEnricher.class); private static Collection getExternalArtifactEnrichedImplClassesList() { - InputStream externalArtifactEnrichConfigurationJson = - FileUtils.getFileInputStream(EXTERNAL_ARTIFACT_ENRICH_CONF_FILE); @SuppressWarnings("unchecked") - Map confFileAsMap = - JsonUtil.json2Object(externalArtifactEnrichConfigurationJson, Map.class); + Map confFileAsMap = FileUtils.readViaInputStream(EXTERNAL_ARTIFACT_ENRICH_CONF_FILE, + stream -> JsonUtil.json2Object(stream, Map.class)); return confFileAsMap.values(); } diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/external/artifact/MonitoringMibEnricherTest.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/external/artifact/MonitoringMibEnricherTest.java index 38f7a1c56e..5f1a67138d 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/external/artifact/MonitoringMibEnricherTest.java +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/external/artifact/MonitoringMibEnricherTest.java @@ -42,7 +42,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import java.io.File; -import java.io.InputStream; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Collection; @@ -159,8 +158,8 @@ public class MonitoringMibEnricherTest { } private ByteBuffer getMibByteBuffer(String fileName) { - InputStream mibFile = FileUtils.getFileInputStream(this.getClass().getResource(fileName)); - byte[] mibBytes = FileUtils.toByteArray(mibFile); + byte[] mibBytes = FileUtils.readViaInputStream(this.getClass().getResource(fileName), + stream -> FileUtils.toByteArray(stream)); return ByteBuffer.wrap(mibBytes); } diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/external/artifact/ProcessArtifactEnricherTest.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/external/artifact/ProcessArtifactEnricherTest.java index aeefc91aa3..2f839a7946 100644 --- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/external/artifact/ProcessArtifactEnricherTest.java +++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/test/java/org/openecomp/sdc/enrichment/impl/external/artifact/ProcessArtifactEnricherTest.java @@ -21,14 +21,12 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import java.io.File; -import java.io.InputStream; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Collection; import static org.mockito.Matchers.anyObject; import static org.mockito.Mockito.atLeastOnce; -import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.when; public class ProcessArtifactEnricherTest { @@ -112,8 +110,8 @@ public class ProcessArtifactEnricherTest { } private ByteBuffer getMibByteBuffer(String fileName) { - InputStream mibFile = FileUtils.getFileInputStream(this.getClass().getResource(fileName)); - byte[] mibBytes = FileUtils.toByteArray(mibFile); + byte[] mibBytes = FileUtils.readViaInputStream(this.getClass().getResource(fileName), + stream -> FileUtils.toByteArray(stream)); return ByteBuffer.wrap(mibBytes); } } -- cgit 1.2.3-korg