Updating aai adapter to v14 model

[ccsdk/sli/adaptors.git] / aai-service / provider / src / main / java / org / onap / ccsdk / sli / adaptors / aai / AAIClientRESTExecutor.java

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 aa134cb..0050afb 100755 (executable)
--- 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
@@ -65,12 +65,13 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sun.jersey.api.client.config.DefaultClientConfig;
 import com.sun.jersey.client.urlconnection.HTTPSProperties;
+import org.apache.http.impl.EnglishReasonPhraseCatalog;
 
 /**
  * The AAIClientRESTExecutor class provides CRUD API for AAI Client service.
  * @author  richtabedzki
  */
-public     class AAIClientRESTExecutor implements AAIExecutorInterface {
+public class AAIClientRESTExecutor implements AAIExecutorInterface {
 
     private final String truststorePath;
     private final String truststorePassword;
@@ -199,6 +200,7 @@ public     class AAIClientRESTExecutor implements AAIExecutorInterface {
     }
 
     private static final Logger LOG = LoggerFactory.getLogger(AAIService.class);
+    private static final String NOT_PROVIDED = "NOT PROVIDED";
     private final MetricLogger ml = new MetricLogger();
 
     private SSLContext CTX;
@@ -248,16 +250,23 @@ public     class AAIClientRESTExecutor implements AAIExecutorInterface {
             }
 
             // Check for errors
-            String responseMessage = con.getResponseMessage();
             int responseCode = con.getResponseCode();
             if (responseCode == HttpURLConnection.HTTP_OK) {
                 inputStream = con.getInputStream();
             } else {
                 inputStream = con.getErrorStream();
             }
+            String responseMessage = null;
+            try {
+               responseMessage = con.getResponseMessage();
+            } catch(Exception exc) {
+               responseMessage = EnglishReasonPhraseCatalog.INSTANCE.getReason(responseCode,null);
+               if(responseMessage == null)
+                       responseMessage = NOT_PROVIDED;
+            }
 
             // Process the response
-            LOG.debug("HttpURLConnection result:" + responseCode + " : " + responseMessage);
+            LOG.info("HttpURLConnection result: {} : {}", responseCode, responseMessage);
             logMetricResponse(responseCode, responseMessage);
 
             if(inputStream == null) inputStream = new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8));
@@ -382,15 +391,22 @@ public     class AAIClientRESTExecutor implements AAIExecutorInterface {
             osw.flush();
 
             // Check for errors
-            String responseMessage = con.getResponseMessage();
             int responseCode = con.getResponseCode();
             if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_CREATED || responseCode == HttpURLConnection.HTTP_ACCEPTED || responseCode == HttpURLConnection.HTTP_NO_CONTENT) {
                 inputStream = con.getInputStream();
             } else {
                 inputStream = con.getErrorStream();
             }
+            String responseMessage = null;
+            try {
+               responseMessage = con.getResponseMessage();
+            } catch(Exception exc) {
+               responseMessage = EnglishReasonPhraseCatalog.INSTANCE.getReason(responseCode,null);
+               if(responseMessage == null)
+                       responseMessage = NOT_PROVIDED;
+            }
 
-            LOG.debug("HttpURLConnection result:" + responseCode + " : " + responseMessage);
+            LOG.info("HttpURLConnection result: {} : {}", responseCode, responseMessage);
             logMetricResponse(responseCode, responseMessage);
 
             // Process the response
@@ -456,16 +472,23 @@ public     class AAIClientRESTExecutor implements AAIExecutorInterface {
             conn.setDoOutput(true);
 
             // Check for errors
-            String responseMessage = conn.getResponseMessage();
             int responseCode = conn.getResponseCode();
             if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_NO_CONTENT) {
                 inputStream = conn.getInputStream();
             } else {
                 inputStream = conn.getErrorStream();
             }
+            String responseMessage = null;
+            try {
+               responseMessage = conn.getResponseMessage();
+            } catch(Exception exc) {
+               responseMessage = EnglishReasonPhraseCatalog.INSTANCE.getReason(responseCode,null);
+               if(responseMessage == null)
+                       responseMessage = NOT_PROVIDED;
+            }
 
             // Process the response
-            LOG.debug("HttpURLConnection result:" + responseCode + " : " + responseMessage);
+            LOG.info("HttpURLConnection result: {} : {}", responseCode, responseMessage);
             logMetricResponse(responseCode, responseMessage);
 
             if(inputStream == null) inputStream = new ByteArrayInputStream("".getBytes(StandardCharsets.UTF_8));
@@ -530,14 +553,22 @@ public     class AAIClientRESTExecutor implements AAIExecutorInterface {
             logMetricRequest("GET "+requestUrl.getPath(), "", requestUrl.getPath());
 
             // Check for errors
-            String responseMessage = con.getResponseMessage();
             int responseCode = con.getResponseCode();
             if (responseCode == HttpURLConnection.HTTP_OK) {
                 inputStream = con.getInputStream();
             } else {
                 inputStream = con.getErrorStream();
             }
+            String responseMessage = null;
+            try {
+               responseMessage = con.getResponseMessage();
+            } catch(Exception exc) {
+               responseMessage = EnglishReasonPhraseCatalog.INSTANCE.getReason(responseCode,null);
+               if(responseMessage == null)
+                       responseMessage = NOT_PROVIDED;
+            }
 
+            LOG.info("HttpURLConnection result: {} : {}", responseCode, responseMessage);
             logMetricResponse(responseCode, responseMessage);
             ObjectMapper mapper = AAIService.getObjectMapper();
 
@@ -596,15 +627,22 @@ public     class AAIClientRESTExecutor implements AAIExecutorInterface {
             osw.flush();
 
             // Check for errors
-            String responseMessage = con.getResponseMessage();
             int responseCode = con.getResponseCode();
             if (responseCode == HttpURLConnection.HTTP_OK || responseCode == HttpURLConnection.HTTP_CREATED || responseCode == HttpURLConnection.HTTP_ACCEPTED || responseCode == HttpURLConnection.HTTP_NO_CONTENT) {
                 inputStream = con.getInputStream();
             } else {
                 inputStream = con.getErrorStream();
             }
+            String responseMessage = null;
+            try {
+               responseMessage = con.getResponseMessage();
+            } catch(Exception exc) {
+               responseMessage = EnglishReasonPhraseCatalog.INSTANCE.getReason(responseCode,null);
+               if(responseMessage == null)
+                       responseMessage = NOT_PROVIDED;
+            }
 
-            LOG.info("HttpURLConnection result: " + responseCode + " : " + responseMessage);
+            LOG.info("HttpURLConnection result: {} : {}", responseCode, responseMessage);
             logMetricResponse(responseCode, responseMessage);
 
             // Process the response