diff options
author | 2018-02-06 06:25:22 +0000 | |
---|---|---|
committer | 2018-02-06 06:25:22 +0000 | |
commit | 55386d02df6cda4581a4207233e0f72353f9fbb7 (patch) | |
tree | 07283ed931ebf2c2afd93f84832457b5870b87f9 | |
parent | 3e8603790c2cf85f140f531cbbd0698547ba2ebc (diff) | |
parent | b6831eb583cd12b776900c06a32bed4835d109e3 (diff) |
Merge changes I5e54f97c,If7de4980,Ia25e6b66
* changes:
Make Closable objects are used latter
Ignore those exceptions never occurs
Improve spl macro handling
8 files changed, 24 insertions, 26 deletions
diff --git a/framework/src/main/java/org/onap/cli/fw/registrar/OnapCommandRegistrar.java b/framework/src/main/java/org/onap/cli/fw/registrar/OnapCommandRegistrar.java index 19dc3f56..854b55be 100644 --- a/framework/src/main/java/org/onap/cli/fw/registrar/OnapCommandRegistrar.java +++ b/framework/src/main/java/org/onap/cli/fw/registrar/OnapCommandRegistrar.java @@ -314,8 +314,8 @@ public class OnapCommandRegistrar { String versionInfo = ""; try { versionInfo = IOUtils.toString(this.getClass().getClassLoader().getResourceAsStream(OnapCommandConstants.VERSION_INFO)); - } catch (IOException e) { - //Never occurs // NOSONAR + } catch (IOException e) { // NOSONAR + //Never occurs } versionInfo = versionInfo.replaceAll(OnapCommandConstants.VERSION_INFO_PLACE_HOLDER_ENB_PRD_VER, configuredProductVersion); 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); } diff --git a/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandHelperUtils.java b/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandHelperUtils.java index 5e8c3f52..81589b09 100644 --- a/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandHelperUtils.java +++ b/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandHelperUtils.java @@ -53,7 +53,7 @@ public class OnapCommandHelperUtils { impBuildDate = attributes.getValue("Build-Time"); } - catch (IOException e) + catch (IOException e) // NOSONAR { //Ignore it as it will never occur } diff --git a/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java b/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java index 93a34577..bd910748 100644 --- a/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java +++ b/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java @@ -173,25 +173,25 @@ public class OnapCommandUtils { * There are unique values like uuid is supported, so when input, output (default) values has * these special entries, then it will get replaced with it's value * - * @param line + * @param lineSpl * @return */ - public static String replaceLineForSpecialValues(String line) { - String result = ""; + public static String replaceLineForSpecialValues(String lineSpl) { + String resultSpl = ""; - if (!line.contains("$s{")) { - return line; + if (!lineSpl.contains("$s{")) { + return lineSpl; } int currentIdx = 0; - while (currentIdx < line.length()) { - int idxS = line.indexOf("$s{", currentIdx); + while (currentIdx < lineSpl.length()) { + int idxS = lineSpl.indexOf("$s{", currentIdx); if (idxS == -1) { - result += line.substring(currentIdx); + resultSpl += lineSpl.substring(currentIdx); break; } - int idxE = line.indexOf("}", idxS); - String splEntry = line.substring(idxS + 3, idxE); + int idxE = lineSpl.indexOf("}", idxS); + String splEntry = lineSpl.substring(idxS + 3, idxE); splEntry = splEntry.trim(); String value = ""; @@ -218,11 +218,11 @@ public class OnapCommandUtils { } } - result += line.substring(currentIdx, idxS) + value; + resultSpl += lineSpl.substring(currentIdx, idxS) + value; currentIdx = idxE + 1; } - return result; + return resultSpl; } public static String replaceLineFromInputParameters(String line, Map<String, OnapCommandParameter> params) diff --git a/profiles/http/src/main/java/org/onap/cli/fw/http/conf/OnapCommandHttpConstants.java b/profiles/http/src/main/java/org/onap/cli/fw/http/conf/OnapCommandHttpConstants.java index cd10849b..b18545cb 100644 --- a/profiles/http/src/main/java/org/onap/cli/fw/http/conf/OnapCommandHttpConstants.java +++ b/profiles/http/src/main/java/org/onap/cli/fw/http/conf/OnapCommandHttpConstants.java @@ -34,7 +34,7 @@ public class OnapCommandHttpConstants { public static final String APPLICATION_JSON = "application/json"; public static final String DEFAULT_PARAMETER_HTTP_FILE_NAME = "default_input_parameters_http.yaml"; public static final String DEAFULT_PARAMETER_USERNAME = "host-username"; - public static final String DEAFULT_PARAMETER_PASSWORD = "host-password"; + public static final String DEAFULT_PARAMETER_PASSWORD = "host-password"; // NOSONAR public static final String DEAFULT_PARAMETER_HOST_URL = "host-url"; public static final String DEFAULT_PARAMETER_NO_AUTH = "no-auth"; public static final String HTTP_SCHEMA_PROFILE = "http"; diff --git a/profiles/http/src/main/java/org/onap/cli/fw/http/connect/OnapHttpConnection.java b/profiles/http/src/main/java/org/onap/cli/fw/http/connect/OnapHttpConnection.java index 5b6df29d..3e03efa7 100644 --- a/profiles/http/src/main/java/org/onap/cli/fw/http/connect/OnapHttpConnection.java +++ b/profiles/http/src/main/java/org/onap/cli/fw/http/connect/OnapHttpConnection.java @@ -129,7 +129,7 @@ public class OnapHttpConnection { this.httpClient = HttpClients.custom().setConnectionManager(connManager) .setRedirectStrategy(new LaxRedirectStrategy()).build(); } else { - this.httpClient = HttpClients.createDefault(); + this.httpClient = HttpClients.createDefault(); // NOSONAR } } catch (Exception e) { throw new OnapCommandHttpFailure(e); diff --git a/profiles/http/src/main/java/org/onap/cli/fw/http/schema/OnapCommandSchemaHttpLoader.java b/profiles/http/src/main/java/org/onap/cli/fw/http/schema/OnapCommandSchemaHttpLoader.java index 52ced397..8e01b585 100644 --- a/profiles/http/src/main/java/org/onap/cli/fw/http/schema/OnapCommandSchemaHttpLoader.java +++ b/profiles/http/src/main/java/org/onap/cli/fw/http/schema/OnapCommandSchemaHttpLoader.java @@ -52,8 +52,7 @@ public class OnapCommandSchemaHttpLoader { try { List<String> errors = new ArrayList<>(); if (includeDefault) { - Map<String, ?> defaultParameterMap = includeDefault ? - OnapCommandSchemaLoader.validateSchemaVersion(OnapCommandHttpConstants.DEFAULT_PARAMETER_HTTP_FILE_NAME, cmd.getSchemaVersion()) : new HashMap<>(); + Map<String, ?> defaultParameterMap = OnapCommandSchemaLoader.validateSchemaVersion(OnapCommandHttpConstants.DEFAULT_PARAMETER_HTTP_FILE_NAME, cmd.getSchemaVersion()); //mrkanag default_parameter is supported only for parameters. if (defaultParameterMap.containsKey(OnapCommandConstants.INFO)) { @@ -434,7 +433,7 @@ public class OnapCommandSchemaHttpLoader { forCmd.getInfo().getService() + "-" + forCmd.getService().getAuthType() + "-" + authAction, forCmd.getInfo().getProduct()); - } catch (OnapCommandNotFound e) { + } catch (OnapCommandNotFound e) { // NOSONAR auth = OnapCommandRegistrar.getRegistrar().get( forCmd.getService().getAuthType() + "-" + authAction, forCmd.getInfo().getProduct()); diff --git a/profiles/http/src/main/java/org/onap/cli/fw/http/utils/OnapCommandHttpUtils.java b/profiles/http/src/main/java/org/onap/cli/fw/http/utils/OnapCommandHttpUtils.java index cd918783..7b10dbce 100644 --- a/profiles/http/src/main/java/org/onap/cli/fw/http/utils/OnapCommandHttpUtils.java +++ b/profiles/http/src/main/java/org/onap/cli/fw/http/utils/OnapCommandHttpUtils.java @@ -107,8 +107,8 @@ public class OnapCommandHttpUtils { String key = entry.getKey(); try { resultsProcessed.put(key, OnapCommandHttpUtils.replaceLineFromOutputResults(resultMap.get(key), resultHttp)); - } catch(OnapCommandResultEmpty e) { - // pass // NOSONAR + } catch(OnapCommandResultEmpty e) { // NOSONAR + // pass } } @@ -174,7 +174,7 @@ public class OnapCommandHttpUtils { try { // JSONArray or String value = JsonPath.read(resultHttp.getBody(), jsonPath); - } catch (PathNotFoundException e1) { + } catch (PathNotFoundException e1) { // NOSONAR //set to blank for those entries which are missing from the output json value = ""; } catch (Exception e) { |