diff options
author | Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com> | 2018-02-05 20:40:34 +0530 |
---|---|---|
committer | Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com> | 2018-02-05 20:40:34 +0530 |
commit | b6831eb583cd12b776900c06a32bed4835d109e3 (patch) | |
tree | abd35b0e2935ec22dfd2be79699189da246be0ab /framework | |
parent | dd37614bf83ca78ba350a063873444ca20b4fcd7 (diff) |
Make Closable objects are used latter
Issue-ID: CLI-50
Change-Id: I5e54f97ca359ee008a1ef82804b47a4e42231cc3
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Diffstat (limited to 'framework')
-rw-r--r-- | framework/src/main/java/org/onap/cli/fw/schema/OnapCommandSchemaLoader.java | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/framework/src/main/java/org/onap/cli/fw/schema/OnapCommandSchemaLoader.java b/framework/src/main/java/org/onap/cli/fw/schema/OnapCommandSchemaLoader.java index bcf93269..b47000a1 100644 --- a/framework/src/main/java/org/onap/cli/fw/schema/OnapCommandSchemaLoader.java +++ b/framework/src/main/java/org/onap/cli/fw/schema/OnapCommandSchemaLoader.java @@ -145,8 +145,7 @@ public class OnapCommandSchemaLoader { try { List<String> errors = new ArrayList<>(); if (includeDefault) { - Map<String, ?> defaultParameterMap = includeDefault ? - validateSchemaVersion(DEFAULT_PARAMETER_FILE_NAME, cmd.getSchemaVersion()) : new HashMap<>(); + Map<String, ?> defaultParameterMap = validateSchemaVersion(DEFAULT_PARAMETER_FILE_NAME, cmd.getSchemaVersion()); //mrkanag default_parameter is supported only for parameters. if (defaultParameterMap.containsKey(INFO)) { defaultParameterMap.remove(OnapCommandConstants.INFO); @@ -508,7 +507,7 @@ public class OnapCommandSchemaLoader { public static InputStream loadSchemaFromFile(String schemaLocation) throws OnapCommandInvalidSchema { File schemaFile = new File(schemaLocation); try { - FileInputStream inputFileStream = new FileInputStream(schemaFile); + FileInputStream inputFileStream = new FileInputStream(schemaFile); // NOSONAR if (!schemaFile.isFile()) { throw new OnapCommandInvalidSchema(schemaFile.getName(), SCHEMA_FILE_NOT_EXIST); } |