summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshashikanth <shashikanth.vh@huawei.com>2017-09-20 11:23:57 +0530
committerShashikanth VH <shashikanth.vh@huawei.com>2017-09-21 11:30:36 +0000
commitd1b007ac1f58aa3b720d241f9194ef2a2ac8e6cc (patch)
treee145982c591712182ac40557f6a827ac45239b05
parenta40af07cdb70ab61e06e68d020ff398cc9055828 (diff)
Fix Blocker/Critical sonar issues
Fix Blocker/Critical sonar issues in aai/sparky-be module https://sonar.onap.org/component_issues?id=org.openecomp.aai.sparky-be%3Asparky-be#resolved=false|severities=BLOCKER Fixed Close "FileInputStream". Issue-Id:AAI-342 Change-Id: Ia97fa8fee074660e081123e3fb6334d670d2fad1 Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
-rw-r--r--src/main/java/org/openecomp/sparky/config/oxm/OxmModelLoader.java34
1 files changed, 15 insertions, 19 deletions
diff --git a/src/main/java/org/openecomp/sparky/config/oxm/OxmModelLoader.java b/src/main/java/org/openecomp/sparky/config/oxm/OxmModelLoader.java
index 8a2cc6e..2a19551 100644
--- a/src/main/java/org/openecomp/sparky/config/oxm/OxmModelLoader.java
+++ b/src/main/java/org/openecomp/sparky/config/oxm/OxmModelLoader.java
@@ -50,7 +50,6 @@ import org.openecomp.sparky.logging.AaiUiMsgs;
import org.openecomp.sparky.synchronizer.entity.SuggestionSearchEntity;
import org.openecomp.sparky.viewandinspect.config.TierSupportUiConstants;
-
/**
* The Class OxmModelLoader.
*/
@@ -133,27 +132,24 @@ public class OxmModelLoader {
*/
public void loadModel(String version) {
String fileName = loadOxmFileName(version);
- InputStream inputStream;
- try {
- inputStream = new FileInputStream(new File(fileName));
- } catch (FileNotFoundException fnf) {
- LOG.info(AaiUiMsgs.OXM_READ_ERROR_NONVERBOSE);
- LOG.error(AaiUiMsgs.OXM_READ_ERROR_VERBOSE, fileName);
- return;
- }
- Map<String, Object> properties = new HashMap<String, Object>();
- properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, inputStream);
- try {
- final DynamicJAXBContext oxmContext = DynamicJAXBContextFactory
- .createContextFromOXM(Thread.currentThread().getContextClassLoader(), properties);
+ try(FileInputStream inputStream = new FileInputStream(new File(fileName))) {
+ Map<String, Object> properties = new HashMap<String, Object>();
+ properties.put(JAXBContextProperties.OXM_METADATA_SOURCE, inputStream);
- parseOxmContext(oxmContext);
- // populateSearchableOxmModel();
- LOG.info(AaiUiMsgs.OXM_LOAD_SUCCESS);
+ final DynamicJAXBContext oxmContext = DynamicJAXBContextFactory
+ .createContextFromOXM(Thread.currentThread()
+ .getContextClassLoader(), properties);
+ parseOxmContext(oxmContext);
+ // populateSearchableOxmModel();
+ LOG.info(AaiUiMsgs.OXM_LOAD_SUCCESS);
+
+ } catch (FileNotFoundException fnf) {
+ LOG.info(AaiUiMsgs.OXM_READ_ERROR_NONVERBOSE);
+ LOG.error(AaiUiMsgs.OXM_READ_ERROR_VERBOSE, fileName);
} catch (Exception exc) {
- LOG.info(AaiUiMsgs.OXM_PARSE_ERROR_NONVERBOSE);
- LOG.error(AaiUiMsgs.OXM_PARSE_ERROR_VERBOSE, fileName, exc.getMessage());
+ LOG.info(AaiUiMsgs.OXM_PARSE_ERROR_NONVERBOSE);
+ LOG.error(AaiUiMsgs.OXM_PARSE_ERROR_VERBOSE, fileName, exc.getMessage());
}
}