From 7fcc895e05176b786cd6dcfaf8aba8190c53e1e7 Mon Sep 17 00:00:00 2001 From: Michal Korman Date: Thu, 24 May 2018 12:47:40 +0200 Subject: [PATCH] Replace printStackTrace with usage of logger Change-Id: I648e5a25337beca1f8c483ba6e5359d245e237d3 Issue-ID: SO-642 Signed-off-by: mkorman --- .../catalogdb/catalogrest/QueryResourceRecipe.java | 3 +-- .../org/openecomp/mso/adapters/vfc/util/RestfulUtil.java | 1 - .../openecomp/mso/bpmn/common/recipe/ResourceInput.java | 3 +-- .../mso/bpmn/common/recipe/ResourceRecipeRequest.java | 3 +-- .../mso/bpmn/common/resource/ResourceRequestBuilder.java | 6 ++---- .../camunda/bpmn/plugin/urnmap/resources/URNResource.java | 14 +++++--------- .../mso/cloudify/connector/http/HttpClientConnector.java | 2 +- .../process/ActivateVnfOperationalEnvironment.java | 12 ++++-------- .../process/CreateEcompOperationalEnvironment.java | 2 +- 9 files changed, 16 insertions(+), 30 deletions(-) diff --git a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryResourceRecipe.java b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryResourceRecipe.java index 7d6aed4785..4d8b65a0c8 100644 --- a/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryResourceRecipe.java +++ b/adapters/mso-catalog-db-adapter/src/main/java/org/openecomp/mso/adapters/catalogdb/catalogrest/QueryResourceRecipe.java @@ -67,8 +67,7 @@ public class QueryResourceRecipe extends CatalogQuery{ try { jsonStr = mapper.writeValueAsString(valueMap); } catch(JsonProcessingException e) { - - e.printStackTrace(); + LOGGER.error("JsonProcessingException", e); } return jsonStr; } diff --git a/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/util/RestfulUtil.java b/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/util/RestfulUtil.java index 5168de85cc..4d2bf59fee 100644 --- a/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/util/RestfulUtil.java +++ b/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/util/RestfulUtil.java @@ -84,7 +84,6 @@ public class RestfulUtil { } } catch(MsoPropertiesException e) { LOGGER.error("Get msb properties failed",e); - e.printStackTrace(); } return "http://" + msbIp + ":" + msbPort; } diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/ResourceInput.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/ResourceInput.java index 13b1666991..42547faa1e 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/ResourceInput.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/ResourceInput.java @@ -288,8 +288,7 @@ public class ResourceInput { try { jsonStr = mapper.writeValueAsString(this); } catch(JsonProcessingException e) { - msoLogger.debug("JsonProcessingException", e); - e.printStackTrace(); + msoLogger.error("JsonProcessingException", e); } return jsonStr; } diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/ResourceRecipeRequest.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/ResourceRecipeRequest.java index ec60619dc6..3ec43e10ae 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/ResourceRecipeRequest.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/recipe/ResourceRecipeRequest.java @@ -151,8 +151,7 @@ public class ResourceRecipeRequest { try { jsonStr = mapper.writeValueAsString(this); } catch(JsonProcessingException e) { - msoLogger.debug("JsonProcessingException", e); - e.printStackTrace(); + msoLogger.error("JsonProcessingException", e); } return jsonStr; } diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java index e6b1b2143f..d1ec60a1cd 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/openecomp/mso/bpmn/common/resource/ResourceRequestBuilder.java @@ -113,8 +113,7 @@ public class ResourceRequestBuilder { Map resourceInputsFromServiceDeclaredLevel = buildResouceRequest(serviceUuid, resourceCustomizationUuid, serviceInput); resourceInputsFromUuiMap.putAll(resourceInputsFromServiceDeclaredLevel); } catch(SdcToscaParserException e) { - LOGGER.debug("SdcToscaParserException", e); - e.printStackTrace(); + LOGGER.error("SdcToscaParserException", e); } String resourceInputsStr = getJsonString(resourceInputsFromUuiMap); String result = "{\n" @@ -221,8 +220,7 @@ public class ResourceRequestBuilder { try { jsonStr = mapper.writeValueAsString(srcObj); } catch(JsonProcessingException e) { - LOGGER.debug("SdcToscaParserException", e); - e.printStackTrace(); + LOGGER.error("SdcToscaParserException", e); } return jsonStr; } diff --git a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNResource.java b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNResource.java index 85f9753634..5fc80ab5c4 100644 --- a/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNResource.java +++ b/bpmn/MSOURN-plugin/src/main/java/org/openecomp/camunda/bpmn/plugin/urnmap/resources/URNResource.java @@ -82,8 +82,7 @@ public class URNResource extends AbstractCockpitPluginResource{ } catch (Exception e) { - - e.printStackTrace(); + msoLogger.error("Exception while executing query", e); } finally { try { r.close(); } catch (Exception e) { /* ignored */ } try { psData.close(); } catch (Exception e) { /* ignored */ } @@ -131,9 +130,8 @@ public class URNResource extends AbstractCockpitPluginResource{ } } catch (Exception e) - { - - e.printStackTrace(); + { + msoLogger.error("Exception while performing JNDI lookup", e); } return conn; @@ -175,8 +173,7 @@ public class URNResource extends AbstractCockpitPluginResource{ } catch (Exception e) { - - e.printStackTrace(); + msoLogger.error("Exception while executing query", e); } finally { try { psData.close(); } catch (Exception e) { /* ignored */ } try { conn.close(); } catch (Exception e) { /* ignored */ } @@ -199,8 +196,7 @@ public class URNResource extends AbstractCockpitPluginResource{ } catch (Exception e) { - - e.printStackTrace(); + msoLogger.error("Exception while executing query", e); } finally { try { psData.close(); } catch (Exception e) { /* ignored */ } try { conn.close(); } catch (Exception e) { /* ignored */ } diff --git a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/connector/http/HttpClientConnector.java b/cloudify-client/src/main/java/org/openecomp/mso/cloudify/connector/http/HttpClientConnector.java index 421f62a437..17904adf7b 100644 --- a/cloudify-client/src/main/java/org/openecomp/mso/cloudify/connector/http/HttpClientConnector.java +++ b/cloudify-client/src/main/java/org/openecomp/mso/cloudify/connector/http/HttpClientConnector.java @@ -223,7 +223,7 @@ public class HttpClientConnector implements CloudifyClientConnector { } catch (Exception e) { // Catchall for anything else, must throw as a RuntimeException - e.printStackTrace(); + LOGGER.error("Client exception", e); throw new RuntimeException("Unexpected client exception", e); } finally { diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/tenantisolation/process/ActivateVnfOperationalEnvironment.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/tenantisolation/process/ActivateVnfOperationalEnvironment.java index 24111c43c2..1bfe979f4f 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/tenantisolation/process/ActivateVnfOperationalEnvironment.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/tenantisolation/process/ActivateVnfOperationalEnvironment.java @@ -217,17 +217,13 @@ public class ActivateVnfOperationalEnvironment extends OperationalEnvironmentPro AAIResultWrapper aaiResult = aaiHelper.getAaiOperationalEnvironment(operationalEnvironmentId); operationalEnv = aaiResult.asBean(AAIOperationalEnvironment.class).get(); } catch (JsonParseException e) { - msoLogger.debug(" **** JsonParseException: " + e.getMessage()); - e.printStackTrace(); + msoLogger.error(" **** JsonParseException: ", e); } catch (JsonMappingException e) { - msoLogger.debug(" **** JsonMappingException: " + e.getMessage()); - e.printStackTrace(); + msoLogger.error(" **** JsonMappingException: ", e); } catch (IOException e) { - msoLogger.debug(" **** IOException: " + e.getMessage()); - e.printStackTrace(); + msoLogger.error(" **** IOException: ", e); } catch (Exception e) { - msoLogger.debug(" **** Exception: " + e.getMessage()); - e.printStackTrace(); + msoLogger.error(" **** Exception: ", e); } return operationalEnv; diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/tenantisolation/process/CreateEcompOperationalEnvironment.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/tenantisolation/process/CreateEcompOperationalEnvironment.java index 1ce3c5e06d..3dd1b72ca6 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/tenantisolation/process/CreateEcompOperationalEnvironment.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/tenantisolation/process/CreateEcompOperationalEnvironment.java @@ -67,7 +67,7 @@ public class CreateEcompOperationalEnvironment extends OperationalEnvironmentPro getRequestDb().updateInfraSuccessCompletion("SUCCESSFULLY Created ECOMP OperationalEnvironment.", getRequestId(), getRequest().getOperationalEnvironmentId()); } catch (Exception e) { - e.printStackTrace(); + msoLogger.error("exception while publishing operational environment", e); msoLogger.error(MessageEnum.APIH_GENERAL_EXCEPTION, "", "", "", MsoLogger.ErrorCode.UnknownError, e.getMessage()); getRequestDb().updateInfraFailureCompletion(e.getMessage(), getRequestId(), getRequest().getOperationalEnvironmentId()); } -- 2.16.6