From: Fiete Ostkamp Date: Thu, 10 Jul 2025 08:09:33 +0000 (+0200) Subject: Statically register ObjectMapper Part 2 X-Git-Tag: 1.15.6^0 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=0713fbcfebbc7dfe1bcb642b71dcec9d33aad167;p=so.git Statically register ObjectMapper Part 2 Issue-ID: SO-4187 Change-Id: I2a4f2fece1dfeaff9aeb6c9334e52062682e2f79 Signed-off-by: Fiete Ostkamp --- diff --git a/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/tasks/SDNCService.java b/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/tasks/SDNCService.java index e5b7049934..9343c968ba 100644 --- a/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/tasks/SDNCService.java +++ b/adapters/mso-sdnc-adapter/src/main/java/org/onap/so/adapters/sdnc/tasks/SDNCService.java @@ -48,7 +48,7 @@ public class SDNCService extends ExternalTaskUtils { @Autowired private Environment env; - private ObjectMapper objMapper = new ObjectMapper(); + private static final ObjectMapper objMapper = new ObjectMapper(); public SDNCService() { super(RetrySequenceLevel.SHORT); diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CNFAdapterAsync.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CNFAdapterAsync.groovy index 9de40b4e69..7c50eb9c98 100755 --- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CNFAdapterAsync.groovy +++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CNFAdapterAsync.groovy @@ -19,7 +19,7 @@ public class CNFAdapterAsync extends AbstractServiceTaskProcessor { private static final Logger logger = LoggerFactory.getLogger(CNFAdapterAsync.class) ExceptionUtil exceptionUtil = new ExceptionUtil() - ObjectMapper mapper = new ObjectMapper(); + private static final ObjectMapper mapper = new ObjectMapper(); @Override public void preProcessRequest(DelegateExecution execution) { diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/AnNssmfutils.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/AnNssmfutils.groovy index b89e831376..f73c939ddc 100644 --- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/AnNssmfutils.groovy +++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/AnNssmfutils.groovy @@ -60,7 +60,7 @@ import com.google.gson.Gson class AnNssmfUtils { private static final Logger logger = LoggerFactory.getLogger(AnNssmfUtils.class) - private static final ObjectMapper objectMapper = new ObjectMapper(); + private static final ObjectMapper objectMapper = new ObjectMapper() ExceptionUtil exceptionUtil = new ExceptionUtil() JsonUtils jsonUtil = new JsonUtils() public String buildSelectRANNSSIRequest(String requestId, String messageType, String UUID,String invariantUUID, diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/service/ServicePluginFactory.java b/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/service/ServicePluginFactory.java index d1fc0a6353..212cd60418 100644 --- a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/service/ServicePluginFactory.java +++ b/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/service/ServicePluginFactory.java @@ -77,6 +77,9 @@ import com.fasterxml.jackson.databind.SerializationFeature; public class ServicePluginFactory { + private static final Logger logger = LoggerFactory.getLogger(ServicePluginFactory.class); + private static final ObjectMapper wrapMapper; + private static final ObjectMapper nonWrapMapper; private static String OOF_DEFAULT_ENDPOINT; private static String THIRD_SP_DEFAULT_ENDPOINT; private static String INVENTORY_OSS_DEFAULT_ENDPOINT; @@ -84,7 +87,13 @@ public class ServicePluginFactory { static JsonUtils jsonUtil = new JsonUtils(); - private static Logger logger = LoggerFactory.getLogger(ServicePluginFactory.class); + static { + wrapMapper = new ObjectMapper(); + wrapMapper.configure(SerializationFeature.WRAP_ROOT_VALUE, true); + nonWrapMapper = new ObjectMapper(); + nonWrapMapper.configure(SerializationFeature.WRAP_ROOT_VALUE, false); + } + private static ServicePluginFactory instance; @@ -845,10 +854,9 @@ public class ServicePluginFactory { } private static T getJsonObject(String jsonstr, Class type) { - ObjectMapper mapper = new ObjectMapper(); - mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, true); + try { - return mapper.readValue(jsonstr, type); + return wrapMapper.readValue(jsonstr, type); } catch (IOException e) { logger.error("{} {} fail to unMarshal json", MessageEnum.RA_NS_EXC.toString(), ErrorCode.BusinessProcessError.getValue(), e); @@ -857,11 +865,9 @@ public class ServicePluginFactory { } public static String getJsonString(Object srcObj) { - ObjectMapper mapper = new ObjectMapper(); - mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, false); String jsonStr = null; try { - jsonStr = mapper.writeValueAsString(srcObj); + jsonStr = nonWrapMapper.writeValueAsString(srcObj); } catch (JsonProcessingException e) { logger.debug("SdcToscaParserException", e); } diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/serviceTask/AbstractSdncOperationTask.java b/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/serviceTask/AbstractSdncOperationTask.java index e614ddd28d..aa16664e23 100644 --- a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/serviceTask/AbstractSdncOperationTask.java +++ b/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/serviceTask/AbstractSdncOperationTask.java @@ -59,6 +59,12 @@ import com.fasterxml.jackson.databind.ObjectMapper; public abstract class AbstractSdncOperationTask implements JavaDelegate { private static final Logger logger = LoggerFactory.getLogger(AbstractSdncOperationTask.class); + private static final ObjectMapper objectMapper; + + static { + objectMapper = new ObjectMapper(); + objectMapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY); + } @Autowired private Environment env; @@ -103,10 +109,8 @@ public abstract class AbstractSdncOperationTask implements JavaDelegate { } protected String getPostbody(Object inputEntity) { - ObjectMapper objectMapper = new ObjectMapper(); String postBody = null; try { - objectMapper.setSerializationInclusion(JsonInclude.Include.NON_EMPTY); postBody = objectMapper.writeValueAsString(inputEntity); } catch (JsonProcessingException e) { logger.error("JsonProcessingException in getPostbody", e); diff --git a/bpmn/so-bpmn-moi/src/main/java/org/onap/so/bpmn/moi/tasks/AssignRANNssiBBTasks.java b/bpmn/so-bpmn-moi/src/main/java/org/onap/so/bpmn/moi/tasks/AssignRANNssiBBTasks.java index 1ef073ca68..6c22a16df0 100644 --- a/bpmn/so-bpmn-moi/src/main/java/org/onap/so/bpmn/moi/tasks/AssignRANNssiBBTasks.java +++ b/bpmn/so-bpmn-moi/src/main/java/org/onap/so/bpmn/moi/tasks/AssignRANNssiBBTasks.java @@ -49,7 +49,7 @@ public class AssignRANNssiBBTasks { @Autowired private InjectionHelper injectionHelper; - private ObjectMapper mapper = new ObjectMapper(); + private static final ObjectMapper mapper = new ObjectMapper(); private AAIRestClientImpl aaiRestClient = new AAIRestClientImpl(); diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/activity/ExecuteActivity.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/activity/ExecuteActivity.java index 415d4614da..545ecf76c4 100644 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/activity/ExecuteActivity.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/activity/ExecuteActivity.java @@ -76,7 +76,7 @@ public class ExecuteActivity implements JavaDelegate { private static final String ACTIVITY_PREFIX = "activity:"; private static final String EXECUTE_ACTIVITY_ERROR_MESSAGE = "ExecuteActivityErrorMessage"; - private ObjectMapper mapper = new ObjectMapper(); + private static final ObjectMapper mapper = new ObjectMapper(); @Autowired private RuntimeService runtimeService; diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnf/tasks/CnfAdapterCreateTasks.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnf/tasks/CnfAdapterCreateTasks.java index 5e3b781903..810b8eafcc 100644 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnf/tasks/CnfAdapterCreateTasks.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnf/tasks/CnfAdapterCreateTasks.java @@ -69,7 +69,7 @@ public class CnfAdapterCreateTasks { @Autowired private VnfAdapterVfModuleObjectMapper vfModuleMapper; - private ObjectMapper mapper = new ObjectMapper(); + private static final ObjectMapper mapper = new ObjectMapper(); /** * This method is used for creating the request for an Instance in Multicloud K8s Plugin. diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnf/tasks/CnfAdapterUpgradeTasks.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnf/tasks/CnfAdapterUpgradeTasks.java index 4fd0aab397..c19beb1c87 100644 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnf/tasks/CnfAdapterUpgradeTasks.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnf/tasks/CnfAdapterUpgradeTasks.java @@ -66,7 +66,7 @@ public class CnfAdapterUpgradeTasks { @Autowired private VnfAdapterVfModuleObjectMapper vfModuleMapper; - private ObjectMapper mapper = new ObjectMapper(); + private static final ObjectMapper mapper = new ObjectMapper(); /** * This method is used for updating the request for an Instance in Multicloud K8s Plugin. diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnf/tasks/CnfHealthCheckTasks.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnf/tasks/CnfHealthCheckTasks.java index e6545cb800..d583aa1d67 100755 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnf/tasks/CnfHealthCheckTasks.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/cnf/tasks/CnfHealthCheckTasks.java @@ -37,7 +37,7 @@ public class CnfHealthCheckTasks { @Autowired private ExceptionBuilder exceptionUtil; - private ObjectMapper mapper = new ObjectMapper(); + private static final ObjectMapper mapper = new ObjectMapper(); public void prepareCnfAdaperRequest(BuildingBlockExecution execution) { GeneralBuildingBlock gBBInput = execution.getGeneralBuildingBlock(); diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/vnfm/tasks/utils/AbstractInputParametersProvider.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/vnfm/tasks/utils/AbstractInputParametersProvider.java index 854f84875a..9764db7727 100644 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/vnfm/tasks/utils/AbstractInputParametersProvider.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/adapter/vnfm/tasks/utils/AbstractInputParametersProvider.java @@ -5,15 +5,15 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. - * + * * SPDX-License-Identifier: Apache-2.0 * ============LICENSE_END========================================================= */ @@ -37,10 +37,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; public abstract class AbstractInputParametersProvider implements InputParametersProvider { private static final Logger LOGGER = LoggerFactory.getLogger(AbstractInputParametersProvider.class); + private static final ObjectMapper mapper = new ObjectMapper(); protected Map parseAdditionalParameters(final String additionalParamsString) { try { - final ObjectMapper mapper = new ObjectMapper(); final TypeReference> typeRef = new TypeReference>() {}; return mapper.readValue(additionalParamsString, typeRef); } catch (final Exception exception) { @@ -52,7 +52,6 @@ public abstract class AbstractInputParametersProvider implements InputParamet protected List parseExternalVirtualLinks(final String extVirtualLinksString) { try { - final ObjectMapper mapper = new ObjectMapper(); final TypeReference> extVirtualLinksStringTypeRef = new TypeReference>() {}; return mapper.readValue(extVirtualLinksString, extVirtualLinksStringTypeRef); diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/appc/tasks/AppcOrchestratorPreProcessor.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/appc/tasks/AppcOrchestratorPreProcessor.java index 2644ae1b58..224924d12f 100644 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/appc/tasks/AppcOrchestratorPreProcessor.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/appc/tasks/AppcOrchestratorPreProcessor.java @@ -39,6 +39,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; public class AppcOrchestratorPreProcessor { private static final Logger logger = LoggerFactory.getLogger(AppcOrchestratorPreProcessor.class); public static final String CONTROLLER_TYPE_DEFAULT = "APPC"; + private static final ObjectMapper objectMapper = new ObjectMapper(); @Autowired private ExceptionBuilder exceptionUtil; @@ -94,7 +95,6 @@ public class AppcOrchestratorPreProcessor { appcTaskRequest.setOperationsTimeout(operationsTimeout); Map configMap = new HashMap<>(); - ObjectMapper objectMapper = new ObjectMapper(); String configParamsStr = JsonUtils.getJsonValue(payload, "configuration_parameters"); if (configParamsStr != null) { configMap = diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/decisionpoint/impl/camunda/controller/sdnc/SDNCLcmPayloadBuilder.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/decisionpoint/impl/camunda/controller/sdnc/SDNCLcmPayloadBuilder.java index b29009ff1d..63c2d1dfb1 100644 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/decisionpoint/impl/camunda/controller/sdnc/SDNCLcmPayloadBuilder.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/decisionpoint/impl/camunda/controller/sdnc/SDNCLcmPayloadBuilder.java @@ -7,9 +7,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -34,6 +34,7 @@ import org.onap.so.bpmn.infrastructure.decisionpoint.impl.camunda.controller.com public class SDNCLcmPayloadBuilder { private static Logger logger = LoggerFactory.getLogger(SDNCLcmPayloadBuilder.class); + private static final ObjectMapper mapper = new ObjectMapper(); public static ActivateNESwPayload buildActivateNESwPayload(DelegateExecution execution) { String requestPayload = String.valueOf(execution.getVariable(REQUEST_PAYLOAD)); @@ -68,7 +69,6 @@ public class SDNCLcmPayloadBuilder { String swToBeDownloadedString = JsonUtils.getJsonValue(requestPayload, "swToBeDownloaded"); SwToBeDownloadedElement[] swToBeDownloadedArray; - ObjectMapper mapper = new ObjectMapper(); try { swToBeDownloadedArray = mapper.readValue(swToBeDownloadedString, SwToBeDownloadedElement[].class); downloadNESwPayload.setSwToBeDownloaded(Arrays.asList(swToBeDownloadedArray)); @@ -147,7 +147,6 @@ public class SDNCLcmPayloadBuilder { } public static String convertToSting(Object msgObject) throws JsonProcessingException { - ObjectMapper mapper = new ObjectMapper(); return mapper.writeValueAsString(msgObject); } } diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/decisionpoint/impl/camunda/controller/sdnc/SdncControllerDE.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/decisionpoint/impl/camunda/controller/sdnc/SdncControllerDE.java index ea3405d423..dfe77cac5f 100644 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/decisionpoint/impl/camunda/controller/sdnc/SdncControllerDE.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/decisionpoint/impl/camunda/controller/sdnc/SdncControllerDE.java @@ -43,6 +43,7 @@ import static org.onap.so.bpmn.infrastructure.pnf.delegate.ExecutionVariableName public class SdncControllerDE extends LcmControllerDE { private static final int SDNC_DELEGATE_EXECUTION_ERROR_CODE = 1103; + private static final ObjectMapper mapper = new ObjectMapper(); @Override public Boolean understand(ControllerContext context) { @@ -221,7 +222,6 @@ public class SdncControllerDE extends LcmControllerDE { LcmInput lcmInput = SDNCLcmMessageBuilder.buildLcmInputForPnf(requestId, subRequestId, pnfName, lcmAction, lcmPayload); - ObjectMapper mapper = new ObjectMapper(); try { String lcmInputMsg = mapper.writeValueAsString(lcmInput); logger.debug("SDNC input message for {}: {}", lcmAction, lcmInputMsg); diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/ConfigAssignVnf.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/ConfigAssignVnf.java index 3a69d27f32..4aa9c119cf 100644 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/ConfigAssignVnf.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/ConfigAssignVnf.java @@ -55,6 +55,7 @@ public class ConfigAssignVnf { private static final String ORIGINATOR_ID = "SO"; private static final String ACTION_NAME = "config-assign"; private static final String MODE = "sync"; + private static final ObjectMapper objectMapper = new ObjectMapper(); private final ExtractPojosForBB extractPojosForBB; private final ExceptionBuilder exceptionBuilder; @@ -130,7 +131,6 @@ public class ConfigAssignVnf { } private Service getServiceObjectFromServiceMap(Map serviceMap) throws IOException { - ObjectMapper objectMapper = new ObjectMapper(); String serviceFromJson = objectMapper.writeValueAsString(serviceMap.get("service")); try { return objectMapper.readValue(serviceFromJson, Service.class); diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/ConfigurationScaleOut.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/ConfigurationScaleOut.java index 7930a33a2a..6f492b7610 100644 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/ConfigurationScaleOut.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/ConfigurationScaleOut.java @@ -9,9 +9,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -67,6 +67,7 @@ public class ConfigurationScaleOut { private static final String VFMODULE_ID = "vfModuleId"; private static final String CONTROLLER_TYPE = "controllerType"; private static final String PAYLOAD = "payload"; + private static final ObjectMapper mapper = new ObjectMapper(); public void setParamsForConfigurationScaleOut(BuildingBlockExecution execution) { @@ -76,7 +77,6 @@ public class ConfigurationScaleOut { List> jsonPathForCfgParams = gBBInput.getRequestContext().getConfigurationParameters(); String key = null; String paramValue = null; - ObjectMapper mapper = new ObjectMapper(); String configScaleOutPayloadString = null; ControllerSelectionReference controllerSelectionReference; ConfigScaleOutPayload configPayload = new ConfigScaleOutPayload(); diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/GeneralTopologyObjectMapper.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/GeneralTopologyObjectMapper.java index 48a384c48a..8273df285e 100644 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/GeneralTopologyObjectMapper.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/GeneralTopologyObjectMapper.java @@ -53,7 +53,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; public class GeneralTopologyObjectMapper { private static final Logger logger = LoggerFactory.getLogger(GeneralTopologyObjectMapper.class); - private ObjectMapper mapper = new ObjectMapper(); + private static final ObjectMapper mapper = new ObjectMapper(); /* * Build GenericResourceApiRequestinformationRequestInformation @@ -204,7 +204,7 @@ public class GeneralTopologyObjectMapper { /** * Build ConfigurationInformation - * + * * @param configuration * @param includeModelInformation * @return @@ -231,7 +231,7 @@ public class GeneralTopologyObjectMapper { /** * Build GcRequestInformation - * + * * @param vnf * @param genericResourceApiParam * @return diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/VfModuleTopologyOperationRequestMapper.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/VfModuleTopologyOperationRequestMapper.java index 5852767957..151d212b2e 100644 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/VfModuleTopologyOperationRequestMapper.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/sdnc/mapper/VfModuleTopologyOperationRequestMapper.java @@ -9,9 +9,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -59,6 +59,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; @Component public class VfModuleTopologyOperationRequestMapper { private static final Logger logger = LoggerFactory.getLogger(VfModuleTopologyOperationRequestMapper.class); + private static final ObjectMapper mapper = new ObjectMapper(); @Autowired private GeneralTopologyObjectMapper generalTopologyObjectMapper; @@ -187,7 +188,6 @@ public class VfModuleTopologyOperationRequestMapper { public String buildObjectPath(String sdncAssignResponse) { String objectPath = null; if (sdncAssignResponse != null) { - ObjectMapper mapper = new ObjectMapper(); try { GenericResourceApiVfModuleResponseInformation assignResponseInfo = mapper.readValue(sdncAssignResponse, GenericResourceApiVfModuleResponseInformation.class); diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/service/composition/ChildServiceRequestBuilder.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/service/composition/ChildServiceRequestBuilder.java index 2a008e3573..30af5c760c 100644 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/service/composition/ChildServiceRequestBuilder.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/service/composition/ChildServiceRequestBuilder.java @@ -21,6 +21,7 @@ import java.io.IOException; import java.util.Map; public class ChildServiceRequestBuilder { + private static final ObjectMapper mapper = new ObjectMapper(); private final BuildingBlockExecution buildingBlockExecution; private Service parent; private Service child; @@ -47,9 +48,8 @@ public class ChildServiceRequestBuilder { for (Map params : buildingBlockExecution.getGeneralBuildingBlock().getRequestContext() .getRequestParameters().getUserParams()) { if (params.containsKey(USERPARAMSERVICE)) { - ObjectMapper obj = new ObjectMapper(); - String input = obj.writeValueAsString(params.get(USERPARAMSERVICE)); - parent = obj.readValue(input, Service.class); + String input = mapper.writeValueAsString(params.get(USERPARAMSERVICE)); + parent = mapper.readValue(input, Service.class); if (parent.getResources().getServices() != null) { for (Service service : parent.getResources().getServices()) { if (service.getInstanceName().equals(childSvcInstanceName)) { diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java index 3e4e2d16a3..0c30c5eeda 100755 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java @@ -107,6 +107,7 @@ import org.onap.so.serviceinstancebeans.InstanceDirection; public class WorkflowAction { private static final Logger logger = LoggerFactory.getLogger(WorkflowAction.class); + private static final ObjectMapper mapper = new ObjectMapper(); private static final String SERVICE_INSTANCES = "serviceInstances"; private static final String VF_MODULES = "vfModules"; @@ -160,8 +161,7 @@ public class WorkflowAction { try { fillExecutionDefault(execution); final String bpmnRequest = (String) execution.getVariable(BBConstants.G_BPMN_REQUEST); - ServiceInstancesRequest sIRequest = - new ObjectMapper().readValue(bpmnRequest, ServiceInstancesRequest.class); + ServiceInstancesRequest sIRequest = mapper.readValue(bpmnRequest, ServiceInstancesRequest.class); final String requestId = (String) execution.getVariable(BBConstants.G_REQUEST_ID); diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java index 22d78bb672..fc38182c21 100644 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java @@ -77,6 +77,8 @@ import static org.onap.so.bpmn.infrastructure.service.composition.ServiceComposi @Component public class WorkflowActionBBTasks { + private static final Logger logger = LoggerFactory.getLogger(WorkflowActionBBTasks.class); + private static final ObjectMapper mapper = new ObjectMapper(); private static final String RETRY_COUNT = "retryCount"; private static final String FABRIC_CONFIGURATION = "FabricConfiguration"; private static final String ADD_FABRIC_CONFIGURATION_BB = "AddFabricConfigurationBB"; @@ -91,7 +93,6 @@ public class WorkflowActionBBTasks { private static final String ROLLBACK_TO_ASSIGNED = "RollbackToAssigned"; private static final String UNASSIGN = "Unassign"; private static final String DELETE = "Delete"; - private static final Logger logger = LoggerFactory.getLogger(WorkflowActionBBTasks.class); @Autowired private RequestsDbClient requestDbclient; @@ -189,7 +190,7 @@ public class WorkflowActionBBTasks { requestRef.setInstanceId(resourceId); requestRef.setRequestId(requestId); serviceInstancesResponse.setRequestReferences(requestRef); - ObjectMapper mapper = new ObjectMapper(); + String jsonRequest = ""; try { jsonRequest = mapper.writeValueAsString(serviceInstancesResponse); diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/ebb/loader/UserParamsServiceTraversal.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/ebb/loader/UserParamsServiceTraversal.java index 466b49644f..85be6a39a6 100644 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/ebb/loader/UserParamsServiceTraversal.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/ebb/loader/UserParamsServiceTraversal.java @@ -61,6 +61,7 @@ import static org.onap.so.bpmn.infrastructure.workflow.tasks.WorkflowActionConst public class UserParamsServiceTraversal { private static final Logger logger = LoggerFactory.getLogger(UserParamsServiceTraversal.class); + private static final ObjectMapper mapper = new ObjectMapper(); private final CatalogDbClient catalogDbClient; private final ExceptionBuilder exceptionBuilder; @@ -79,9 +80,8 @@ public class UserParamsServiceTraversal { if (userParams != null) { for (Map params : userParams) { if (params.containsKey(USER_PARAM_SERVICE)) { - ObjectMapper obj = new ObjectMapper(); - String input = obj.writeValueAsString(params.get(USER_PARAM_SERVICE)); - Service validate = obj.readValue(input, Service.class); + String input = mapper.writeValueAsString(params.get(USER_PARAM_SERVICE)); + Service validate = mapper.readValue(input, Service.class); return getResourceList(execution, serviceModelVersionId, requestAction, validate); } } diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/validators/UpgradePreWorkflowValidator.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/validators/UpgradePreWorkflowValidator.java index 5e82b4f284..04ee1bc5f2 100644 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/validators/UpgradePreWorkflowValidator.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/validators/UpgradePreWorkflowValidator.java @@ -29,6 +29,7 @@ public class UpgradePreWorkflowValidator implements PreWorkflowValidator { "Existing vnfs in AAI are not supported by service model. Unsupported vnfCustomizationIds: %s"; private final CatalogDbClient catalogDbClient; + private static final ObjectMapper mapper = new ObjectMapper(); private static final Function> resourceType = workflowType -> resource -> resource.getResourceType() == workflowType; @@ -76,7 +77,7 @@ public class UpgradePreWorkflowValidator implements PreWorkflowValidator { private Optional parseBpmnRequest(String bpmnRequest) { try { - return Optional.of(new ObjectMapper().readValue(bpmnRequest, ServiceInstancesRequest.class)); + return Optional.of(mapper.readValue(bpmnRequest, ServiceInstancesRequest.class)); } catch (IOException e) { return Optional.empty(); } diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterObjectMapper.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterObjectMapper.java index 293bcf9f0e..a7206d569a 100644 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterObjectMapper.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/vnf/mapper/VnfAdapterObjectMapper.java @@ -7,9 +7,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -51,7 +51,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; @Component public class VnfAdapterObjectMapper { - private ObjectMapper mapper = new ObjectMapper(); + private static final ObjectMapper mapper = new ObjectMapper(); private static final String ENABLE_BRIDGE = "mso.bridgeEnabled"; @PostConstruct diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/namingservice/NamingClientResponseValidator.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/namingservice/NamingClientResponseValidator.java index dd9ecbead4..2228da0340 100644 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/namingservice/NamingClientResponseValidator.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/namingservice/NamingClientResponseValidator.java @@ -9,9 +9,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -50,6 +50,7 @@ public class NamingClientResponseValidator { private static final String NULL_RESPONSE_FROM_NAMING_SERVICE = "Error received a null response from Naming Service."; private static final String NAMING_SERVICE_ERROR = "Error from Naming Service: %s"; + private static final ObjectMapper mapper = new ObjectMapper(); public String validateNameGenResponse(ResponseEntity response) throws BadResponseException { if (response == null) { @@ -139,7 +140,6 @@ public class NamingClientResponseValidator { } protected String formatError(HttpStatusCodeException e) throws IOException { - ObjectMapper mapper = new ObjectMapper(); NameGenResponse errorResponse = mapper.readValue(e.getResponseBodyAsString(), NameGenResponse.class); NameGenResponseError error = errorResponse.getError(); diff --git a/common/src/main/java/org/onap/so/beans/nsmf/SliceTaskParams.java b/common/src/main/java/org/onap/so/beans/nsmf/SliceTaskParams.java index 4aa567112f..690a29689b 100644 --- a/common/src/main/java/org/onap/so/beans/nsmf/SliceTaskParams.java +++ b/common/src/main/java/org/onap/so/beans/nsmf/SliceTaskParams.java @@ -38,6 +38,7 @@ import java.util.Map; public class SliceTaskParams implements Serializable { private static final long serialVersionUID = -4389946152970978423L; + private static final ObjectMapper mapper = new ObjectMapper(); private String serviceId; @@ -138,7 +139,6 @@ public class SliceTaskParams implements Serializable { } public void convertFromJson(String jsonString) throws IOException { - ObjectMapper mapper = new ObjectMapper(); Map paramMap = (Map) mapper.readValue(jsonString, Map.class); this.setServiceId(paramMap.get("ServiceId")); this.setServiceName(paramMap.get("ServiceName")); @@ -194,4 +194,3 @@ public class SliceTaskParams implements Serializable { this.setAnStatusDescription(paramMap.get("AN.statusDescription")); } } - diff --git a/common/src/main/java/org/onap/so/client/policy/CommonObjectMapperProvider.java b/common/src/main/java/org/onap/so/client/policy/CommonObjectMapperProvider.java index 334e0f7231..b9897d90f1 100644 --- a/common/src/main/java/org/onap/so/client/policy/CommonObjectMapperProvider.java +++ b/common/src/main/java/org/onap/so/client/policy/CommonObjectMapperProvider.java @@ -7,9 +7,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -31,7 +31,7 @@ import com.fasterxml.jackson.databind.SerializationFeature; @Provider public class CommonObjectMapperProvider implements ContextResolver { - protected ObjectMapper mapper; + protected static ObjectMapper mapper; public CommonObjectMapperProvider() { diff --git a/common/src/main/java/org/onap/so/client/policy/PolicyClientImpl.java b/common/src/main/java/org/onap/so/client/policy/PolicyClientImpl.java index 72c5a7dd5b..f933465e0e 100644 --- a/common/src/main/java/org/onap/so/client/policy/PolicyClientImpl.java +++ b/common/src/main/java/org/onap/so/client/policy/PolicyClientImpl.java @@ -7,9 +7,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -51,7 +51,7 @@ public class PolicyClientImpl implements PolicyClient { private static Logger logger = LoggerFactory.getLogger(PolicyClientImpl.class); private PolicyRestProperties props; - private ObjectMapper mapper = new ObjectMapper(); + private static final ObjectMapper mapper = new ObjectMapper(); public PolicyClientImpl() { props = RestPropertiesLoader.getInstance().getNewImpl(PolicyRestProperties.class); diff --git a/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIClientResponseExceptionMapper.java b/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIClientResponseExceptionMapper.java index 24a4ba8510..0dbf36f39e 100644 --- a/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIClientResponseExceptionMapper.java +++ b/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAIClientResponseExceptionMapper.java @@ -7,9 +7,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -34,6 +34,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; @Priority(Integer.MIN_VALUE) public class AAIClientResponseExceptionMapper extends ResponseExceptionMapper { + private static final ObjectMapper mapper = new ObjectMapper(); private final String requestId; public AAIClientResponseExceptionMapper() { @@ -45,7 +46,7 @@ public class AAIClientResponseExceptionMapper extends ResponseExceptionMapper { String errorString = "Error calling A&AI. Request-Id=" + this.getRequestId() + " "; try { - AAIError error = new ObjectMapper().readValue(entity, AAIError.class); + AAIError error = mapper.readValue(entity, AAIError.class); AAIErrorFormatter formatter = new AAIErrorFormatter(error); return Optional.of(errorString + formatter.getMessage()); } catch (IOException e) { diff --git a/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAISingleTransactionClient.java b/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAISingleTransactionClient.java index 8df505e979..4a566527f2 100644 --- a/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAISingleTransactionClient.java +++ b/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAISingleTransactionClient.java @@ -7,9 +7,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -45,6 +45,7 @@ import com.google.common.base.Joiner; public class AAISingleTransactionClient extends GraphInventoryTransactionClient, AAIResourceUri, AAIEdgeLabel> { + private static final ObjectMapper mapper = new ObjectMapper(); private final SingleTransactionRequest request; private AAIResourcesClient resourcesClient; private AAIClient aaiClient; @@ -58,7 +59,7 @@ public class AAISingleTransactionClient extends /* * (non-Javadoc) - * + * * @see org.onap.aaiclient.client.aai.GraphInventoryTransactionClient#execute() */ @Override @@ -88,7 +89,6 @@ public class AAISingleTransactionClient extends @Override public void execute(boolean dryRun) throws BulkProcessFailed { - final ObjectMapper mapper = new ObjectMapper(); if (dryRun) { try { if (logger.isDebugEnabled()) { @@ -104,7 +104,6 @@ public class AAISingleTransactionClient extends protected Optional locateErrorMessages(SingleTransactionResponse response) { final List errorMessages = new ArrayList<>(); - final ObjectMapper mapper = new ObjectMapper(); for (OperationBodyResponse body : response.getOperationResponses()) { if (Optional.ofNullable(body.getResponseStatusCode()).orElse(400) > 300) { diff --git a/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAITransactionalClient.java b/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAITransactionalClient.java index 66fa503487..60ec58e5ce 100644 --- a/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAITransactionalClient.java +++ b/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/AAITransactionalClient.java @@ -7,9 +7,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -50,6 +50,7 @@ import com.google.common.base.Joiner; public class AAITransactionalClient extends GraphInventoryTransactionClient, AAIResourceUri, AAIEdgeLabel> { + private static final ObjectMapper mapper = new ObjectMapper(); private final Transactions transactions; private Transaction currentTransaction; @@ -72,7 +73,7 @@ public class AAITransactionalClient extends /* * (non-Javadoc) - * + * * @see org.onap.aaiclient.client.aai.GraphInventoryTransactionalClient#beginNewTransaction() */ public AAITransactionalClient beginNewTransaction() { @@ -82,7 +83,7 @@ public class AAITransactionalClient extends /* * (non-Javadoc) - * + * * @see org.onap.aaiclient.client.aai.GraphInventoryTransactionalClient#execute() */ @Override @@ -112,7 +113,6 @@ public class AAITransactionalClient extends @Override public void execute(boolean dryRun) throws BulkProcessFailed { - final ObjectMapper mapper = new ObjectMapper(); if (dryRun) { try { if (logger.isDebugEnabled()) { @@ -129,7 +129,6 @@ public class AAITransactionalClient extends protected Optional locateErrorMessages(String response) { final List errorMessages = new ArrayList<>(); final List results = JsonPathUtil.getInstance().locateResultList(response, "$..body"); - final ObjectMapper mapper = new ObjectMapper(); if (!results.isEmpty()) { List> parsed = new ArrayList<>(); try { diff --git a/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/entities/uri/HttpLookupUri.java b/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/entities/uri/HttpLookupUri.java index 42f52565cd..d7352c39c4 100644 --- a/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/entities/uri/HttpLookupUri.java +++ b/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/aai/entities/uri/HttpLookupUri.java @@ -7,9 +7,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -44,6 +44,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; public abstract class HttpLookupUri extends AAISimpleUri implements HttpAwareUri { + private static final ObjectMapper mapper = new ObjectMapper(); private transient Optional cachedValue = Optional.empty(); protected final AAIObjectType aaiType; @@ -85,7 +86,6 @@ public abstract class HttpLookupUri extends AAISimpleUri implements HttpAwareUri protected Optional extractRelatedLink(String jsonString) throws IOException { Optional result; - ObjectMapper mapper = new ObjectMapper(); Results results = mapper.readValue(jsonString, new TypeReference>() {}); if (results.getResult().size() == 1) { diff --git a/graph-inventory/fluent-builder-maven-plugin/src/main/java/org/onap/graphinventory/generate/SwaggerConverter.java b/graph-inventory/fluent-builder-maven-plugin/src/main/java/org/onap/graphinventory/generate/SwaggerConverter.java index fc42d9ca0d..4f636f9b31 100644 --- a/graph-inventory/fluent-builder-maven-plugin/src/main/java/org/onap/graphinventory/generate/SwaggerConverter.java +++ b/graph-inventory/fluent-builder-maven-plugin/src/main/java/org/onap/graphinventory/generate/SwaggerConverter.java @@ -24,6 +24,7 @@ import io.swagger.parser.SwaggerParser; public class SwaggerConverter { private final Log log; + private static final ObjectMapper mapper = new ObjectMapper(); public SwaggerConverter(Log log) { this.log = log; @@ -117,7 +118,6 @@ public class SwaggerConverter { } } - ObjectMapper mapper = new ObjectMapper(); for (ObjectType item : output.values()) { for (String path : item.getPaths()) { diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/camundabeans/CamundaMacroRequestSerializer.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/camundabeans/CamundaMacroRequestSerializer.java index 82077a84e6..292fe167e5 100644 --- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/camundabeans/CamundaMacroRequestSerializer.java +++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/camundabeans/CamundaMacroRequestSerializer.java @@ -7,9 +7,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -29,6 +29,13 @@ import com.fasterxml.jackson.databind.SerializationFeature; */ public class CamundaMacroRequestSerializer { + private static final ObjectMapper mapper; + + static { + mapper = new ObjectMapper(); + mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, true); + } + private CamundaMacroRequestSerializer() {} public static String getJsonRequest(String requestId, String action, String serviceInstanceId) @@ -37,8 +44,6 @@ public class CamundaMacroRequestSerializer { macroRequest.setAction(getCamundaInput(action)); macroRequest.setRequestId(getCamundaInput(requestId)); macroRequest.setServiceInstanceId(getCamundaInput(serviceInstanceId)); - ObjectMapper mapper = new ObjectMapper(); - mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, true); return mapper.writeValueAsString(macroRequest); } diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/common/CamundaClient.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/common/CamundaClient.java index 4bbfa1d067..5eefa44858 100644 --- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/common/CamundaClient.java +++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/common/CamundaClient.java @@ -10,9 +10,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -60,6 +60,13 @@ import com.fasterxml.jackson.databind.SerializationFeature; public class CamundaClient { private static Logger logger = LoggerFactory.getLogger(CamundaClient.class); private static final String BASIC = "Basic "; + private static final ObjectMapper mapper = new ObjectMapper(); + private static final ObjectMapper wrapMapper; + + static { + wrapMapper = new ObjectMapper(); + wrapMapper.configure(SerializationFeature.WRAP_ROOT_VALUE, true); + } @Autowired private RestTemplate restTemplate; @@ -151,11 +158,8 @@ public class CamundaClient { camundaRequest.setSvcid(svcid); camundaRequest.setSchema(schema); camundaRequest.setTimeout(timeout); - ObjectMapper mapper = new ObjectMapper(); - mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, true); - - jsonReq = mapper.writeValueAsString(camundaRequest); + jsonReq = wrapMapper.writeValueAsString(camundaRequest); logger.trace("request body is {}", jsonReq); } catch (Exception e) { logger.error("Error in APIH Wrap request", e); @@ -248,10 +252,7 @@ public class CamundaClient { camundaRequest.setInstanceGroupId(instanceGroupIdInput); camundaRequest.setGenerateIds(generateIds); - ObjectMapper mapper = new ObjectMapper(); - mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, true); - - jsonReq = mapper.writeValueAsString(camundaRequest); + jsonReq = wrapMapper.writeValueAsString(camundaRequest); logger.trace("request body is {}", jsonReq); } catch (Exception e) { logger.error("Error in wrapVIDRequest", e); @@ -284,7 +285,6 @@ public class CamundaClient { } protected BPMNFailureException createBPMNFailureException(HttpStatusCodeException e) { - ObjectMapper mapper = new ObjectMapper(); String responseText = null; String message = null; try { diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/common/ResponseHandler.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/common/ResponseHandler.java index 65e8b438ad..ee0b54e114 100644 --- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/common/ResponseHandler.java +++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/common/ResponseHandler.java @@ -9,9 +9,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -39,12 +39,17 @@ import com.fasterxml.jackson.databind.ObjectMapper; @Component public class ResponseHandler { private static Logger logger = LoggerFactory.getLogger(ResponseHandler.class); + private static final ObjectMapper mapper; + + static { + mapper = new ObjectMapper(); + mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); + } public CamundaResponse getCamundaResponse(ResponseEntity camundaResponse) throws ValidateException { String responseBody = camundaResponse.getBody(); CamundaResponse response = null; - ObjectMapper mapper = new ObjectMapper(); - mapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES); + try { response = mapper.readValue(responseBody, CamundaResponse.class); } catch (IOException | NullPointerException e) { diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/filters/RequestIdFilter.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/filters/RequestIdFilter.java index b81ee58aa4..e9714dfe63 100644 --- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/filters/RequestIdFilter.java +++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandler/filters/RequestIdFilter.java @@ -7,9 +7,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -46,6 +46,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; public class RequestIdFilter implements ContainerRequestFilter { private static Logger logger = LoggerFactory.getLogger(RequestIdFilter.class); + private static final ObjectMapper mapper = new ObjectMapper(); @Autowired private RequestsDbClient infraActiveRequestsClient; @@ -71,7 +72,6 @@ public class RequestIdFilter implements ContainerRequestFilter { } protected String createRequestError(String requestId, String requestTable) { - ObjectMapper mapper = new ObjectMapper(); RequestError error = new RequestError(); ServiceException serviceException = new ServiceException(); serviceException.setMessageId(ErrorNumbers.SVC_BAD_PARAMETER); diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandlerinfra/exceptions/ApiExceptionMapper.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandlerinfra/exceptions/ApiExceptionMapper.java index 696a518ceb..a2c7bce20a 100644 --- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandlerinfra/exceptions/ApiExceptionMapper.java +++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandlerinfra/exceptions/ApiExceptionMapper.java @@ -9,9 +9,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -42,7 +42,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; public class ApiExceptionMapper implements ExceptionMapper { private static Logger logger = LoggerFactory.getLogger(ApiExceptionMapper.class); - + private static final ObjectMapper mapper = new ObjectMapper(); private final JAXBContext context; private final Marshaller marshaller; @@ -103,7 +103,7 @@ public class ApiExceptionMapper implements ExceptionMapper { } public ObjectMapper createObjectMapper() { - return new ObjectMapper(); + return mapper; } public Marshaller getMarshaller() { diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/E2EServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/E2EServiceInstances.java index 7ed60384a5..1f8768a594 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/E2EServiceInstances.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/E2EServiceInstances.java @@ -9,9 +9,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -101,6 +101,7 @@ public class E2EServiceInstances { private HashMap instanceIdMap = new HashMap<>(); private static final Logger logger = LoggerFactory.getLogger(E2EServiceInstances.class); + private static final ObjectMapper mapper = new ObjectMapper(); private static final String MSO_PROP_APIHANDLER_INFRA = "MSO_PROP_APIHANDLER_INFRA"; @@ -128,7 +129,7 @@ public class E2EServiceInstances { /** * POST Requests for E2E Service create Instance on a version provided - * + * * @throws ApiException */ @@ -145,7 +146,7 @@ public class E2EServiceInstances { /** * PUT Requests for E2E Service update Instance on a version provided - * + * * @throws ApiException */ @@ -166,7 +167,7 @@ public class E2EServiceInstances { /** * DELETE Requests for E2E Service delete Instance on a specified version and serviceId - * + * * @throws ApiException */ @@ -222,7 +223,7 @@ public class E2EServiceInstances { /** * Scale Requests for E2E Service scale Instance on a specified version - * + * * @throws ApiException */ @@ -242,7 +243,7 @@ public class E2EServiceInstances { /** * GET Requests for Comparing model of service instance with target version - * + * * @throws ApiException */ @@ -269,7 +270,6 @@ public class E2EServiceInstances { CompareModelsRequest e2eCompareModelReq; - ObjectMapper mapper = new ObjectMapper(); try { e2eCompareModelReq = mapper.readValue(requestJSON, CompareModelsRequest.class); @@ -363,7 +363,6 @@ public class E2EServiceInstances { // TODO should be a new one or the same service instance Id E2ESliceServiceActivateRequest e2eActReq; - ObjectMapper mapper = new ObjectMapper(); try { e2eActReq = mapper.readValue(requestJSON, E2ESliceServiceActivateRequest.class); @@ -453,7 +452,6 @@ public class E2EServiceInstances { // TODO should be a new one or the same service instance Id E2EServiceInstanceDeleteRequest e2eDelReq; - ObjectMapper mapper = new ObjectMapper(); try { e2eDelReq = mapper.readValue(requestJSON, E2EServiceInstanceDeleteRequest.class); @@ -542,7 +540,6 @@ public class E2EServiceInstances { E2EServiceInstanceRequest e2eSir; String serviceId = instanceIdMap.get(SERVICE_ID); - ObjectMapper mapper = new ObjectMapper(); try { e2eSir = mapper.readValue(requestJSON, E2EServiceInstanceRequest.class); @@ -620,7 +617,7 @@ public class E2EServiceInstances { E2EServiceInstanceRequest e2eSir; MsoRequest msoRequest = new MsoRequest(); - ObjectMapper mapper = new ObjectMapper(); + try { e2eSir = mapper.readValue(requestJSON, E2EServiceInstanceRequest.class); @@ -695,7 +692,6 @@ public class E2EServiceInstances { String requestId = UUID.randomUUID().toString(); E2EServiceInstanceScaleRequest e2eScaleReq; - ObjectMapper mapper = new ObjectMapper(); try { e2eScaleReq = mapper.readValue(requestJSON, E2EServiceInstanceScaleRequest.class); @@ -806,7 +802,7 @@ public class E2EServiceInstances { /** * Getting recipes from catalogDb - * + * * @param serviceModelUUID the service model version uuid * @param action the action for the service * @return the service recipe result @@ -826,7 +822,7 @@ public class E2EServiceInstances { /** * Getting recipes from catalogDb If Service recipe is not set, use default recipe, if set , use special recipe. - * + * * @param serviceModelUUID the service version uuid * @param action the action of the service. * @return the service recipe result. @@ -859,7 +855,7 @@ public class E2EServiceInstances { /** * Converting E2EServiceInstanceRequest to ServiceInstanceRequest and passing it to camunda engine. - * + * * @param e2eSir * @return */ @@ -967,7 +963,6 @@ public class E2EServiceInstances { private String convertToString(ServiceInstancesRequest sir) { String returnString = null; // converting to string - ObjectMapper mapper = new ObjectMapper(); try { returnString = mapper.writeValueAsString(sir); } catch (IOException e) { diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ManagedObject3gppServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ManagedObject3gppServiceInstances.java index 605e2a8386..4a4f8d8f98 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ManagedObject3gppServiceInstances.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ManagedObject3gppServiceInstances.java @@ -88,6 +88,7 @@ public class ManagedObject3gppServiceInstances { private static final String SAVE_TO_DB = "save instance to db"; private static final String URI_PREFIX = "/moi/api/rest/"; + private static final ObjectMapper mapper = new ObjectMapper(); @Autowired private MsoRequest msoRequest; @@ -233,7 +234,6 @@ public class ManagedObject3gppServiceInstances { attributes.setSliceProfileList(sliceProfileList); mOIResponse.setAttributes(attributes); - ObjectMapper mapper = new ObjectMapper(); try { response = mapper.writeValueAsString(mOIResponse); } catch (Exception exception) { @@ -310,7 +310,7 @@ public class ManagedObject3gppServiceInstances { ServiceInstancesRequest sir = createServiceInstanceRequest(request, requestId); String requestDetails = null; try { - requestDetails = new ObjectMapper().writeValueAsString(sir); + requestDetails = mapper.writeValueAsString(sir); LOGGER.debug(">>> sir: {}", sir); } catch (JsonProcessingException e) { e.printStackTrace(); @@ -496,7 +496,6 @@ public class ManagedObject3gppServiceInstances { } Function toString = serviceRequest -> { - ObjectMapper mapper = new ObjectMapper(); String requestAsString = null; try { requestAsString = mapper.writeValueAsString(serviceRequest); diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ManualTasks.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ManualTasks.java index b01bbecf0a..7c9005299e 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ManualTasks.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ManualTasks.java @@ -10,9 +10,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -68,6 +68,13 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse; @Component public class ManualTasks { private static Logger logger = LoggerFactory.getLogger(ManualTasks.class); + private static final ObjectMapper mapper = new ObjectMapper(); + private static final ObjectMapper wrapMapper; + + static { + wrapMapper = new ObjectMapper(); + wrapMapper.configure(SerializationFeature.WRAP_ROOT_VALUE, true); + } @org.springframework.beans.factory.annotation.Value("${mso.camunda.rest.task.uri}") @@ -99,7 +106,6 @@ public class ManualTasks { String apiVersion = version.substring(1); try { - ObjectMapper mapper = new ObjectMapper(); taskRequest = mapper.readValue(request, TasksRequest.class); if (taskRequest.getRequestDetails() == null) { @@ -155,9 +161,7 @@ public class ManualTasks { String camundaJsonReq; try { - ObjectMapper mapper = new ObjectMapper(); - mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, true); - camundaJsonReq = mapper.writeValueAsString(variablesForComplete); + camundaJsonReq = wrapMapper.writeValueAsString(variablesForComplete); } catch (JsonProcessingException e) { logger.error("Mapping of JSON object to Camunda request failed"); ValidateException validateException = @@ -177,9 +181,7 @@ public class ManualTasks { trr.setTaskId(taskId); String completeResp = null; try { - ObjectMapper mapper = new ObjectMapper(); - mapper.configure(SerializationFeature.WRAP_ROOT_VALUE, true); - completeResp = mapper.writeValueAsString(trr); + completeResp = wrapMapper.writeValueAsString(trr); } catch (JsonProcessingException e) { logger.error("Unable to map response from Camunda"); ValidateException validateException = 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 af507c6d56..7e5bb561b5 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 @@ -101,6 +101,15 @@ import com.fasterxml.jackson.databind.ObjectMapper; @Component public class MsoRequest { + private static Logger logger = LoggerFactory.getLogger(MsoRequest.class); + private static final ObjectMapper mapper = new ObjectMapper(); + private static final ObjectMapper nonNullMapper; + + static { + nonNullMapper = new ObjectMapper(); + nonNullMapper.setSerializationInclusion(Include.NON_NULL); + + } @Autowired private RequestsDbClient requestsDbClient; @@ -114,7 +123,6 @@ public class MsoRequest { @Value("${mso.enforceDLP:false}") private boolean enforceDLP; - private static Logger logger = LoggerFactory.getLogger(MsoRequest.class); public Response buildServiceErrorResponse(int httpResponseCode, MsoException exceptionType, String errorText, String messageId, List variables, String version) { @@ -196,9 +204,8 @@ public class MsoRequest { if (reqVersion >= 7 && requestParameters != null && requestParameters.getUserParams() != null) { for (Map params : requestParameters.getUserParams()) { if (params.containsKey("service")) { - ObjectMapper obj = new ObjectMapper(); - String input = obj.writeValueAsString(params.get("service")); - Service validate = obj.readValue(input, Service.class); + String input = mapper.writeValueAsString(params.get("service")); + Service validate = mapper.readValue(input, Service.class); info.setUserParams(validate); rules.add(new UserParamsValidation()); break; @@ -585,11 +592,9 @@ public class MsoRequest { public String getRequestJSON(ServiceInstancesRequest sir) throws JsonGenerationException, JsonMappingException, IOException { - ObjectMapper mapper = new ObjectMapper(); - mapper.setSerializationInclusion(Include.NON_NULL); logger.debug("building sir from object {}", sir); - String requestJSON = mapper.writeValueAsString(sir); + String requestJSON = nonNullMapper.writeValueAsString(sir); // Perform mapping from VID-style modelInfo fields to ASDC-style modelInfo fields diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstances.java index a25a140334..96019ea86f 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstances.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/Onap3gppServiceInstances.java @@ -98,7 +98,7 @@ import org.onap.so.db.request.client.RequestsDbClient; public class Onap3gppServiceInstances { private static final Logger logger = LoggerFactory.getLogger(Onap3gppServiceInstances.class); - + private static final ObjectMapper mapper = new ObjectMapper(); private static final String MSO_PROP_APIHANDLER_INFRA = "MSO_PROP_APIHANDLER_INFRA"; private static final String END_OF_THE_TRANSACTION = "End of the transaction, the final response is: "; @@ -591,7 +591,6 @@ public class Onap3gppServiceInstances { } private Response getSubnetCapabilities(List subnetTypes, String version) throws ApiException { - ObjectMapper oMapper = new ObjectMapper(); String inputFileString = ""; Map subnetCapability = new HashMap<>(); BufferedReader br = null; @@ -606,7 +605,7 @@ public class Onap3gppServiceInstances { line = br.readLine(); } inputFileString = sb.toString(); - subnetCapability = oMapper.readValue(inputFileString, Map.class); + subnetCapability = mapper.readValue(inputFileString, Map.class); } catch (Exception e) { logger.debug("Exception while reading subnet capability value from json", e); } @@ -618,7 +617,7 @@ public class Onap3gppServiceInstances { } String response = null; try { - response = oMapper.writeValueAsString(responseMap); + response = mapper.writeValueAsString(responseMap); } catch (JsonProcessingException e) { logger.debug("Exception while converting subnet capability object to String {}", e); } @@ -680,7 +679,6 @@ public class Onap3gppServiceInstances { } Function toString = serviceRequest -> { - ObjectMapper mapper = new ObjectMapper(); String requestAsString = null; try { requestAsString = mapper.writeValueAsString(serviceRequest); @@ -772,5 +770,3 @@ public class Onap3gppServiceInstances { parameter.getApiVersion()); } } - - diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/OrchestrationRequests.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/OrchestrationRequests.java index 8c919f0cf7..dff68cc761 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/OrchestrationRequests.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/OrchestrationRequests.java @@ -94,6 +94,7 @@ public class OrchestrationRequests { private static Logger logger = LoggerFactory.getLogger(OrchestrationRequests.class); private static final String ERROR_MESSAGE_PREFIX = "Error Source: %s, Error Message: %s"; + private static final ObjectMapper mapper = new ObjectMapper(); @Autowired private RequestsDbClient requestsDbClient; @@ -243,7 +244,6 @@ public class OrchestrationRequests { ServiceInstancesRequest sir; try { - ObjectMapper mapper = new ObjectMapper(); sir = mapper.readValue(requestJSON, ServiceInstancesRequest.class); } catch (IOException e) { logger.error("Exception occurred", e); @@ -300,8 +300,6 @@ public class OrchestrationRequests { String requestBody = iar.getRequestBody(); Request request = new Request(); - ObjectMapper mapper = new ObjectMapper(); - request.setRequestId(iar.getRequestId()); request.setRequestScope(iar.getRequestScope()); request.setRequestType(iar.getRequestAction()); diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/OrchestrationTasks.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/OrchestrationTasks.java index 836f08adb5..ba9b3ad107 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/OrchestrationTasks.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/OrchestrationTasks.java @@ -72,7 +72,7 @@ public class OrchestrationTasks { @Autowired private ResponseBuilder builder; - private ObjectMapper mapper = new ObjectMapper(); + private static final ObjectMapper mapper = new ObjectMapper(); @GET @Path("/{version:[vV][4-7]}/") diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/RequestHandlerUtils.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/RequestHandlerUtils.java index 4338e6109e..583a684e23 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/RequestHandlerUtils.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/RequestHandlerUtils.java @@ -106,6 +106,13 @@ import com.fasterxml.jackson.databind.ObjectMapper; public class RequestHandlerUtils extends AbstractRestHandler { private static Logger logger = LoggerFactory.getLogger(RequestHandlerUtils.class); + private static final ObjectMapper mapper = new ObjectMapper(); + private static final ObjectMapper nonNullMapper; + + static { + nonNullMapper = new ObjectMapper(); + nonNullMapper.setSerializationInclusion(Include.NON_NULL); + } protected static final String SAVE_TO_DB = "save instance to db"; private static final String NAME = "name"; @@ -144,7 +151,6 @@ public class RequestHandlerUtils extends AbstractRestHandler { public Response postBPELRequest(InfraActiveRequests currentActiveReq, RequestClientParameter requestClientParameter, String orchestrationUri, String requestScope) throws ApiException { - ObjectMapper mapper = new ObjectMapper(); ResponseEntity response = postRequest(currentActiveReq, requestClientParameter, orchestrationUri); ServiceInstancesResponse jsonResponse = null; int bpelStatus = responseHandler.setStatus(response.getStatusCodeValue()); @@ -314,7 +320,6 @@ public class RequestHandlerUtils extends AbstractRestHandler { public ServiceInstancesRequest convertJsonToServiceInstanceRequest(String requestJSON, Actions action, String requestId, String requestUri) throws ApiException { try { - ObjectMapper mapper = new ObjectMapper(); return mapper.readValue(requestJSON, ServiceInstancesRequest.class); } catch (IOException e) { @@ -450,10 +455,8 @@ public class RequestHandlerUtils extends AbstractRestHandler { public String mapJSONtoMSOStyle(String msoRawRequest, ServiceInstancesRequest serviceInstRequest, boolean isAlaCarte, Actions action) throws IOException { - ObjectMapper mapper = new ObjectMapper(); - mapper.setSerializationInclusion(Include.NON_NULL); if (serviceInstRequest != null) { - return mapper.writeValueAsString(serviceInstRequest); + return nonNullMapper.writeValueAsString(serviceInstRequest); } else { return msoRawRequest; } @@ -833,9 +836,8 @@ public class RequestHandlerUtils extends AbstractRestHandler { } private Service serviceMapper(Map params) throws IOException { - ObjectMapper obj = new ObjectMapper(); - String input = obj.writeValueAsString(params.get("service")); - return obj.readValue(input, Service.class); + String input = mapper.writeValueAsString(params.get("service")); + return mapper.readValue(input, Service.class); } private void addUserParams(Map targetUserParams, List> sourceUserParams) { diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ServiceIntentApiHandler.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ServiceIntentApiHandler.java index be63c5fb9a..3c84be33ad 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ServiceIntentApiHandler.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/ServiceIntentApiHandler.java @@ -97,6 +97,7 @@ import java.util.function.Function; public class ServiceIntentApiHandler { private static final Logger logger = LoggerFactory.getLogger(ServiceIntentApiHandler.class); + private static final ObjectMapper mapper = new ObjectMapper(); private static final String MSO_PROP_APIHANDLER_INFRA = "MSO_PROP_APIHANDLER_INFRA"; @@ -351,7 +352,6 @@ public class ServiceIntentApiHandler { } Function toString = serviceRequest -> { - ObjectMapper mapper = new ObjectMapper(); String requestAsString = null; try { requestAsString = mapper.writeValueAsString(serviceRequest); diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/TasksHandler.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/TasksHandler.java index dadb7c7558..6464aca90f 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/TasksHandler.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/TasksHandler.java @@ -9,9 +9,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -72,6 +72,7 @@ public class TasksHandler { private static Logger logger = LoggerFactory.getLogger(TasksHandler.class); + private static final ObjectMapper mapper = new ObjectMapper(); @Value("${mso.camunda.rest.task.uri}") private String requestUrl; @@ -153,7 +154,6 @@ public class TasksHandler { String camundaJsonReq = null; try { - ObjectMapper mapper = new ObjectMapper(); camundaJsonReq = mapper.writeValueAsString(tv); } catch (JsonProcessingException e) { ErrorLoggerInfo errorLoggerInfo = @@ -201,7 +201,6 @@ public class TasksHandler { String jsonResponse = null; try { - ObjectMapper mapper = new ObjectMapper(); jsonResponse = mapper.writeValueAsString(trr); } catch (JsonProcessingException e) { ErrorLoggerInfo errorLoggerInfo = diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandler.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandler.java index 0f7cf5fc6a..4bd7163bf4 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandler.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandler.java @@ -63,6 +63,8 @@ import java.util.stream.Collectors; @Component public class WorkflowSpecificationsHandler { + private static final ObjectMapper mapper = new ObjectMapper(); + @Autowired private ResponseBuilder builder; @@ -145,9 +147,6 @@ public class WorkflowSpecificationsHandler { final String pnf_resource = "pnf"; String apiVersion = version.substring(1); - ObjectMapper mapper = new ObjectMapper(); - mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); - List workflows = queryWorkflowsForResourceTarget(pnf_resource); Optional optional = getResponseByWorkflowSpec(workflows); @@ -179,7 +178,6 @@ public class WorkflowSpecificationsHandler { WorkflowSpecifications workflowSpecifications = mapWorkflowsToWorkflowSpecifications(workflows); try { - ObjectMapper mapper = new ObjectMapper(); return Optional.of(mapper.writeValueAsString(workflowSpecifications)); } catch (JsonProcessingException e) { catchAndThrowValidationEx(e); diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/BpmnRequestBuilder.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/BpmnRequestBuilder.java index edf17f363b..b1e50b5704 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/BpmnRequestBuilder.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/BpmnRequestBuilder.java @@ -7,9 +7,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -71,7 +71,7 @@ public class BpmnRequestBuilder { @Autowired private AAIDataRetrieval aaiDataRet; - private ObjectMapper mapper = new ObjectMapper(); + private static final ObjectMapper mapper = new ObjectMapper(); public ServiceInstancesRequest buildVFModuleDeleteRequest(String vnfId, String vfModuleId, ModelType modelType) diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/handler/NetworkRestHandler.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/handler/NetworkRestHandler.java index a6d2fa2e1b..42d4a17e27 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/handler/NetworkRestHandler.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/handler/NetworkRestHandler.java @@ -7,9 +7,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -45,6 +45,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; public class NetworkRestHandler extends AbstractRestHandler { private static final Logger logger = LoggerFactory.getLogger(NetworkRestHandler.class); + private static final ObjectMapper mapper = new ObjectMapper(); public InfraActiveRequests mapInfraActiveRequestForDelete(String requestId, String serviceInstanceId, String networkId, String requestorId, String source, String requestURL) { @@ -75,7 +76,6 @@ public class NetworkRestHandler extends AbstractRestHandler { public RequestClientParameter buildRequestParams(ServiceInstancesRequest request, String requestURI, String requestId, String serviceInstanceId, String networkId) throws JsonProcessingException { - ObjectMapper mapper = new ObjectMapper(); return new RequestClientParameter.Builder().setRequestId(requestId).setServiceInstanceId(serviceInstanceId) .setNetworkId(networkId).setALaCarte(true).setRequestDetails(mapper.writeValueAsString(request)) .setRequestAction(Action.deleteInstance.toString()).setRequestUri(requestURI).setApiVersion("v8") diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/handler/ServiceInstanceRestHandler.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/handler/ServiceInstanceRestHandler.java index 36e7b7ced6..d918fd0dac 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/handler/ServiceInstanceRestHandler.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/handler/ServiceInstanceRestHandler.java @@ -7,9 +7,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -45,9 +45,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; @Component public class ServiceInstanceRestHandler extends AbstractRestHandler { + private static final Logger logger = LoggerFactory.getLogger(ServiceInstanceRestHandler.class); + private static final ObjectMapper mapper = new ObjectMapper(); private static final String DEFAULT_VF_MODULE_UUID = "d88da85c-d9e8-4f73-b837-3a72a431622b"; - private static final Logger logger = LoggerFactory.getLogger(ServiceInstanceRestHandler.class); public InfraActiveRequests mapInfraActiveRequestForDelete(String requestId, String serviceInstanceId, String requestorId, String source, String requestURL) { @@ -77,7 +78,6 @@ public class ServiceInstanceRestHandler extends AbstractRestHandler { public RequestClientParameter buildRequestParams(ServiceInstancesRequest request, String requestURI, String requestId, String serviceInstanceId) throws JsonProcessingException { - ObjectMapper mapper = new ObjectMapper(); return new RequestClientParameter.Builder().setRequestId(requestId).setServiceInstanceId(serviceInstanceId) .setALaCarte(true).setRequestDetails(mapper.writeValueAsString(request)) .setRequestAction(Action.deleteInstance.toString()).setRequestUri(requestURI).setApiVersion("v8") diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/handler/VFModuleRestHandler.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/handler/VFModuleRestHandler.java index 380649a3ca..543a1d103e 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/handler/VFModuleRestHandler.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/handler/VFModuleRestHandler.java @@ -7,9 +7,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -45,6 +45,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; public class VFModuleRestHandler extends AbstractRestHandler { private static final Logger logger = LoggerFactory.getLogger(VFModuleRestHandler.class); + private static final ObjectMapper mapper = new ObjectMapper(); public InfraActiveRequests mapInfraActiveRequestForDelete(String requestId, String vfModuleId, String serviceInstanceId, String vnfId, String requestorId, String source, String requestURL) { @@ -78,7 +79,6 @@ public class VFModuleRestHandler extends AbstractRestHandler { public RequestClientParameter buildRequestParams(ServiceInstancesRequest request, String requestURI, String requestId, String serviceInstanceId, String vnfId, String vfModuleId) throws JsonProcessingException { - ObjectMapper mapper = new ObjectMapper(); return new RequestClientParameter.Builder().setRequestId(requestId).setServiceInstanceId(serviceInstanceId) .setVnfId(vnfId).setVfModuleId(vfModuleId).setALaCarte(true) .setRequestDetails(mapper.writeValueAsString(request)) diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/handler/VnfRestHandler.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/handler/VnfRestHandler.java index c11ae56b0d..a5c16c7522 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/handler/VnfRestHandler.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/handler/VnfRestHandler.java @@ -8,9 +8,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -45,6 +45,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; public class VnfRestHandler extends AbstractRestHandler { private static final Logger logger = LoggerFactory.getLogger(VnfRestHandler.class); + private static final ObjectMapper mapper = new ObjectMapper(); public InfraActiveRequests mapInfraActiveRequestForDelete(String requestId, String serviceInstanceId, String vnfId, String requestorId, String source, String requestURL) { @@ -75,7 +76,6 @@ public class VnfRestHandler extends AbstractRestHandler { public RequestClientParameter buildRequestParams(ServiceInstancesRequest request, String requestURI, String requestId, String serviceInstanceId, String vnfId) throws JsonProcessingException { - ObjectMapper mapper = new ObjectMapper(); return new RequestClientParameter.Builder().setRequestId(requestId).setServiceInstanceId(serviceInstanceId) .setVnfId(vnfId).setALaCarte(true).setRequestDetails(mapper.writeValueAsString(request)) .setRequestAction(Action.deleteInstance.toString()).setRequestUri(requestURI).setApiVersion("v8") diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/handler/VolumeRestHandler.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/handler/VolumeRestHandler.java index 15aa71f936..c5a15cb496 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/handler/VolumeRestHandler.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/infra/rest/handler/VolumeRestHandler.java @@ -7,9 +7,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -42,6 +42,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; public class VolumeRestHandler extends AbstractRestHandler { private static final Logger logger = LoggerFactory.getLogger(VolumeRestHandler.class); + private static final ObjectMapper mapper = new ObjectMapper(); public InfraActiveRequests mapInfraActiveRequestForDelete(String requestId, String volumeGroupId, String serviceInstanceId, String vnfId, String requestorId, String source, String requestURL) { @@ -74,7 +75,6 @@ public class VolumeRestHandler extends AbstractRestHandler { public RequestClientParameter buildRequestParams(ServiceInstancesRequest request, String requestURI, String requestId, String serviceInstanceId, String vnfId, String volumeGroupId) throws JsonProcessingException { - ObjectMapper mapper = new ObjectMapper(); return new RequestClientParameter.Builder().setRequestId(requestId).setServiceInstanceId(serviceInstanceId) .setVnfId(vnfId).setVolumeGroupId(volumeGroupId).setALaCarte(true) .setRequestDetails(mapper.writeValueAsString(request)) diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/CloudOrchestration.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/CloudOrchestration.java index bb2b89ca82..674ff3cf9c 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/CloudOrchestration.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/CloudOrchestration.java @@ -76,6 +76,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse; public class CloudOrchestration { private static Logger logger = LoggerFactory.getLogger(CloudOrchestration.class); + private static final ObjectMapper mapper = new ObjectMapper(); private static final String ENVIRONMENT_ID_KEY = "operationalEnvironmentId"; @Autowired @@ -241,7 +242,6 @@ public class CloudOrchestration { long startTime, CloudOrchestrationRequest cor) throws ApiException { try { logger.debug("Converting incoming JSON request to Object"); - ObjectMapper mapper = new ObjectMapper(); return mapper.readValue(requestJSON, CloudOrchestrationRequest.class); } catch (IOException e) { 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 59c0694ea2..74741fbad0 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 @@ -9,9 +9,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -77,6 +77,7 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse; public class CloudResourcesOrchestration { private static Logger logger = LoggerFactory.getLogger(CloudResourcesOrchestration.class); + private static final ObjectMapper mapper = new ObjectMapper(); @Autowired RequestsDbClient requestDbClient; @@ -100,7 +101,6 @@ public class CloudResourcesOrchestration { logger.debug("requestId is: {}", requestId); try { - ObjectMapper mapper = new ObjectMapper(); cor = mapper.readValue(requestJSON, CloudOrchestrationRequest.class); } catch (IOException e) { ErrorLoggerInfo errorLoggerInfo = @@ -275,7 +275,6 @@ public class CloudResourcesOrchestration { if (requestBody != null) { try { - ObjectMapper mapper = new ObjectMapper(); requestDetails = mapper.readValue(requestBody, RequestDetails.class); } catch (IOException e) { ErrorLoggerInfo errorLoggerInfo = diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/ModelDistributionRequest.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/ModelDistributionRequest.java index e11635370c..98eabb9863 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/ModelDistributionRequest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/ModelDistributionRequest.java @@ -9,9 +9,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -70,6 +70,8 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse; public class ModelDistributionRequest { private static Logger logger = LoggerFactory.getLogger(ModelDistributionRequest.class); + private static final ObjectMapper mapper = new ObjectMapper(); + @Autowired private Provider tenantIsolationRunnable; @@ -85,7 +87,6 @@ public class ModelDistributionRequest { Distribution distributionRequest; try { - ObjectMapper mapper = new ObjectMapper(); distributionRequest = mapper.readValue(requestJSON, Distribution.class); } catch (IOException e) { ErrorLoggerInfo errorLoggerInfo = 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 b1eb71ea04..a71ce1dfd2 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 @@ -9,9 +9,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -58,6 +58,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; @Scope("prototype") public class TenantIsolationRequest { + private static final ObjectMapper mapper = new ObjectMapper(); + private String requestId; private String requestJSON; private RequestInfo requestInfo; @@ -88,9 +90,7 @@ public class TenantIsolationRequest { this.requestInfo = request.getRequestDetails().getRequestInfo(); try { - ObjectMapper mapper = new ObjectMapper(); requestJSON = mapper.writeValueAsString(request.getRequestDetails()); - } catch (JsonProcessingException e) { logger.error("Exception in JSON processing", e); throw new ValidationException("Parse ServiceInstanceRequest to JSON string", true); @@ -238,7 +238,6 @@ public class TenantIsolationRequest { this.cor = cor; try { - ObjectMapper mapper = new ObjectMapper(); requestJSON = mapper.writeValueAsString(cor.getRequestDetails()); } catch (JsonProcessingException e) { diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/dmaap/DmaapOperationalEnvClient.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/dmaap/DmaapOperationalEnvClient.java index 2df0a1ff21..cd58bbb446 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/dmaap/DmaapOperationalEnvClient.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/dmaap/DmaapOperationalEnvClient.java @@ -7,9 +7,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -37,6 +37,8 @@ import com.fasterxml.jackson.databind.ObjectMapper; @Component public class DmaapOperationalEnvClient { + private static final ObjectMapper mapper = new ObjectMapper(); + @Autowired private Provider dmaapPublisher; @@ -64,8 +66,6 @@ public class DmaapOperationalEnvClient { } protected String getJson(CreateEcompOperationEnvironmentBean obj) throws JsonProcessingException { - - final ObjectMapper mapper = new ObjectMapper(); return mapper.writeValueAsString(obj); } diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/process/CreateVnfOperationalEnvironment.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/process/CreateVnfOperationalEnvironment.java index 23537a7687..c527b9eecf 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/process/CreateVnfOperationalEnvironment.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/tenantisolation/process/CreateVnfOperationalEnvironment.java @@ -9,9 +9,9 @@ * 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 - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -58,6 +58,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; public class CreateVnfOperationalEnvironment { private static Logger logger = LoggerFactory.getLogger(CreateVnfOperationalEnvironment.class); + private static final ObjectMapper mapper = new ObjectMapper(); protected CloudOrchestrationRequest request; @Autowired @@ -71,7 +72,6 @@ public class CreateVnfOperationalEnvironment { public void execute(String requestId, CloudOrchestrationRequest request) throws ApiException { try { setRequest(request); - ObjectMapper objectMapper = new ObjectMapper(); AAIResultWrapper aaiResultWrapper = aaiHelper.getAaiOperationalEnvironment(getEcompManagingEnvironmentId()); if (aaiResultWrapper.isEmpty()) { throw new NotFoundException(getEcompManagingEnvironmentId() + " not found in A&AI"); @@ -83,7 +83,7 @@ public class CreateVnfOperationalEnvironment { String searchKey = getSearchKey(aaiEnv); String tenantContext = getTenantContext().toUpperCase(); String jsonResponse = getGrmClient().findRunningServicesAsString(searchKey, 1, tenantContext); - ServiceEndPointList sel = objectMapper.readValue(jsonResponse, ServiceEndPointList.class); + ServiceEndPointList sel = mapper.readValue(jsonResponse, ServiceEndPointList.class); if (sel.getServiceEndPointList().size() == 0) { throw new TenantIsolationException( "GRM did not find any matches for " + searchKey + " in " + tenantContext);