update logger statements in apih

Corrected arguments to logger methods
only log exception in catch blocks

Change-Id: I0657b00ce45ac543d5e900db6ce5c24ba34e345d
Issue-ID: SO-2007
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

3 files changed, 8 insertions, 21 deletions

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/MsoRequest.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/MsoRequest.java
index 243fa8085c..45b521d984 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/MsoRequest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/MsoRequest.java
@@ -42,16 +42,15 @@ import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;
 import javax.xml.transform.dom.DOMSource;
 import javax.xml.transform.stream.StreamResult;
-import org.onap.so.logger.LoggingAnchor;
 import org.onap.so.apihandler.common.ResponseBuilder;
 import org.onap.so.apihandlerinfra.tasksbeans.TasksRequest;
-import org.onap.so.apihandlerinfra.validation.MembersValidation;
 import org.onap.so.apihandlerinfra.validation.ApplyUpdatedConfigValidation;
 import org.onap.so.apihandlerinfra.validation.CloudConfigurationValidation;
 import org.onap.so.apihandlerinfra.validation.ConfigurationParametersValidation;
 import org.onap.so.apihandlerinfra.validation.CustomWorkflowValidation;
 import org.onap.so.apihandlerinfra.validation.InPlaceSoftwareUpdateValidation;
 import org.onap.so.apihandlerinfra.validation.InstanceIdMapValidation;
+import org.onap.so.apihandlerinfra.validation.MembersValidation;
 import org.onap.so.apihandlerinfra.validation.ModelInfoValidation;
 import org.onap.so.apihandlerinfra.validation.PlatformLOBValidation;
 import org.onap.so.apihandlerinfra.validation.ProjectOwningEntityValidation;
@@ -69,9 +68,7 @@ import org.onap.so.apihandlerinfra.vnfbeans.VnfRequest;
 import org.onap.so.db.request.beans.InfraActiveRequests;
 import org.onap.so.db.request.client.RequestsDbClient;
 import org.onap.so.exceptions.ValidationException;
-import org.onap.so.logger.ErrorCode;
 import org.onap.so.logger.LogConstants;
-import org.onap.so.logger.MessageEnum;
 import org.onap.so.serviceinstancebeans.CloudConfiguration;
 import org.onap.so.serviceinstancebeans.InstanceDirection;
 import org.onap.so.serviceinstancebeans.ModelInfo;
@@ -152,9 +149,7 @@ public class MsoRequest {
             mapper.setSerializationInclusion(Include.NON_DEFAULT);
             requestErrorStr = mapper.writeValueAsString(re);
         } catch (Exception e) {
-            logger.error(LoggingAnchor.THREE, MessageEnum.APIH_VALIDATION_ERROR.toString(),
-                    ErrorCode.DataError.getValue(),
-                    "Exception in buildServiceErrorResponse writing exceptionType to string ", e);
+            logger.error("Exception in buildServiceErrorResponse writing exceptionType to string ", e);
         }
 
         return builder.buildResponse(httpResponseCode, null, requestErrorStr, version);
@@ -398,8 +393,7 @@ public class MsoRequest {
             aq.setRequestStatus(status.toString());
             aq.setLastModifiedBy(Constants.MODIFIED_BY_APIHANDLER);
         } catch (Exception e) {
-            logger.error(LoggingAnchor.THREE, MessageEnum.APIH_DB_INSERT_EXC.toString(), ErrorCode.DataError.getValue(),
-                    "Exception when creation record request", e);
+            logger.error("Exception when creation record request", e);
 
             if (!status.equals(Status.FAILED)) {
                 throw e;
@@ -439,8 +433,7 @@ public class MsoRequest {
             aq.setLastModifiedBy(Constants.MODIFIED_BY_APIHANDLER);
 
         } catch (Exception e) {
-            logger.error(LoggingAnchor.THREE, MessageEnum.APIH_DB_INSERT_EXC.toString(), ErrorCode.DataError.getValue(),
-                    "Exception when creation record request", e);
+            logger.error("Exception when creation record request", e);
 
             if (!status.equals(Status.FAILED)) {
                 throw e;
@@ -467,8 +460,7 @@ public class MsoRequest {
             request.setRequestUrl(MDC.get(LogConstants.HTTP_URL));
             requestsDbClient.save(request);
         } catch (Exception e) {
-            logger.error(LoggingAnchor.FOUR, MessageEnum.APIH_DB_UPDATE_EXC.toString(), e.getMessage(),
-                    ErrorCode.DataError.getValue(), "Exception when updating record in DB");
+            logger.error("Exception when updating record in DB", e);
             logger.debug("Exception: ", e);
         }
     }
@@ -549,8 +541,7 @@ public class MsoRequest {
             return null;
 
         } catch (Exception e) {
-            logger.error(LoggingAnchor.THREE, MessageEnum.APIH_DOM2STR_ERROR.toString(), ErrorCode.DataError.getValue(),
-                    "Exception in domToStr", e);
+            logger.error("Exception in domToStr", e);
         }
         return null;
     }
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/CloudResourcesOrchestration.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/CloudResourcesOrchestration.java
index be6d5b06ca..20e8fed32d 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/CloudResourcesOrchestration.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/CloudResourcesOrchestration.java
@@ -92,7 +92,7 @@ public class CloudResourcesOrchestration {
 
         CloudOrchestrationRequest cor = null;
 
-        logger.debug("requestId is: " + requestId);
+        logger.debug("requestId is: {}", requestId);
 
         try {
             ObjectMapper mapper = new ObjectMapper();
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/TenantIsolationRequest.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/TenantIsolationRequest.java
index a8d4f8b2d2..007ea938a2 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/TenantIsolationRequest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/TenantIsolationRequest.java
@@ -28,7 +28,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import javax.ws.rs.core.MultivaluedMap;
-import org.onap.so.logger.LoggingAnchor;
 import org.apache.commons.lang3.StringUtils;
 import org.onap.so.apihandlerinfra.Constants;
 import org.onap.so.apihandlerinfra.Status;
@@ -46,8 +45,6 @@ import org.onap.so.apihandlerinfra.vnfbeans.RequestStatusType;
 import org.onap.so.db.request.beans.InfraActiveRequests;
 import org.onap.so.db.request.client.RequestsDbClient;
 import org.onap.so.exceptions.ValidationException;
-import org.onap.so.logger.ErrorCode;
-import org.onap.so.logger.MessageEnum;
 import org.onap.so.utils.UUIDChecker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -357,8 +354,7 @@ public class TenantIsolationRequest {
             request.setLastModifiedBy(Constants.MODIFIED_BY_APIHANDLER);
             requestsDbClient.save(request);
         } catch (Exception e) {
-            logger.error(LoggingAnchor.FOUR, MessageEnum.APIH_DB_UPDATE_EXC.toString(), e.getMessage(),
-                    ErrorCode.DataError.getValue(), "Exception when updating record in DB");
+            logger.error("Exception when updating record in DB", e);
             logger.debug("Exception: ", e);
         }
     }