Merge "Fixed a few static analysis violations"

14 files changed, 115 insertions, 123 deletions

diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/errors/DefaultExceptionMapper.java b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/errors/DefaultExceptionMapper.java
index d399469745..2f6d298f01 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/errors/DefaultExceptionMapper.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/openecomp-sdc-common-rest/src/main/java/org/openecomp/sdcrests/errors/DefaultExceptionMapper.java
@@ -35,29 +35,25 @@ import org.openecomp.sdc.common.errors.ValidationErrorBuilder;
 import org.openecomp.sdc.logging.api.Logger;
 import org.openecomp.sdc.logging.api.LoggerFactory;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import javax.validation.ConstraintViolation;
 import javax.validation.ConstraintViolationException;
 import javax.validation.Path;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 public class DefaultExceptionMapper implements ExceptionMapper<Exception> {
   private static final String ERROR_CODES_TO_RESPONSE_STATUS_MAPPING_FILE =
       "errorCodesToResponseStatusMapping.json";
   @SuppressWarnings("unchecked")
   private static Map<String, String> errorCodeToResponseStatus =
-      JsonUtil.json2Object(FileUtils
-          .getFileInputStream(ERROR_CODES_TO_RESPONSE_STATUS_MAPPING_FILE), Map.class);
+          FileUtils.readViaInputStream(ERROR_CODES_TO_RESPONSE_STATUS_MAPPING_FILE,
+                  stream -> JsonUtil.json2Object(stream, Map.class));
+
   private static Logger logger = (Logger) LoggerFactory.getLogger(DefaultExceptionMapper.class);
 
   @Override
diff --git a/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/utils/CommonUtil.java b/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/utils/CommonUtil.java
index 07322c626b..f4d6209eec 100644
--- a/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/utils/CommonUtil.java
+++ b/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/utils/CommonUtil.java
@@ -59,26 +59,24 @@ public class CommonUtil {
   private static FileContentHandler getFileContentMapFromOrchestrationCandidateZipAndValidateNoFolders(
       byte[] uploadFileData)
       throws IOException {
-    ZipEntry zipEntry;
+
     List<String> folderList = new ArrayList<>();
     FileContentHandler mapFileContent = new FileContentHandler();
-    try {
-      ZipInputStream inputZipStream;
 
-      byte[] fileByteContent;
+    try (ZipInputStream inputZipStream = new ZipInputStream(new ByteArrayInputStream(uploadFileData))) {
+
       String currentEntryName;
-      inputZipStream = new ZipInputStream(new ByteArrayInputStream(uploadFileData));
+      ZipEntry zipEntry;
 
       while ((zipEntry = inputZipStream.getNextEntry()) != null) {
-        currentEntryName = zipEntry.getName();
-        // else, get the file content (as byte array) and save it in a map.
-        fileByteContent = FileUtils.toByteArray(inputZipStream);
 
+        currentEntryName = zipEntry.getName();
         int index = lastIndexFileSeparatorIndex(currentEntryName);
         if (index != -1) { //todo ?
           folderList.add(currentEntryName);
         } else {
-          mapFileContent.addFile(currentEntryName, fileByteContent);
+          // else, get the file content (as byte array) and save it in a map.
+          mapFileContent.addFile(currentEntryName, FileUtils.toByteArray(inputZipStream));
         }
       }
 
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-core/src/main/java/org/openecomp/core/factory/FactoriesConfigImpl.java b/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-core/src/main/java/org/openecomp/core/factory/FactoriesConfigImpl.java
index 173f9b15b1..b9d03f4d1a 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-core/src/main/java/org/openecomp/core/factory/FactoriesConfigImpl.java
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-facade-lib/openecomp-facade-core/src/main/java/org/openecomp/core/factory/FactoriesConfigImpl.java
@@ -25,7 +25,9 @@ import org.openecomp.core.factory.api.FactoriesConfiguration;
 import org.openecomp.core.utilities.file.FileUtils;
 import org.openecomp.core.utilities.json.JsonUtil;
 
+import java.io.IOException;
 import java.io.InputStream;
+import java.net.URL;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -50,12 +52,16 @@ public final class FactoriesConfigImpl implements FactoriesConfiguration {
   }
 
   private void init() {
-    List<InputStream> factoryConfigIsList = FileUtils.getFileInputStreams(FACTORY_CONFIG_FILE_NAME);
-    for (InputStream factoryConfigIs : factoryConfigIsList) {
-      factoryMap.putAll(JsonUtil.json2Object(factoryConfigIs, Map.class));
-    }
-  }
 
+    List<URL> factoryConfigUrlList = FileUtils.getAllLocations(FACTORY_CONFIG_FILE_NAME);
+    for (URL factoryConfigUrl : factoryConfigUrlList) {
 
+      try (InputStream stream = factoryConfigUrl.openStream()) {
+        factoryMap.putAll(JsonUtil.json2Object(stream, Map.class));
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
+    }
+  }
 }
 
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/src/main/java/org/openecomp/core/util/UniqueValueUtil.java b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/src/main/java/org/openecomp/core/util/UniqueValueUtil.java
index d2dee5e512..dce34a1c96 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/src/main/java/org/openecomp/core/util/UniqueValueUtil.java
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-api/src/main/java/org/openecomp/core/util/UniqueValueUtil.java
@@ -27,7 +27,6 @@ import org.openecomp.core.utilities.CommonMethods;
 import org.openecomp.sdc.common.errors.CoreException;
 import org.openecomp.sdc.common.errors.ErrorCategory;
 import org.openecomp.sdc.common.errors.ErrorCode;
-import org.openecomp.sdc.common.utils.CommonUtil;
 import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage;
 
 import java.util.Optional;
@@ -95,9 +94,10 @@ public class UniqueValueUtil {
 
     mdcDataDebugMessage.debugEntryMessage(null, null);
 
-    if ((newValue != null && oldValue != null
-        && !newValue.toLowerCase().equals(oldValue.toLowerCase()))
-        || newValue == null || oldValue == null) {
+    boolean nonEqual = (newValue != null) && (oldValue != null)
+            && !newValue.toLowerCase().equals(oldValue.toLowerCase());
+
+    if (nonEqual || newValue == null || oldValue == null) {
       createUniqueValue(type, CommonMethods.concat(uniqueContext, new String[]{newValue}));
       deleteUniqueValue(type, CommonMethods.concat(uniqueContext, new String[]{oldValue}));
     }
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/main/java/org/openecomp/core/nosqldb/util/CassandraUtils.java b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/main/java/org/openecomp/core/nosqldb/util/CassandraUtils.java
index 2a88d0e521..7a70900873 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/main/java/org/openecomp/core/nosqldb/util/CassandraUtils.java
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-nosqldb-lib/openecomp-nosqldb-core/src/main/java/org/openecomp/core/nosqldb/util/CassandraUtils.java
@@ -23,7 +23,6 @@ package org.openecomp.core.nosqldb.util;
 import org.openecomp.core.utilities.file.FileUtils;
 import org.openecomp.core.utilities.json.JsonUtil;
 
-import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -49,10 +48,12 @@ public class CassandraUtils {
    * @return the statement
    */
   public static String getStatement(String statementName) {
+
     if (statementMap.size() == 0) {
-      InputStream statementJson = FileUtils.getFileInputStream(CASSANDRA_STATEMENT_DEFINITION_FILE);
-      statementMap = JsonUtil.json2Object(statementJson, Map.class);
+        statementMap = FileUtils.readViaInputStream(CASSANDRA_STATEMENT_DEFINITION_FILE,
+                stream -> JsonUtil.json2Object(stream, Map.class));
     }
+
     return statementMap.get(statementName);
   }
 
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/file/FileUtils.java b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/file/FileUtils.java
index 87ce8d37c3..e04f02cce5 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/file/FileUtils.java
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/main/java/org/openecomp/core/utilities/file/FileUtils.java
@@ -28,9 +28,12 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
-import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Enumeration;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.Objects;
+import java.util.function.Function;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -40,38 +43,29 @@ import java.util.zip.ZipInputStream;
 public class FileUtils {
 
   /**
-   * Gets file input stream.
+   * Allows to consume an input stream open against a resource with a given file name.
    *
    * @param fileName the file name
-   * @return the file input stream
+   * @param function logic to be applied to the input stream
    */
-  public static InputStream getFileInputStream(String fileName) {
-    URL urlFile = FileUtils.class.getClassLoader().getResource(fileName);
-    InputStream is;
-    try {
-      assert urlFile != null;
-      is = urlFile.openStream();
-    } catch (IOException exception) {
-      throw new RuntimeException(exception);
-    }
-    return is;
+  public static <T> T readViaInputStream(String fileName, Function<InputStream, T> function) {
+    return readViaInputStream(FileUtils.class.getClassLoader().getResource(fileName), function);
   }
 
   /**
-   * Gets file input stream.
+   * Allows to consume an input stream open against a resource with a given URL.
    *
    * @param urlFile the url file
-   * @return the file input stream
+   * @param function logic to be applied to the input stream
    */
-  public static InputStream getFileInputStream(URL urlFile) {
-    InputStream is;
-    try {
-      assert urlFile != null;
-      is = urlFile.openStream();
+  public static <T> T readViaInputStream(URL urlFile, Function<InputStream, T> function) {
+
+    Objects.requireNonNull(urlFile);
+    try (InputStream is = urlFile.openStream()) {
+      return function.apply(is);
     } catch (IOException exception) {
       throw new RuntimeException(exception);
     }
-    return is;
   }
 
   /**
@@ -80,24 +74,23 @@ public class FileUtils {
    * @param fileName the file name
    * @return the file input streams
    */
-  public static List<InputStream> getFileInputStreams(String fileName) {
+  public static List<URL> getAllLocations(String fileName) {
+
+    List<URL> urls = new LinkedList<>();
     Enumeration<URL> urlFiles;
-    List<InputStream> streams = new ArrayList<>();
-    InputStream is;
-    URL url;
+
     try {
       urlFiles = FileUtils.class.getClassLoader().getResources(fileName);
       while (urlFiles.hasMoreElements()) {
-        url = urlFiles.nextElement();
-        is = url.openStream();
-        streams.add(is);
+        urls.add(urlFiles.nextElement());
       }
 
 
     } catch (IOException exception) {
       throw new RuntimeException(exception);
     }
-    return streams;
+
+    return urls.isEmpty() ? Collections.emptyList() : Collections.unmodifiableList(urls);
   }
 
   /**
@@ -210,25 +203,22 @@ public class FileUtils {
    * @throws IOException the io exception
    */
   public static FileContentHandler getFileContentMapFromZip(byte[] zipData) throws IOException {
-    ZipEntry zipEntry;
-    FileContentHandler mapFileContent = new FileContentHandler();
-    try {
-      ZipInputStream inputZipStream;
 
-      byte[] fileByteContent;
-      String currentEntryName;
-      inputZipStream = new ZipInputStream(new ByteArrayInputStream(zipData));
+    try (ZipInputStream inputZipStream = new ZipInputStream(new ByteArrayInputStream(zipData))) {
+
+      FileContentHandler mapFileContent = new FileContentHandler();
+
+      ZipEntry zipEntry;
 
       while ((zipEntry = inputZipStream.getNextEntry()) != null) {
-        currentEntryName = zipEntry.getName();
-        fileByteContent = FileUtils.toByteArray(inputZipStream);
-        mapFileContent.addFile(currentEntryName, fileByteContent);
+        mapFileContent.addFile(zipEntry.getName(), FileUtils.toByteArray(inputZipStream));
       }
 
+      return mapFileContent;
+
     } catch (RuntimeException exception) {
       throw new IOException(exception);
     }
-    return mapFileContent;
   }
 
 
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/json/JsonSchemaDataGeneratorTest.java b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/json/JsonSchemaDataGeneratorTest.java
index ba34d07034..9b21f632cc 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/json/JsonSchemaDataGeneratorTest.java
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/json/JsonSchemaDataGeneratorTest.java
@@ -28,14 +28,17 @@ import org.testng.annotations.Test;
 
 public class JsonSchemaDataGeneratorTest {
 
-  public static final String SCHEMA_WITHOUT_DEFAULTS = new String(
-      FileUtils.toByteArray(FileUtils.getFileInputStream("jsonUtil/json_schema/aSchema.json")));
-  public static final String SCHEMA_WITH_REFS_AND_DEFAULTS = new String(FileUtils.toByteArray(
-      FileUtils.getFileInputStream("jsonUtil/json_schema/schemaWithRefsAndDefaults.json")));
-  public static final String SCHEMA_WITH_INVALID_DEFAULT = new String(FileUtils.toByteArray(
-      FileUtils.getFileInputStream("jsonUtil/json_schema/schemaWithInvalidDefault.json")));
-  public static final String SCHEMA_NIC = new String(
-      FileUtils.toByteArray(FileUtils.getFileInputStream("jsonUtil/json_schema/nicSchema.json")));
+  public static final String SCHEMA_WITHOUT_DEFAULTS =
+          readFromFile("jsonUtil/json_schema/aSchema.json");
+
+  public static final String SCHEMA_WITH_REFS_AND_DEFAULTS =
+          readFromFile("jsonUtil/json_schema/schemaWithRefsAndDefaults.json");
+
+  public static final String SCHEMA_WITH_INVALID_DEFAULT =
+          readFromFile("jsonUtil/json_schema/schemaWithInvalidDefault.json");
+
+  public static final String SCHEMA_NIC =
+          readFromFile("jsonUtil/json_schema/nicSchema.json");
 
   @Test
   public void testSchemaWithoutDefaults() {
@@ -67,4 +70,8 @@ public class JsonSchemaDataGeneratorTest {
     JSONObject dataJson = new JSONObject(data);
     Assert.assertTrue(expectedData.similar(dataJson));
   }
+
+  private static String readFromFile(String filename) {
+    return FileUtils.readViaInputStream(filename, stream -> new String(FileUtils.toByteArray(stream)));
+  }
 }
diff --git a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/json/JsonUtilTest.java b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/json/JsonUtilTest.java
index 6b8805797a..d89019baec 100644
--- a/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/json/JsonUtilTest.java
+++ b/openecomp-be/lib/openecomp-core-lib/openecomp-utilities-lib/src/test/java/org/openecomp/core/utilities/json/JsonUtilTest.java
@@ -31,10 +31,14 @@ public class JsonUtilTest {
 
   @Test
   public void testValidJsonValidate() throws Exception {
-    String json =
-        new String(FileUtils.toByteArray(FileUtils.getFileInputStream("jsonUtil/json/a.json")));
-    String jsonSchema = new String(
-        FileUtils.toByteArray(FileUtils.getFileInputStream("jsonUtil/json_schema/aSchema.json")));
+
+
+
+    String json = FileUtils.readViaInputStream("jsonUtil/json/a.json",
+            stream -> new String(FileUtils.toByteArray(stream)));
+
+    String jsonSchema = FileUtils.readViaInputStream("jsonUtil/json_schema/aSchema.json",
+            stream -> new String(FileUtils.toByteArray(stream)));
 
     List<String> validationErrors = JsonUtil.validate(json, jsonSchema);
     Assert.assertNull(validationErrors);
@@ -42,10 +46,11 @@ public class JsonUtilTest {
 
   @Test
   public void testInValidJsonValidate() throws Exception {
-    String json = new String(
-        FileUtils.toByteArray(FileUtils.getFileInputStream("jsonUtil/json/a_invalid.json")));
-    String jsonSchema = new String(
-        FileUtils.toByteArray(FileUtils.getFileInputStream("jsonUtil/json_schema/aSchema.json")));
+
+    String json = FileUtils.readViaInputStream("jsonUtil/json/a_invalid.json",
+            stream -> new String(FileUtils.toByteArray(stream)));
+    String jsonSchema = FileUtils.readViaInputStream("jsonUtil/json_schema/aSchema.json",
+            stream -> new String(FileUtils.toByteArray(stream)));
 
     List<String> validationErrors = JsonUtil.validate(json, jsonSchema);
     Assert.assertNotNull(validationErrors);
diff --git a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-core/src/main/java/org/openecomp/sdc/healing/impl/HealingManagerImpl.java b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-core/src/main/java/org/openecomp/sdc/healing/impl/HealingManagerImpl.java
index 0d4cb9c0ba..0f2c0e7ee1 100644
--- a/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-core/src/main/java/org/openecomp/sdc/healing/impl/HealingManagerImpl.java
+++ b/openecomp-be/lib/openecomp-healing-lib/openecomp-sdc-healing-core/src/main/java/org/openecomp/sdc/healing/impl/HealingManagerImpl.java
@@ -20,20 +20,19 @@
 
 package org.openecomp.sdc.healing.impl;
 
-import org.openecomp.sdc.datatypes.error.ErrorLevel;
-import org.openecomp.sdc.healing.interfaces.Healer;
 import org.openecomp.core.utilities.file.FileUtils;
-import org.openecomp.sdc.healing.types.HealCode;
 import org.openecomp.core.utilities.json.JsonUtil;
-import org.openecomp.sdc.healing.api.HealingManager;
 import org.openecomp.sdc.common.errors.Messages;
+import org.openecomp.sdc.datatypes.error.ErrorLevel;
+import org.openecomp.sdc.healing.api.HealingManager;
+import org.openecomp.sdc.healing.interfaces.Healer;
+import org.openecomp.sdc.healing.types.HealCode;
 import org.openecomp.sdc.logging.context.impl.MdcDataErrorMessage;
 import org.openecomp.sdc.logging.types.LoggerConstants;
 import org.openecomp.sdc.logging.types.LoggerErrorCode;
 import org.openecomp.sdc.logging.types.LoggerErrorDescription;
 import org.openecomp.sdc.logging.types.LoggerTragetServiceName;
 
-import java.io.InputStream;
 import java.lang.reflect.Constructor;
 import java.util.Map;
 
@@ -77,8 +76,7 @@ public class HealingManagerImpl implements HealingManager {
   }
 
   private static Map<String, String> initHealers() {
-    InputStream healingConfigurationJson = FileUtils.getFileInputStream(HEALING_CONF_FILE);
-    return JsonUtil.json2Object(healingConfigurationJson, Map.class);
+    return FileUtils.readViaInputStream(HEALING_CONF_FILE, stream -> JsonUtil.json2Object(stream, Map.class));
   }
 
   private Healer getHealerImplInstance(String implClassName)
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<String> getExternalArtifactEnrichedImplClassesList() {
-    InputStream externalArtifactEnrichConfigurationJson =
-        FileUtils.getFileInputStream(EXTERNAL_ARTIFACT_ENRICH_CONF_FILE);
     @SuppressWarnings("unchecked")
-    Map<String, String> confFileAsMap =
-        JsonUtil.json2Object(externalArtifactEnrichConfigurationJson, Map.class);
+    Map<String, String> 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);
   }
 }
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/java/com/att/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/java/com/att/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java
index cac3c4ce08..e8fddc3108 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/java/com/att/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/att-sdc-translator-impl/src/test/java/com/att/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java
@@ -20,16 +20,12 @@
 
 package com.att.sdc.translator.services.heattotosca.impl.resourcetranslation;
 
-import static org.junit.Assert.assertEquals;
-
 import org.apache.commons.collections4.MapUtils;
 import org.junit.Assert;
 import org.junit.Before;
 import org.openecomp.core.translator.datatypes.TranslatorOutput;
 import org.openecomp.core.utilities.file.FileUtils;
 import org.openecomp.core.utilities.json.JsonUtil;
-import org.openecomp.core.validation.api.ValidationManager;
-import org.openecomp.core.validation.factory.ValidationManagerFactory;
 import org.openecomp.core.validation.util.MessageContainerUtil;
 import org.openecomp.sdc.common.errors.CoreException;
 import org.openecomp.sdc.common.errors.ErrorCategory;
@@ -46,9 +42,9 @@ import org.openecomp.sdc.logging.types.LoggerErrorCode;
 import org.openecomp.sdc.logging.types.LoggerTragetServiceName;
 import org.openecomp.sdc.tosca.datatypes.model.GroupDefinition;
 import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate;
+import org.openecomp.sdc.tosca.services.ToscaExtensionYamlUtil;
 import org.openecomp.sdc.tosca.services.ToscaFileOutputService;
 import org.openecomp.sdc.tosca.services.impl.ToscaFileOutputServiceCsarImpl;
-import org.openecomp.sdc.tosca.services.ToscaExtensionYamlUtil;
 import org.openecomp.sdc.translator.datatypes.heattotosca.TranslationContext;
 import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.ComputeTemplateConsolidationData;
 import org.openecomp.sdc.translator.datatypes.heattotosca.unifiedmodel.consolidation.ConsolidationData;
@@ -61,7 +57,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -71,6 +66,8 @@ import java.util.Set;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
+import static org.junit.Assert.assertEquals;
+
 
 public class BaseResourceTranslationTest {
 
@@ -280,14 +277,14 @@ public class BaseResourceTranslationTest {
       } else {
         Assert.fail("Invalid expected output files directory");
       }
+
       for (int i = 0; i < fileList.length; i++) {
-        InputStream serviceTemplateInputStream = FileUtils.getFileInputStream
-            (BaseResourceTranslationTest.class
-                .getClassLoader().getResource(baseDirPath + fileList[i]));
-        ServiceTemplate serviceTemplate = toscaExtensionYamlUtil.yamlToObject
-            (serviceTemplateInputStream, ServiceTemplate.class);
+        URL resource = BaseResourceTranslationTest.class.getClassLoader().getResource(baseDirPath + fileList[i]);
+        ServiceTemplate serviceTemplate = FileUtils.readViaInputStream(resource,
+                stream -> toscaExtensionYamlUtil.yamlToObject(stream, ServiceTemplate.class));
         serviceTemplateMap.put(fileList[i], serviceTemplate);
       }
+
     } catch (Exception e) {
       Assert.fail(e.getMessage());
     }
diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/TestUtils.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/TestUtils.java
index 5c2f3db833..43f4065044 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/TestUtils.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/TestUtils.java
@@ -97,10 +97,11 @@ public class TestUtils {
         Assert.fail("Invalid expected output files directory");
       }
       for (int i = 0; i < fileList.length; i++) {
-        InputStream serviceTemplateInputStream = FileUtils.getFileInputStream(TestUtils.class
-            .getClassLoader().getResource(baseDirPath + fileList[i]));
-        ServiceTemplate serviceTemplate = toscaExtensionYamlUtil.yamlToObject
-            (serviceTemplateInputStream, ServiceTemplate.class);
+
+        URL resource = TestUtils.class.getClassLoader().getResource(baseDirPath + fileList[i]);
+        ServiceTemplate serviceTemplate = FileUtils.readViaInputStream(resource,
+                        stream -> toscaExtensionYamlUtil.yamlToObject(stream, ServiceTemplate.class));
+
         serviceTemplateMap.put(fileList[i], serviceTemplate);
       }
     } catch (Exception e) {