diff options
| author |   rb7147 <rb7147@att.com> | 2017-11-02 11:07:45 -0400 |
|---|---|---|
| committer | rb7147 <rb7147@att.com> | 2017-11-02 11:08:09 -0400 |
| commit | 0c15051e79291c5907b6c7d1bb331c9d5c95fa6e (patch) | |
| tree | fedb61c24db61daceebba61766980c18e523f767 | |
| parent | 32020669cd7d5197feac51bb752f07042eb47de1 (diff) | |
Resolved Policy Blocker issue
Issue-ID: POLICY-411
Change-Id: I9579a1fa58a4b40aa6aa70a3007b3ce7c02f5ca2
Signed-off-by: rb7147 <rb7147@att.com>
| -rw-r--r-- | POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java index ff5ccffb0..43b62b0c0 100644 --- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java +++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java @@ -411,23 +411,17 @@ public class CreateDcaeMicroServiceController extends RestrictedBaseController { } + @SuppressWarnings("unchecked") public Map<String, String> load(String fileName) throws IOException { File newConfiguration = new File(fileName); - InputStream is = null; - try { - is = new FileInputStream(newConfiguration); + Yaml yaml = new Yaml(); + Map<Object, Object> yamlMap = null; + try(InputStream is = new FileInputStream(newConfiguration)){ + yamlMap = (Map<Object, Object>) yaml.load(is); } catch (FileNotFoundException e) { LOGGER.error(e); } - Yaml yaml = new Yaml(); - - Map<Object, Object> yamlMap = null; - try{ - yamlMap = (Map<Object, Object>) yaml.load(is); - }catch(Exception e){ - LOGGER.error("load:", e); - } StringBuilder sb = new StringBuilder(); Map<String, String> settings = new HashMap<>(); if (yamlMap == null) { |