Merge "Fix gateway condition in sdncresource"

[so.git] / mso-api-handlers / mso-api-handler-infra / src / main / java / org / openecomp / mso / apihandlerinfra / E2EServiceInstances.java

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java
index 29a5a04..ca821ec 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java
@@ -210,7 +210,7 @@ public class E2EServiceInstances {
                                        MsoLogger.ErrorCode.SchemaError, requestJSON, e);
                        msoLogger.recordAuditEvent(startTime, MsoLogger.StatusCode.ERROR, MsoLogger.ResponseCode.SchemaError,
                                        "Mapping of request to JSON object failed");
-                       msoLogger.debug("End of the transaction, the final response is: " + response.getEntity().toString());
+                       msoLogger.debug(END_OF_THE_TRANSACTION + response.getEntity().toString());
 
                        return response;
                }
@@ -259,7 +259,7 @@ public class E2EServiceInstances {
                                        MsoLogger.ErrorCode.AvailabilityError, "Exception while communicate with BPMN engine",e);
                        msoLogger.recordAuditEvent(startTime, MsoLogger.StatusCode.ERROR, MsoLogger.ResponseCode.CommunicationError,
                                        "Exception while communicate with BPMN engine");
-                       msoLogger.debug("End of the transaction, the final response is: " + resp.getEntity().toString());
+                       msoLogger.debug(END_OF_THE_TRANSACTION + resp.getEntity().toString());
                        return resp;
                }
 
@@ -276,8 +276,6 @@ public class E2EServiceInstances {
 
                ResponseHandler respHandler = new ResponseHandler(response, requestClient.getType());
                int bpelStatus = respHandler.getStatus();
-               // String responseBody = respHandler.getResponseBody();
-               // CompareModelsResult modelDiffResponse = new CompareModelsResult();
 
                return beplStatusUpdate(requestId, startTime, msoRequest, requestClient, respHandler, bpelStatus, action,
                                instanceIdMap);
@@ -319,7 +317,7 @@ public class E2EServiceInstances {
                        msoLogger.recordAuditEvent(startTime, MsoLogger.StatusCode.ERROR,
                                        MsoLogger.ResponseCode.DBAccessError,
                                        "Exception while communciate with Request DB");
-                       msoLogger.debug("End of the transaction, the final response is: "
+                       msoLogger.debug(END_OF_THE_TRANSACTION
                                        + (String) response.getEntity());
                        return response;
 
@@ -337,7 +335,7 @@ public class E2EServiceInstances {
                        msoLogger.recordAuditEvent(startTime, MsoLogger.StatusCode.ERROR,
                                        MsoLogger.ResponseCode.DataNotFound,
                                        "Null response from RequestDB when searching by serviceId");
-                       msoLogger.debug("End of the transaction, the final response is: "
+                       msoLogger.debug(END_OF_THE_TRANSACTION
                                        + (String) resp.getEntity());
                        return resp;
 
@@ -378,7 +376,7 @@ public class E2EServiceInstances {
                        msoLogger.recordAuditEvent(startTime, MsoLogger.StatusCode.ERROR,
                                        MsoLogger.ResponseCode.SchemaError,
                                        "Mapping of request to JSON object failed");
-                       msoLogger.debug("End of the transaction, the final response is: "
+                       msoLogger.debug(END_OF_THE_TRANSACTION
                                        + (String) response.getEntity());
                        return response;
                }
@@ -532,7 +530,7 @@ public class E2EServiceInstances {
                                        MsoLogger.ErrorCode.SchemaError, requestJSON, e);
                        msoLogger.recordAuditEvent(startTime, MsoLogger.StatusCode.ERROR, MsoLogger.ResponseCode.SchemaError,
                                        "Mapping of request to JSON object failed");
-                       msoLogger.debug("End of the transaction, the final response is: " + (String) response.getEntity());
+                       msoLogger.debug(END_OF_THE_TRANSACTION + (String) response.getEntity());
                        return response;
                }
 
@@ -552,7 +550,7 @@ public class E2EServiceInstances {
                                        MsoLogger.ErrorCode.SchemaError, requestJSON, e);
                        msoLogger.recordAuditEvent(startTime, MsoLogger.StatusCode.ERROR, MsoLogger.ResponseCode.SchemaError,
                                        "Validation of the input request failed");
-                       msoLogger.debug("End of the transaction, the final response is: " + (String) response.getEntity());
+                       msoLogger.debug(END_OF_THE_TRANSACTION + (String) response.getEntity());
                        return response;
                }
                
@@ -632,7 +630,7 @@ public class E2EServiceInstances {
                                        MsoLogger.ErrorCode.AvailabilityError, "Exception while communicate with BPMN engine");
                        msoLogger.recordAuditEvent(startTime, MsoLogger.StatusCode.ERROR, MsoLogger.ResponseCode.CommunicationError,
                                        "Exception while communicate with BPMN engine");
-                       msoLogger.debug("End of the transaction, the final response is: " + (String) getBPMNResp.getEntity());
+                       msoLogger.debug(END_OF_THE_TRANSACTION + (String) getBPMNResp.getEntity());
 
                        return getBPMNResp;
                }
@@ -678,7 +676,7 @@ public class E2EServiceInstances {
                                        MsoLogger.ErrorCode.SchemaError, requestJSON, e);
                        msoLogger.recordAuditEvent(startTime, MsoLogger.StatusCode.ERROR, MsoLogger.ResponseCode.SchemaError,
                                        "Mapping of request to JSON object failed");
-                       msoLogger.debug("End of the transaction, the final response is: " + (String) response.getEntity());
+                       msoLogger.debug(END_OF_THE_TRANSACTION + (String) response.getEntity());
                        return response;
                }
 
@@ -698,7 +696,7 @@ public class E2EServiceInstances {
                                        MsoLogger.ErrorCode.SchemaError, requestJSON, e);
                        msoLogger.recordAuditEvent(startTime, MsoLogger.StatusCode.ERROR, MsoLogger.ResponseCode.SchemaError,
                                        "Validation of the input request failed");
-                       msoLogger.debug("End of the transaction, the final response is: " + (String) response.getEntity());
+                       msoLogger.debug(END_OF_THE_TRANSACTION + (String) response.getEntity());
                        return response;
                }               
 
@@ -773,7 +771,7 @@ public class E2EServiceInstances {
                                        MsoLogger.ErrorCode.AvailabilityError, "Exception while communicate with BPMN engine");
                        msoLogger.recordAuditEvent(startTime, MsoLogger.StatusCode.ERROR, MsoLogger.ResponseCode.CommunicationError,
                                        "Exception while communicate with BPMN engine");
-                       msoLogger.debug("End of the transaction, the final response is: " + (String) resp.getEntity());
+                       msoLogger.debug(END_OF_THE_TRANSACTION + (String) resp.getEntity());
                        return resp;
                }
 
@@ -824,7 +822,7 @@ public class E2EServiceInstances {
             msoLogger.recordAuditEvent(startTime, MsoLogger.StatusCode.ERROR,
                     MsoLogger.ResponseCode.SchemaError,
                     "Mapping of request to JSON object failed");
-            msoLogger.debug("End of the transaction, the final response is: "
+            msoLogger.debug(END_OF_THE_TRANSACTION
                     + (String) response.getEntity());
             return response;
         }
@@ -927,7 +925,7 @@ public class E2EServiceInstances {
             msoLogger.recordAuditEvent(startTime, MsoLogger.StatusCode.ERROR,
                     MsoLogger.ResponseCode.CommunicationError,
                     "Exception while communicate with BPMN engine");
-            msoLogger.debug("End of the transaction, the final response is: "
+            msoLogger.debug(END_OF_THE_TRANSACTION
                     + (String) resp.getEntity());
             return resp;
         }