summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2019-01-07 16:46:11 +0000
committerGerrit Code Review <gerrit@onap.org>2019-01-07 16:46:11 +0000
commit26f865938e18be289d51956663956ec315200910 (patch)
tree4735f42af87d2eeea3562ae6b3fbd9d64340637c
parent3136dd2ae9e213d1bcdb60d71a68d63234e4315c (diff)
parent5b5cd94817ec53dcda4908a9ad11c4a4f4a8fa2c (diff)
Merge "fixed sonar issues in AAIClientRESTExecutor"
-rwxr-xr-xaai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutor.java20
1 files changed, 11 insertions, 9 deletions
diff --git a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutor.java b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutor.java
index 53fcd9f4d..cf1392f67 100755
--- a/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutor.java
+++ b/aai-service/provider/src/main/java/org/onap/ccsdk/sli/adaptors/aai/AAIClientRESTExecutor.java
@@ -5,6 +5,8 @@
* Copyright (C) 2017 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
+ * Modifications Copyright (C) 2018 IBM.
+ * ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
@@ -79,6 +81,7 @@ public class AAIClientRESTExecutor implements AAIExecutorInterface {
private String userName;
private String userPassword;
private final String applicationId;
+ private static final String HTTP_URL_CONNECTION_RESULT="HttpURLConnection result: {} : {}";
/**
* class Constructor
@@ -116,10 +119,9 @@ public class AAIClientRESTExecutor implements AAIExecutorInterface {
ignoreCertificateHostError = host_error;
- HttpsURLConnection.setDefaultHostnameVerifier( new HostnameVerifier(){
- public boolean verify(String string,SSLSession ssls) {
- return ignoreCertificateHostError;
- }
+ HttpsURLConnection.setDefaultHostnameVerifier( (String string,SSLSession ssls) -> {
+ return ignoreCertificateHostError;
+
});
if(truststorePath != null && truststorePassword != null && (new File(truststorePath)).exists()) {
@@ -257,7 +259,7 @@ public class AAIClientRESTExecutor implements AAIExecutorInterface {
}
// Process the response
- LOG.info("HttpURLConnection result: {} : {}", responseCode, responseMessage);
+ LOG.info(HTTP_URL_CONNECTION_RESULT, responseCode, responseMessage);
logMetricResponse(responseCode, responseMessage);
if(inputStream == null) inputStream = new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8));
@@ -398,7 +400,7 @@ public class AAIClientRESTExecutor implements AAIExecutorInterface {
responseMessage = NOT_PROVIDED;
}
- LOG.info("HttpURLConnection result: {} : {}", responseCode, responseMessage);
+ LOG.info(HTTP_URL_CONNECTION_RESULT, responseCode, responseMessage);
logMetricResponse(responseCode, responseMessage);
// Process the response
@@ -481,7 +483,7 @@ public class AAIClientRESTExecutor implements AAIExecutorInterface {
}
// Process the response
- LOG.info("HttpURLConnection result: {} : {}", responseCode, responseMessage);
+ LOG.info(HTTP_URL_CONNECTION_RESULT, responseCode, responseMessage);
logMetricResponse(responseCode, responseMessage);
if(inputStream == null) inputStream = new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8));
@@ -562,7 +564,7 @@ public class AAIClientRESTExecutor implements AAIExecutorInterface {
responseMessage = NOT_PROVIDED;
}
- LOG.info("HttpURLConnection result: {} : {}", responseCode, responseMessage);
+ LOG.info(HTTP_URL_CONNECTION_RESULT, responseCode, responseMessage);
logMetricResponse(responseCode, responseMessage);
ObjectMapper mapper = AAIService.getObjectMapper();
@@ -639,7 +641,7 @@ public class AAIClientRESTExecutor implements AAIExecutorInterface {
responseMessage = NOT_PROVIDED;
}
- LOG.info("HttpURLConnection result: {} : {}", responseCode, responseMessage);
+ LOG.info(HTTP_URL_CONNECTION_RESULT, responseCode, responseMessage);
logMetricResponse(responseCode, responseMessage);
// Process the response