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 --- .../src/test/java/org/openecomp/sdc/translator/TestUtils.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src') 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) { -- cgit 1.2.3-korg