diff options
12 files changed, 0 insertions, 247 deletions
diff --git a/openecomp-be/backend/openecomp-sdc-activity-log-manager/src/main/java/org/openecomp/sdc/activitylog/impl/ActivityLogManagerImpl.java b/openecomp-be/backend/openecomp-sdc-activity-log-manager/src/main/java/org/openecomp/sdc/activitylog/impl/ActivityLogManagerImpl.java index 711fd68a8e..8e6a9ef518 100644 --- a/openecomp-be/backend/openecomp-sdc-activity-log-manager/src/main/java/org/openecomp/sdc/activitylog/impl/ActivityLogManagerImpl.java +++ b/openecomp-be/backend/openecomp-sdc-activity-log-manager/src/main/java/org/openecomp/sdc/activitylog/impl/ActivityLogManagerImpl.java @@ -24,13 +24,11 @@ import org.openecomp.core.utilities.CommonMethods; import org.openecomp.sdc.activitylog.ActivityLogManager; import org.openecomp.sdc.activitylog.dao.ActivityLogDao; import org.openecomp.sdc.activitylog.dao.type.ActivityLogEntity; -import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage; import org.openecomp.sdc.versioning.dao.types.Version; import java.util.Collection; public class ActivityLogManagerImpl implements ActivityLogManager { - private static MdcDataDebugMessage mdcDataDebugMessage = new MdcDataDebugMessage(); private ActivityLogDao activityLogDao; public ActivityLogManagerImpl(ActivityLogDao activityLogDao) { @@ -39,14 +37,12 @@ public class ActivityLogManagerImpl implements ActivityLogManager { @Override public void logActivity(ActivityLogEntity activityLogEntity) { - mdcDataDebugMessage.debugEntryMessage("ITEM id", activityLogEntity.getItemId()); activityLogEntity.setId(CommonMethods.nextUuId()); activityLogDao.create(activityLogEntity); } @Override public Collection<ActivityLogEntity> listLoggedActivities(String itemId, Version version) { - mdcDataDebugMessage.debugEntryMessage("ITEM id", itemId); return activityLogDao.list(new ActivityLogEntity(itemId, version)); } } diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ComputeManagerImpl.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ComputeManagerImpl.java index 9d53c997af..9641f3322e 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ComputeManagerImpl.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ComputeManagerImpl.java @@ -24,7 +24,6 @@ import org.openecomp.sdc.common.errors.CoreException; import org.openecomp.sdc.common.errors.ErrorCategory; import org.openecomp.sdc.common.errors.ErrorCode; import org.openecomp.sdc.datatypes.error.ErrorLevel; -import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage; import org.openecomp.sdc.logging.context.impl.MdcDataErrorMessage; import org.openecomp.sdc.logging.types.LoggerConstants; import org.openecomp.sdc.logging.types.LoggerErrorCode; @@ -63,8 +62,6 @@ import java.util.List; import java.util.Set; public class ComputeManagerImpl implements ComputeManager { - - private static final MdcDataDebugMessage MDC_DATA_DEBUG_MESSAGE = new MdcDataDebugMessage(); private final ComputeDao computeDao; private final CompositionEntityDataManager compositionEntityDataManager; private final VendorSoftwareProductInfoDao vspInfoDao; @@ -85,9 +82,6 @@ public class ComputeManagerImpl implements ComputeManager { @Override public ComputeEntity createCompute(ComputeEntity compute) { - MDC_DATA_DEBUG_MESSAGE - .debugEntryMessage(VSP_ID_COMPONENT_ID, compute.getVspId(), compute.getComponentId()); - if (!vspInfoDao.isManual(compute.getVspId(), compute.getVersion())) { ErrorCode onboardingMethodUpdateErrorCode = NotSupportedHeatOnboardMethodErrorBuilder .getAddComputeNotSupportedHeatOnboardMethodErrorBuilder(); @@ -106,10 +100,6 @@ public class ComputeManagerImpl implements ComputeManager { createUniqueName(compute.getVspId(), compute.getVersion(), compute.getComponentId(), compute.getComputeCompositionData().getName()); } - - MDC_DATA_DEBUG_MESSAGE - .debugExitMessage(VSP_ID_COMPONENT_ID, compute.getVspId(), compute.getComponentId()); - return compute; } @@ -117,14 +107,11 @@ public class ComputeManagerImpl implements ComputeManager { @Override public Collection<ListComputeResponse> listComputes(String vspId, Version version, String componentId) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(VSP_ID_COMPONENT_ID, vspId, componentId); Collection<ComputeEntity> computes = computeDao.list(new ComputeEntity(vspId, version, componentId, null)); Collection<ListComputeResponse> computeResponse = getListComputeResponse(vspId, version, computes); - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID_COMPONENT_ID, vspId, componentId); - return computeResponse; } @@ -165,9 +152,6 @@ public class ComputeManagerImpl implements ComputeManager { public CompositionEntityResponse<ComputeData> getCompute(String vspId, Version version, String componentId, String computeFlavorId) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(VSP_ID_COMPONENT_ID_COMPUTE_ID, vspId, - componentId, computeFlavorId); - ComputeEntity computeEntity = getValidatedCompute(vspId, version, componentId, computeFlavorId); ComputeData compute = computeEntity.getComputeCompositionData(); @@ -179,10 +163,6 @@ public class ComputeManagerImpl implements ComputeManager { response.setId(computeFlavorId); response.setData(compute); response.setSchema(getComputeCompositionSchema(schemaInput)); - - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID_COMPONENT_ID_COMPUTE_ID, vspId, - componentId, computeFlavorId); - return response; } @@ -199,8 +179,6 @@ public class ComputeManagerImpl implements ComputeManager { @Override public QuestionnaireResponse getComputeQuestionnaire(String vspId, Version version, String componentId, String computeId) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage("VSP id, componentId", vspId, componentId, computeId); - QuestionnaireResponse questionnaireResponse = new QuestionnaireResponse(); ComputeEntity computeQuestionnaire = computeDao.getQuestionnaireData(vspId, version, componentId, computeId); @@ -209,9 +187,6 @@ public class ComputeManagerImpl implements ComputeManager { new ComputeEntity(vspId, version, componentId, computeId), VspDetails.ENTITY_TYPE); questionnaireResponse.setData(computeQuestionnaire.getQuestionnaireData()); questionnaireResponse.setSchema(getComputeQuestionnaireSchema(null)); - - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID_COMPONENT_ID, vspId, componentId, computeId); - return questionnaireResponse; } @@ -219,26 +194,16 @@ public class ComputeManagerImpl implements ComputeManager { @Override public void updateComputeQuestionnaire(String vspId, Version version, String componentId, String computeId, String questionnaireData) { - MDC_DATA_DEBUG_MESSAGE - .debugEntryMessage(VSP_ID_COMPONENT_ID_COMPUTE_ID, vspId, componentId, computeId); - ComputeEntity retrieved = computeDao.get(new ComputeEntity(vspId, version, componentId, computeId)); VersioningUtil.validateEntityExistence(retrieved, new ComputeEntity(vspId, version, componentId, computeId), VspDetails.ENTITY_TYPE); computeDao.updateQuestionnaireData(vspId, version, componentId, computeId, questionnaireData); - - MDC_DATA_DEBUG_MESSAGE - .debugExitMessage(VSP_ID_COMPONENT_ID_COMPUTE_ID, vspId, componentId, computeId); } @Override public CompositionEntityValidationData updateCompute(ComputeEntity compute) { - MDC_DATA_DEBUG_MESSAGE - .debugEntryMessage(VSP_ID_COMPONENT_ID, compute.getVspId(), compute.getComponentId(), - compute.getId()); - ComputeEntity retrieved = getComputeEntity(compute.getVspId(), compute.getVersion(), compute.getComponentId(), compute.getId()); @@ -261,11 +226,6 @@ public class ComputeManagerImpl implements ComputeManager { compute.getComputeCompositionData().getName()); computeDao.update(compute); } - - MDC_DATA_DEBUG_MESSAGE - .debugExitMessage(VSP_ID_COMPONENT_ID, compute.getVspId(), compute.getComponentId(), - compute.getId()); - return validationData; } @@ -300,9 +260,6 @@ public class ComputeManagerImpl implements ComputeManager { final String vspCompositionEditNotAllowedMsg = "Composition entities may not be created / deleted for Vendor Software Product " + "whose entities were uploaded"; - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(VSP_ID_COMPONENT_ID_COMPUTE_ID, vspId, - componentId, computeFlavorId); - if (!vspInfoDao.isManual(vspId, version)) { MdcDataErrorMessage.createErrorMessageAndUpdateMdc(LoggerConstants.TARGET_ENTITY_DB, LoggerTragetServiceName.DELETE_COMPUTE, ErrorLevel.ERROR.name(), @@ -319,9 +276,6 @@ public class ComputeManagerImpl implements ComputeManager { deleteUniqueValue(retrieved.getVspId(), retrieved.getVersion(), retrieved.getComponentId(), retrieved.getComputeCompositionData().getName()); } - - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID_COMPONENT_ID_COMPUTE_ID, vspId, - componentId, computeFlavorId); } private void deleteComputeFromDeploymentFlavors(String vspId, Version version, @@ -359,15 +313,11 @@ public class ComputeManagerImpl implements ComputeManager { } protected String getComputeCompositionSchema(SchemaTemplateInput schemaInput) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(null); - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(null); return SchemaGenerator .generate(SchemaTemplateContext.composition, CompositionEntityType.compute, schemaInput); } protected String getComputeQuestionnaireSchema(SchemaTemplateInput schemaInput) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(null); - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(null); return SchemaGenerator .generate(SchemaTemplateContext.questionnaire, CompositionEntityType.compute, schemaInput); } diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/DeploymentFlavorManagerImpl.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/DeploymentFlavorManagerImpl.java index 14d9b31f46..3f3d305f19 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/DeploymentFlavorManagerImpl.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/DeploymentFlavorManagerImpl.java @@ -20,7 +20,6 @@ import org.apache.commons.collections4.CollectionUtils; import org.openecomp.sdc.common.errors.CoreException; import org.openecomp.sdc.common.errors.ErrorCode; import org.openecomp.sdc.datatypes.error.ErrorLevel; -import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage; import org.openecomp.sdc.logging.context.impl.MdcDataErrorMessage; import org.openecomp.sdc.logging.types.LoggerConstants; import org.openecomp.sdc.logging.types.LoggerErrorCode; @@ -53,8 +52,6 @@ import java.util.List; import java.util.Map; public class DeploymentFlavorManagerImpl implements DeploymentFlavorManager { - - private static final MdcDataDebugMessage MDC_DATA_DEBUG_MESSAGE = new MdcDataDebugMessage(); private final VendorSoftwareProductInfoDao vspInfoDao; private final DeploymentFlavorDao deploymentFlavorDao; private final CompositionEntityDataManager compositionEntityDataManager; @@ -74,8 +71,6 @@ public class DeploymentFlavorManagerImpl implements DeploymentFlavorManager { @Override public Collection<DeploymentFlavorEntity> listDeploymentFlavors(String vspId, Version version) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage("VSP id", vspId); - MDC_DATA_DEBUG_MESSAGE.debugExitMessage("VSP id", vspId); return deploymentFlavorDao.list(new DeploymentFlavorEntity(vspId, version, null)); } @@ -83,8 +78,6 @@ public class DeploymentFlavorManagerImpl implements DeploymentFlavorManager { public DeploymentFlavorEntity createDeploymentFlavor( DeploymentFlavorEntity deploymentFlavorEntity) { DeploymentFlavorEntity createDeploymentFlavor; - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage("VSP id ", deploymentFlavorEntity.getVspId()); - if (!vspInfoDao.isManual(deploymentFlavorEntity.getVspId(), deploymentFlavorEntity.getVersion())) { ErrorCode deploymentFlavorErrorBuilder = DeploymentFlavorErrorBuilder @@ -244,9 +237,6 @@ public class DeploymentFlavorManagerImpl implements DeploymentFlavorManager { public CompositionEntityResponse<DeploymentFlavor> getDeploymentFlavor(String vspId, Version version, String deploymentFlavorId) { - MDC_DATA_DEBUG_MESSAGE - .debugEntryMessage(VSP_ID_DEPLOYMENT_FLAVOR_ID, vspId, deploymentFlavorId); - DeploymentFlavorEntity deploymentFlavorEntity = getValidatedDeploymentFlavor(vspId, version, deploymentFlavorId); DeploymentFlavor deploymentFlavor = deploymentFlavorEntity.getDeploymentFlavorCompositionData(); @@ -263,9 +253,6 @@ public class DeploymentFlavorManagerImpl implements DeploymentFlavorManager { .generate(SchemaTemplateContext.composition, CompositionEntityType.deployment, schemaInput)); response.setData(deploymentFlavor); - MDC_DATA_DEBUG_MESSAGE - .debugExitMessage("VSP id, deployment flavor id ", vspId, deploymentFlavorId); - return response; } @@ -297,8 +284,6 @@ public class DeploymentFlavorManagerImpl implements DeploymentFlavorManager { @Override public void deleteDeploymentFlavor(String vspId, Version version, String deploymentFlavorId) { - MDC_DATA_DEBUG_MESSAGE - .debugEntryMessage(VSP_ID_DEPLOYMENT_FLAVOR_ID, vspId, deploymentFlavorId); DeploymentFlavorEntity deploymentFlavorEntity = getValidatedDeploymentFlavor(vspId, version, deploymentFlavorId); if (!vspInfoDao.isManual(vspId, version)) { @@ -315,16 +300,11 @@ public class DeploymentFlavorManagerImpl implements DeploymentFlavorManager { deploymentFlavorDao.delete(new DeploymentFlavorEntity(vspId, version, deploymentFlavorId)); } - MDC_DATA_DEBUG_MESSAGE - .debugExitMessage(VSP_ID_DEPLOYMENT_FLAVOR_ID, vspId, deploymentFlavorId); } @Override public CompositionEntityValidationData updateDeploymentFlavor( DeploymentFlavorEntity deploymentFlavorEntity) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage("VSP id, deploymentFlavor id", deploymentFlavorEntity - .getVspId(), deploymentFlavorEntity.getId()); - if (!vspInfoDao.isManual(deploymentFlavorEntity.getVspId(), deploymentFlavorEntity.getVersion())) { final ErrorCode updateDeploymentFlavorErrorBuilder = @@ -366,9 +346,6 @@ public class DeploymentFlavorManagerImpl implements DeploymentFlavorManager { if (CollectionUtils.isEmpty(validationData.getErrors())) { deploymentFlavorDao.update(deploymentFlavorEntity); } - - MDC_DATA_DEBUG_MESSAGE.debugExitMessage("VSP id, deploymentFlavor id", - deploymentFlavorEntity.getVspId(), deploymentFlavorEntity.getId()); return validationData; } diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ImageManagerImpl.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ImageManagerImpl.java index 6c08390af1..228d244872 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ImageManagerImpl.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ImageManagerImpl.java @@ -22,7 +22,6 @@ import org.openecomp.core.utilities.json.JsonUtil; import org.openecomp.sdc.common.errors.CoreException; import org.openecomp.sdc.common.errors.ErrorCode; import org.openecomp.sdc.datatypes.error.ErrorLevel; -import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage; import org.openecomp.sdc.logging.context.impl.MdcDataErrorMessage; import org.openecomp.sdc.logging.types.LoggerConstants; import org.openecomp.sdc.logging.types.LoggerErrorCode; @@ -54,7 +53,6 @@ import java.util.Collection; import java.util.stream.Collectors; public class ImageManagerImpl implements ImageManager { - private static final MdcDataDebugMessage MDC_DATA_DEBUG_MESSAGE = new MdcDataDebugMessage(); private final VendorSoftwareProductInfoDao vspInfoDao; private final ImageDao imageDao; private final CompositionEntityDataManager compositionEntityDataManager; @@ -88,34 +86,24 @@ public class ImageManagerImpl implements ImageManager { @Override public Collection<ImageEntity> listImages(String vspId, Version version, String componentId) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(VSP_ID, vspId); Collection<ImageEntity> imageEntities = imageDao.list(new ImageEntity(vspId, version, componentId, null)); - - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID, vspId); return imageEntities; } @Override public CompositionEntityResponse<Image> getImageSchema(String vspId) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage("VSP id, image id", vspId); - CompositionEntityResponse<Image> response = new CompositionEntityResponse<>(); ImageCompositionSchemaInput inputSchema = new ImageCompositionSchemaInput(); Image image = new Image(); inputSchema.setImage(image); response.setSchema(getImageCompositionSchema(inputSchema)); - - MDC_DATA_DEBUG_MESSAGE.debugExitMessage("VSP id, image id", vspId); return response; } @Override public CompositionEntityResponse<Image> getImage(String vspId, Version version, String componentId, String imageId) { - - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage("VSP id, componentId, image id", vspId, componentId, - imageId); ImageEntity imageEntity = getImageEntity(vspId, version, componentId, imageId); Image image = imageEntity.getImageCompositionData(); @@ -127,17 +115,12 @@ public class ImageManagerImpl implements ImageManager { response.setId(imageId); response.setData(image); response.setSchema(getImageCompositionSchema(schemaInput)); - - MDC_DATA_DEBUG_MESSAGE.debugExitMessage("VSP id, componentId, image id", vspId, componentId, - imageId); - return response; } @Override public QuestionnaireResponse getImageQuestionnaire(String vspId, Version version, String componentId, String imageId) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(VSP_ID, vspId); QuestionnaireResponse questionnaireResponse = new QuestionnaireResponse(); ImageEntity retrieved = imageDao.getQuestionnaireData(vspId, version, componentId, imageId); @@ -145,16 +128,11 @@ public class ImageManagerImpl implements ImageManager { imageId), ComponentEntity.ENTITY_TYPE); questionnaireResponse.setData(retrieved.getQuestionnaireData()); questionnaireResponse.setSchema(getImageQuestionnaireSchema(null)); - - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID, vspId); - return questionnaireResponse; } @Override public void deleteImage(String vspId, Version version, String componentId, String imageId) { - MDC_DATA_DEBUG_MESSAGE - .debugEntryMessage(VSP_ID_COMPONENT_ID, vspId, componentId, imageId); ImageEntity imageEntity = getImageEntity(vspId, version, componentId, imageId); if (!vspInfoDao.isManual(vspId, version)) { final ErrorCode deleteImageErrorBuilder = @@ -169,8 +147,6 @@ public class ImageManagerImpl implements ImageManager { if (imageEntity != null) { imageDao.delete(new ImageEntity(vspId, version, componentId, imageId)); } - MDC_DATA_DEBUG_MESSAGE - .debugExitMessage(VSP_ID_COMPONENT_ID, vspId, componentId, imageId); } private void validateHeatVspImageUpdate(String name, String value, String retrivedValue) { @@ -188,10 +164,6 @@ public class ImageManagerImpl implements ImageManager { @Override public CompositionEntityValidationData updateImage(ImageEntity image) { - MDC_DATA_DEBUG_MESSAGE - .debugEntryMessage(VSP_ID_COMPONENT_ID, image.getVspId(), image.getComponentId(), - image.getId()); - boolean isManual = vspInfoDao.isManual(image.getVspId(), image.getVersion()); ImageEntity retrieved = getImageEntity(image.getVspId(), image.getVersion(), image.getComponentId(), @@ -220,20 +192,12 @@ public class ImageManagerImpl implements ImageManager { if (CollectionUtils.isEmpty(validationData.getErrors())) { imageDao.update(image); } - - MDC_DATA_DEBUG_MESSAGE - .debugExitMessage(VSP_ID_COMPONENT_ID, image.getVspId(), image.getComponentId(), - image.getId()); - return validationData; } @Override public void updateImageQuestionnaire(String vspId, Version version, String componentId, String imageId, String questionnaireData) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage("VSP id, component id, imageId", vspId, componentId, - imageId); - getImageEntity(vspId, version, componentId, imageId); @@ -274,8 +238,6 @@ public class ImageManagerImpl implements ImageManager { } imageDao.updateQuestionnaireData(vspId, version, componentId, imageId, questionnaireData); - MDC_DATA_DEBUG_MESSAGE.debugExitMessage("VSP id, component id, imageId", vspId, componentId, - imageId); } private boolean isImageVersionUnique(String vspId, Version version, String componentId, @@ -320,17 +282,12 @@ public class ImageManagerImpl implements ImageManager { } protected String getImageCompositionSchema(SchemaTemplateInput schemaInput) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(null); - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(null); return SchemaGenerator .generate(SchemaTemplateContext.composition, CompositionEntityType.image, schemaInput); } protected String getImageQuestionnaireSchema(SchemaTemplateInput schemaInput) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(null); - - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(null); return SchemaGenerator .generate(SchemaTemplateContext.questionnaire, CompositionEntityType.image, schemaInput); diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/MonitoringUploadsManagerImpl.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/MonitoringUploadsManagerImpl.java index d278962bdb..d32c09b7da 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/MonitoringUploadsManagerImpl.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/MonitoringUploadsManagerImpl.java @@ -30,7 +30,6 @@ import org.openecomp.sdc.datatypes.error.ErrorLevel; import org.openecomp.sdc.datatypes.error.ErrorMessage; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; -import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage; import org.openecomp.sdc.logging.context.impl.MdcDataErrorMessage; import org.openecomp.sdc.logging.types.LoggerConstants; import org.openecomp.sdc.logging.types.LoggerErrorCode; @@ -60,7 +59,6 @@ import java.util.Optional; import static org.openecomp.core.validation.errors.ErrorMessagesFormatBuilder.getErrorWithParameters; public class MonitoringUploadsManagerImpl implements MonitoringUploadsManager { - private static final MdcDataDebugMessage MDC_DATA_DEBUG_MESSAGE = new MdcDataDebugMessage(); private final ComponentArtifactDao componentArtifactDao; private static final Logger logger = LoggerFactory.getLogger(VendorSoftwareProductManagerImpl.class); @@ -77,8 +75,6 @@ public class MonitoringUploadsManagerImpl implements MonitoringUploadsManager { @Override public void delete(String vspId, Version version, String componentId, MonitoringUploadType monitoringUploadType) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(VSP_ID_COMPONENT_ID, vspId, componentId); - ComponentMonitoringUploadEntity componentMonitoringUploadEntity = setValuesForComponentArtifactEntityUpload(vspId, version, null, componentId, null, monitoringUploadType, null); @@ -95,16 +91,12 @@ public class MonitoringUploadsManagerImpl implements MonitoringUploadsManager { } componentArtifactDao.delete(retrieved.get()); - - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID_COMPONENT_ID, vspId, componentId); } @Override public void upload(InputStream object, String filename, String vspId, Version version, String componentId, MonitoringUploadType type) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(VSP_ID_COMPONENT_ID, vspId, componentId); - if (object == null) { MdcDataErrorMessage.createErrorMessageAndUpdateMdc(LoggerConstants.TARGET_ENTITY_DB, LoggerTragetServiceName.UPLOAD_MONITORING_FILE, ErrorLevel.ERROR.name(), @@ -145,7 +137,6 @@ public class MonitoringUploadsManagerImpl implements MonitoringUploadsManager { } } logger.audit("Uploaded Monitoring File for component id:" + componentId + " ,vspId:" + vspId); - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID_COMPONENT_ID, vspId, componentId); } private void validateVesEventUpload(FileContentHandler upload, @@ -177,13 +168,8 @@ public class MonitoringUploadsManagerImpl implements MonitoringUploadsManager { @Override public MonitoringUploadStatus listFilenames(String vspId, Version version, String componentId) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(VSP_ID_COMPONENT_ID, vspId, componentId); - ComponentMonitoringUploadEntity current = new ComponentMonitoringUploadEntity(vspId, version, componentId, null); - - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID_COMPONENT_ID, vspId, componentId); - return setMonitoringUploadStatusValues(current); } diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/NetworkManagerImpl.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/NetworkManagerImpl.java index c2408308de..106adaa625 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/NetworkManagerImpl.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/NetworkManagerImpl.java @@ -19,7 +19,6 @@ package org.openecomp.sdc.vendorsoftwareproduct.impl; import org.apache.commons.collections4.CollectionUtils; import org.openecomp.sdc.common.errors.CoreException; import org.openecomp.sdc.datatypes.error.ErrorLevel; -import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage; import org.openecomp.sdc.logging.context.impl.MdcDataErrorMessage; import org.openecomp.sdc.logging.types.LoggerConstants; import org.openecomp.sdc.logging.types.LoggerErrorCode; @@ -44,8 +43,6 @@ import org.openecomp.sdc.versioning.dao.types.Version; import java.util.Collection; public class NetworkManagerImpl implements NetworkManager { - private static final MdcDataDebugMessage MDC_DATA_DEBUG_MESSAGE = new MdcDataDebugMessage(); - private final NetworkDao networkDao; private final CompositionEntityDataManager compositionEntityDataManager; private final VendorSoftwareProductInfoDao VSPInfoDao; @@ -63,16 +60,11 @@ public class NetworkManagerImpl implements NetworkManager { @Override public Collection<NetworkEntity> listNetworks(String vspId, Version version) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(VSP_ID, vspId); - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID, vspId); - return networkDao.list(new NetworkEntity(vspId, version, null)); } @Override public NetworkEntity createNetwork(NetworkEntity network) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(VSP_ID, network.getVspId()); - if (!VSPInfoDao.isManual(network.getVspId(), network.getVersion())) { MdcDataErrorMessage.createErrorMessageAndUpdateMdc(LoggerConstants.TARGET_ENTITY_DB, LoggerTragetServiceName.CREATE_NETWORK, ErrorLevel.ERROR.name(), @@ -81,17 +73,11 @@ public class NetworkManagerImpl implements NetworkManager { new CompositionEditNotAllowedErrorBuilder(network.getVspId(), network.getVersion()) .build()); } - - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID, network.getVspId()); - return null; } @Override public CompositionEntityValidationData updateNetwork(NetworkEntity network) { - MDC_DATA_DEBUG_MESSAGE - .debugEntryMessage(VSP_ID_NETWORK_ID, network.getVspId(), network.getId()); - NetworkEntity retrieved = getValidatedNetwork(network.getVspId(), network.getVersion(), network.getId()); NetworkCompositionSchemaInput schemaInput = new NetworkCompositionSchemaInput(); @@ -103,18 +89,12 @@ public class NetworkManagerImpl implements NetworkManager { if (CollectionUtils.isEmpty(validationData.getErrors())) { networkDao.update(network); } - - MDC_DATA_DEBUG_MESSAGE - .debugExitMessage(VSP_ID_NETWORK_ID, network.getVspId(), network.getId()); - return validationData; } @Override public CompositionEntityResponse<Network> getNetwork(String vspId, Version version, String networkId) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(VSP_ID_NETWORK_ID, vspId, networkId); - NetworkEntity networkEntity = getValidatedNetwork(vspId, version, networkId); Network network = networkEntity.getNetworkCompositionData(); @@ -126,9 +106,6 @@ public class NetworkManagerImpl implements NetworkManager { response.setId(networkId); response.setData(network); response.setSchema(getCompositionSchema(schemaInput)); - - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID_NETWORK_ID, vspId, networkId); - return response; } @@ -142,8 +119,6 @@ public class NetworkManagerImpl implements NetworkManager { @Override public void deleteNetwork(String vspId, Version version, String networkId) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(VSP_ID_NETWORK_ID, vspId, networkId); - if (!VSPInfoDao.isManual(vspId, version)) { MdcDataErrorMessage.createErrorMessageAndUpdateMdc(LoggerConstants.TARGET_ENTITY_DB, LoggerTragetServiceName.DELETE_NETWORK, ErrorLevel.ERROR.name(), @@ -151,8 +126,6 @@ public class NetworkManagerImpl implements NetworkManager { throw new CoreException( new CompositionEditNotAllowedErrorBuilder(vspId, version).build()); } - - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID_NETWORK_ID, vspId, networkId); } diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/OrchestrationTemplateCandidateManagerImpl.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/OrchestrationTemplateCandidateManagerImpl.java index d9af918a28..77eeb394c7 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/OrchestrationTemplateCandidateManagerImpl.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/OrchestrationTemplateCandidateManagerImpl.java @@ -30,7 +30,6 @@ import org.openecomp.sdc.datatypes.error.ErrorMessage; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; import org.openecomp.sdc.logging.api.annotations.Metrics; -import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage; import org.openecomp.sdc.logging.types.LoggerTragetServiceName; import org.openecomp.sdc.vendorsoftwareproduct.OrchestrationTemplateCandidateManager; import org.openecomp.sdc.vendorsoftwareproduct.dao.VendorSoftwareProductInfoDao; @@ -60,8 +59,6 @@ public class OrchestrationTemplateCandidateManagerImpl implements OrchestrationTemplateCandidateManager { private static final Logger LOGGER = LoggerFactory.getLogger(OrchestrationTemplateCandidateManagerImpl.class); - private static final MdcDataDebugMessage MDC_DATA_DEBUG_MESSAGE = new MdcDataDebugMessage(); - private final VendorSoftwareProductInfoDao vspInfoDao; private final CandidateService candidateService; private static final String VSP_ID = "VSP id"; @@ -77,8 +74,6 @@ public class OrchestrationTemplateCandidateManagerImpl @Metrics public UploadFileResponse upload(String vspId, Version version, InputStream fileToUpload, String fileSuffix, String networkPackageName) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(VSP_ID, vspId); - OrchestrationTemplateFileHandler orchestrationTemplateFileHandler = OrchestrationUploadFactory.createOrchestrationTemplateFileHandler(fileSuffix); @@ -93,8 +88,6 @@ public class OrchestrationTemplateCandidateManagerImpl @Override public OrchestrationTemplateActionResponse process(String vspId, Version version) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(VSP_ID, vspId); - OrchestrationTemplateCandidateData candidate = fetchCandidateDataEntity(vspId, version) .orElseThrow( () -> new CoreException(new OrchestrationTemplateNotFoundErrorBuilder(vspId).build())); @@ -106,14 +99,11 @@ public class OrchestrationTemplateCandidateManagerImpl @Override public Optional<FilesDataStructure> getFilesDataStructure(String vspId, Version version) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(VSP_ID, vspId); - Optional<FilesDataStructure> candidateFileDataStructure = candidateService.getOrchestrationTemplateCandidateFileDataStructure(vspId, version); if (candidateFileDataStructure.isPresent()) { return candidateFileDataStructure; } else { - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID, vspId); return Optional.empty(); } } @@ -121,8 +111,6 @@ public class OrchestrationTemplateCandidateManagerImpl @Override public ValidationResponse updateFilesDataStructure(String vspId, Version version, FilesDataStructure fileDataStructure) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(VSP_ID, vspId); - ValidationResponse response = new ValidationResponse(); Optional<List<ErrorMessage>> validateErrors = candidateService.validateFileDataStructure(fileDataStructure); @@ -133,23 +121,17 @@ public class OrchestrationTemplateCandidateManagerImpl errorsMap.put(SdcCommon.UPLOAD_FILE, errorMessages); response.setUploadDataErrors(errorsMap, LoggerTragetServiceName.VALIDATE_FILE_DATA_STRUCTURE); - - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID, vspId); return response; } } candidateService .updateOrchestrationTemplateCandidateFileDataStructure(vspId, version, fileDataStructure); - - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID, vspId); return response; } @Override public Optional<Pair<String, byte[]>> get(String vspId, Version version) throws IOException { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(VSP_ID, vspId); - VspDetails vspDetails = getVspDetails(vspId, version); Optional<OrchestrationTemplateCandidateData> candidateDataEntity = @@ -160,8 +142,6 @@ public class OrchestrationTemplateCandidateManagerImpl getErrorWithParameters(Messages.NO_FILE_WAS_UPLOADED_OR_FILE_NOT_EXIST.getErrorMessage (), "")); LOGGER.error(errorMessage.getMessage()); - - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID, vspId); return Optional.empty(); } OnboardingTypesEnum type = @@ -171,8 +151,6 @@ public class OrchestrationTemplateCandidateManagerImpl FilesDataStructure structure = JsonUtil .json2Object(candidateDataEntity.get().getFilesDataStructure(), FilesDataStructure.class); String manifest = candidateService.createManifest(vspDetails, structure); - - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID, vspId); return Optional.of( new ImmutablePair<>(OnboardingTypesEnum.ZIP.toString(), candidateService .replaceManifestInZip(candidateDataEntity.get().getContentData(), diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ProcessManagerImpl.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ProcessManagerImpl.java index 49c30af2dd..3ec8c7ae2f 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ProcessManagerImpl.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/ProcessManagerImpl.java @@ -22,7 +22,6 @@ import org.openecomp.sdc.common.errors.CoreException; import org.openecomp.sdc.common.errors.ErrorCategory; import org.openecomp.sdc.common.errors.ErrorCode; import org.openecomp.sdc.datatypes.error.ErrorLevel; -import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage; import org.openecomp.sdc.logging.context.impl.MdcDataErrorMessage; import org.openecomp.sdc.logging.types.LoggerConstants; import org.openecomp.sdc.logging.types.LoggerErrorCode; @@ -47,9 +46,6 @@ import java.util.Collection; public class ProcessManagerImpl implements ProcessManager { private static final String PROCESS_ARTIFACT_NOT_EXIST_MSG = "Process artifact for process with Id %s does not exist for %s with Id %s and version %s"; - - private static final MdcDataDebugMessage MDC_DATA_DEBUG_MESSAGE = new MdcDataDebugMessage(); - private final ProcessDao processDao; private static final String VSP_ID_COMPONENT_ID = "VSP id, component id"; @@ -60,16 +56,11 @@ public class ProcessManagerImpl implements ProcessManager { @Override public Collection<ProcessEntity> listProcesses(String vspId, Version version, String componentId) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(VSP_ID_COMPONENT_ID, vspId, componentId); - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID_COMPONENT_ID, vspId, componentId); - return processDao.list(new ProcessEntity(vspId, version, componentId, null)); } @Override public void deleteProcesses(String vspId, Version version, String componentId) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(VSP_ID_COMPONENT_ID, vspId, componentId); - ProcessEntity allProcesses = new ProcessEntity(vspId, version, componentId, null); Collection<ProcessEntity> processes = processDao.list(allProcesses); @@ -85,46 +76,30 @@ public class ProcessManagerImpl implements ProcessManager { } else { processDao.deleteAll(allProcesses); } - - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID_COMPONENT_ID, vspId, componentId); } @Override public ProcessEntity createProcess(ProcessEntity process) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(VSP_ID_COMPONENT_ID, process.getId(), - process.getComponentId()); validateUniqueName(process.getVspId(), process.getVersion(), process.getComponentId(), process.getName()); processDao.create(process); createUniqueName(process.getVspId(), process.getVersion(), process.getComponentId(), process.getName()); - - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID_COMPONENT_ID, process.getId(), - process.getComponentId()); - return process; } @Override public ProcessEntity getProcess(String vspId, Version version, String componentId, String processId) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(VSP_ID_COMPONENT_ID, vspId, componentId); - ProcessEntity retrieved = processDao.get(new ProcessEntity(vspId, version, componentId, processId)); validateProcessExistence(vspId, version, componentId, processId, retrieved); - - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID_COMPONENT_ID, vspId, componentId); - return retrieved; } @Override public void updateProcess(ProcessEntity process) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(VSP_ID_COMPONENT_ID, process.getId(), - process.getComponentId()); - ProcessEntity retrieved = processDao.get(process); validateProcessExistence(process.getVspId(), process.getVersion(), process.getComponentId(), process.getId(), retrieved); @@ -132,30 +107,21 @@ public class ProcessManagerImpl implements ProcessManager { updateUniqueName(process.getVspId(), process.getVersion(), process.getComponentId(), retrieved.getName(), process.getName()); processDao.update(process); - - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID_COMPONENT_ID, process.getId(), - process.getComponentId()); } @Override public void deleteProcess(String vspId, Version version, String componentId, String processId) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(VSP_ID_COMPONENT_ID, vspId, componentId); - ProcessEntity retrieved = getProcess(vspId, version, componentId, processId); processDao.delete(retrieved); deleteUniqueValue(retrieved.getVspId(), retrieved.getVersion(), retrieved.getComponentId(), retrieved.getName()); - - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID_COMPONENT_ID, vspId, componentId); } @Override public File getProcessArtifact(String vspId, Version version, String componentId, String processId) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(VSP_ID_COMPONENT_ID, vspId, componentId); - ProcessEntity retrieved = getValidatedProcessArtifact(vspId, version, componentId, processId); File file = new File(String.format("%s_%s_%s", vspId, componentId, processId)); @@ -167,35 +133,24 @@ public class ProcessManagerImpl implements ProcessManager { LoggerErrorCode.DATA_ERROR.getErrorCode(), "Can't get process artifact"); throw new CoreException(new UploadInvalidErrorBuilder().build(), exception); } - - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID_COMPONENT_ID, vspId, componentId); - return file; } @Override public void deleteProcessArtifact(String vspId, Version version, String componentId, String processId) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(VSP_ID_COMPONENT_ID, vspId, componentId); - ProcessEntity retrieved = getValidatedProcessArtifact(vspId, version, componentId, processId); processDao.deleteArtifact(retrieved); - - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID_COMPONENT_ID, vspId, componentId); } @Override public void uploadProcessArtifact(InputStream artifactFile, String artifactFileName, String vspId, Version version, String componentId, String processId) { - MDC_DATA_DEBUG_MESSAGE.debugEntryMessage(VSP_ID_COMPONENT_ID, vspId, componentId); - ProcessEntity process = getProcess(vspId, version, componentId, processId); process.setArtifactName(artifactFileName); process.setArtifact(readArtifact(artifactFile)); processDao.uploadArtifact(process); - - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID_COMPONENT_ID, vspId, componentId); } private ProcessEntity getValidatedProcessArtifact(String vspId, Version version, diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/BaseOrchestrationTemplateHandler.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/BaseOrchestrationTemplateHandler.java index f25f6d780b..cedac82d1c 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/BaseOrchestrationTemplateHandler.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/BaseOrchestrationTemplateHandler.java @@ -10,7 +10,6 @@ import org.openecomp.sdc.datatypes.error.ErrorLevel; import org.openecomp.sdc.datatypes.error.ErrorMessage; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; -import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage; import org.openecomp.sdc.vendorsoftwareproduct.dao.type.VspDetails; import org.openecomp.sdc.vendorsoftwareproduct.services.filedatastructuremodule.CandidateService; import org.openecomp.sdc.vendorsoftwareproduct.types.UploadFileResponse; @@ -23,8 +22,6 @@ import static org.openecomp.core.validation.errors.ErrorMessagesFormatBuilder.ge public abstract class BaseOrchestrationTemplateHandler implements OrchestrationTemplateFileHandler { protected static final Logger logger = LoggerFactory.getLogger(BaseOrchestrationTemplateHandler.class); - protected static MdcDataDebugMessage mdcDataDebugMessage = new MdcDataDebugMessage(); - @Override public UploadFileResponse upload(VspDetails vspDetails, InputStream fileToUpload, String fileSuffix, String networkPackageName, @@ -48,21 +45,16 @@ public abstract class BaseOrchestrationTemplateHandler implements OrchestrationT uploadFileResponse.addStructureError(SdcCommon.UPLOAD_FILE, new ErrorMessage(ErrorLevel.ERROR, getErrorWithParameters(Messages.FILE_CONTENT_MAP.getErrorMessage(), getHandlerType().toString()))); - - mdcDataDebugMessage.debugExitMessage("VSP id", vspDetails.getId()); return uploadFileResponse; } if (!MapUtils.isEmpty(uploadFileResponse.getErrors())) { - mdcDataDebugMessage.debugExitMessage("VSP id", vspDetails.getId()); return uploadFileResponse; } if (updateCandidateData(vspDetails, uploadedFileData, optionalContentMap.get(), fileSuffix, networkPackageName, candidateService, uploadFileResponse)) { return uploadFileResponse; } - - mdcDataDebugMessage.debugExitMessage("VSP id", vspDetails.getId()); return uploadFileResponse; } diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/OrchestrationTemplateCSARHandler.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/OrchestrationTemplateCSARHandler.java index bc999de4fe..1e9020dfa1 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/OrchestrationTemplateCSARHandler.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/OrchestrationTemplateCSARHandler.java @@ -146,8 +146,6 @@ public class OrchestrationTemplateCSARHandler extends BaseOrchestrationTemplateH getHandlerType().toString()), exception); uploadFileResponse.addStructureError(SdcCommon.UPLOAD_FILE, new ErrorMessage(ErrorLevel.ERROR, exception.getMessage())); - - mdcDataDebugMessage.debugExitMessage("VSP id", vspDetails.getId()); return true; } return false; diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/OrchestrationTemplateZipHandler.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/OrchestrationTemplateZipHandler.java index 343c7460d9..6fcd7f4a6b 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/OrchestrationTemplateZipHandler.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/OrchestrationTemplateZipHandler.java @@ -47,8 +47,6 @@ public class OrchestrationTemplateZipHandler extends BaseOrchestrationTemplateHa getHandlerType().toString()), exception); uploadFileResponse.addStructureError(SdcCommon.UPLOAD_FILE, new ErrorMessage(ErrorLevel.ERROR, exception.getMessage())); - - mdcDataDebugMessage.debugExitMessage("VSP id", vspDetails.getId()); return true; } return false; diff --git a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/process/OrchestrationTemplateProcessZipHandler.java b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/process/OrchestrationTemplateProcessZipHandler.java index 41ca8ace9a..9f29d9316b 100644 --- a/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/process/OrchestrationTemplateProcessZipHandler.java +++ b/openecomp-be/backend/openecomp-sdc-vendor-software-product-manager/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/impl/orchestration/process/OrchestrationTemplateProcessZipHandler.java @@ -30,7 +30,6 @@ import org.openecomp.sdc.datatypes.error.ErrorMessage; import org.openecomp.sdc.heat.datatypes.structure.HeatStructureTree; import org.openecomp.sdc.logging.api.Logger; import org.openecomp.sdc.logging.api.LoggerFactory; -import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage; import org.openecomp.sdc.logging.messages.AuditMessages; import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel; import org.openecomp.sdc.translator.services.heattotosca.HeatToToscaUtil; @@ -60,7 +59,6 @@ import static org.openecomp.sdc.logging.messages.AuditMessages.HEAT_VALIDATION_E public class OrchestrationTemplateProcessZipHandler implements OrchestrationTemplateProcessHandler { private static final Logger LOGGER = LoggerFactory.getLogger(OrchestrationTemplateProcessZipHandler.class); - private static final MdcDataDebugMessage MDC_DATA_DEBUG_MESSAGE = new MdcDataDebugMessage(); private final CandidateService candidateService = CandidateServiceFactory.getInstance().createInterface(); private static final String VSP_ID = "VSP id"; @@ -78,7 +76,6 @@ public class OrchestrationTemplateProcessZipHandler implements OrchestrationTemp candidateData.getContentData().array()); if (!fileContent.isPresent()) { response.addStructureErrors(uploadFileResponse.getErrors()); - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID, vspId); response.getErrors().values().forEach(errorList -> printAuditForErrors(errorList, vspId, HEAT_VALIDATION_ERROR)); return response; @@ -92,8 +89,6 @@ public class OrchestrationTemplateProcessZipHandler implements OrchestrationTemp if (CollectionUtils.isNotEmpty(structure.getUnassigned())) { response.addErrorMessageToMap(SdcCommon.UPLOAD_FILE, Messages.FOUND_UNASSIGNED_FILES.getErrorMessage(), ErrorLevel.ERROR); - - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID, vspId); response.getErrors().values().forEach(errorList -> printAuditForErrors(errorList, vspId, HEAT_VALIDATION_ERROR)); return response; @@ -157,8 +152,6 @@ public class OrchestrationTemplateProcessZipHandler implements OrchestrationTemp LOGGER.audit(AuditMessages.AUDIT_MSG + AuditMessages.HEAT_TRANSLATION_COMPLETED + vspId); uploadFileResponse.addStructureErrors(uploadErrors); - - MDC_DATA_DEBUG_MESSAGE.debugExitMessage(VSP_ID, vspId); return response; } |