summaryrefslogtreecommitdiffstats
path: root/profiles
diff options
context:
space:
mode:
authorKanagaraj Manickam <kanagaraj.manickam@huawei.com>2018-02-06 06:25:22 +0000
committerGerrit Code Review <gerrit@onap.org>2018-02-06 06:25:22 +0000
commit55386d02df6cda4581a4207233e0f72353f9fbb7 (patch)
tree07283ed931ebf2c2afd93f84832457b5870b87f9 /profiles
parent3e8603790c2cf85f140f531cbbd0698547ba2ebc (diff)
parentb6831eb583cd12b776900c06a32bed4835d109e3 (diff)
Merge changes I5e54f97c,If7de4980,Ia25e6b66
* changes: Make Closable objects are used latter Ignore those exceptions never occurs Improve spl macro handling
Diffstat (limited to 'profiles')
-rw-r--r--profiles/http/src/main/java/org/onap/cli/fw/http/conf/OnapCommandHttpConstants.java2
-rw-r--r--profiles/http/src/main/java/org/onap/cli/fw/http/connect/OnapHttpConnection.java2
-rw-r--r--profiles/http/src/main/java/org/onap/cli/fw/http/schema/OnapCommandSchemaHttpLoader.java5
-rw-r--r--profiles/http/src/main/java/org/onap/cli/fw/http/utils/OnapCommandHttpUtils.java6
4 files changed, 7 insertions, 8 deletions
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) {