summaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib/openecomp-sdc-enrichment-lib
diff options
context:
space:
mode:
authorvempo <vitaliy.emporopulo@amdocs.com>2018-01-04 18:46:54 +0200
committerVitaly Emporopulo <Vitaliy.Emporopulo@amdocs.com>2018-01-04 18:15:44 +0000
commitde50de7a41451d7b2ef4c5dae8c8c7d511e1a097 (patch)
tree265faa60915764424da1b0e003e48b7ae1da2a18 /openecomp-be/lib/openecomp-sdc-enrichment-lib
parentf6eaa46641b4ddab5797eb0920771f81779cd5c3 (diff)
Remove enter/exit debug #10
Change-Id: I5d3e97ba5fe050e5420e02c92cddca6742e55c5e Issue-ID: SDC-875 Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com>
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-enrichment-lib')
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ExternalArtifactEnricher.java8
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/MonitoringMibEnricher.java37
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ProcessArtifactEnricher.java19
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/VspInformationArtifactEnricher.java10
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/AbstractSubstituteToscaEnricher.java7
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/PortMirroringEnricher.java4
-rw-r--r--openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/ToscaEnricher.java10
7 files changed, 0 insertions, 95 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ExternalArtifactEnricher.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ExternalArtifactEnricher.java
index e55ad880e9..161f437f1e 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ExternalArtifactEnricher.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ExternalArtifactEnricher.java
@@ -27,7 +27,6 @@ import org.openecomp.sdc.enrichment.inter.Enricher;
import org.openecomp.sdc.enrichment.inter.ExternalArtifactEnricherInterface;
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.tosca.datatypes.ToscaServiceModel;
import java.lang.reflect.Constructor;
@@ -37,7 +36,6 @@ import java.util.List;
import java.util.Map;
public class ExternalArtifactEnricher extends Enricher {
- private MdcDataDebugMessage mdcDataDebugMessage = new MdcDataDebugMessage();
private static String EXTERNAL_ARTIFACT_ENRICH_CONF_FILE = "ExternalArtifactConfiguration.json";
private static Collection<String> implementingClasses =
getExternalArtifactEnrichedImplClassesList();
@@ -53,10 +51,6 @@ public class ExternalArtifactEnricher extends Enricher {
@Override
public Map<String, List<ErrorMessage>> enrich() {
-
-
- mdcDataDebugMessage.debugEntryMessage(null);
-
Map<String, List<ErrorMessage>> errors = new HashMap<>();
try {
@@ -68,8 +62,6 @@ public class ExternalArtifactEnricher extends Enricher {
logger.debug("",e);
logger.error(e.getMessage());
}
-
- mdcDataDebugMessage.debugExitMessage(null);
return errors;
}
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/MonitoringMibEnricher.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/MonitoringMibEnricher.java
index f15d83cd55..c8d13f868d 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/MonitoringMibEnricher.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/MonitoringMibEnricher.java
@@ -36,7 +36,6 @@ import org.openecomp.sdc.enrichment.EnrichmentInfo;
import org.openecomp.sdc.enrichment.inter.ExternalArtifactEnricherInterface;
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.tosca.datatypes.ToscaServiceModel;
import org.openecomp.sdc.tosca.datatypes.model.Directive;
import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate;
@@ -70,7 +69,6 @@ public class MonitoringMibEnricher implements ExternalArtifactEnricherInterface
private EnrichedServiceModelDao enrichedServiceModelDao;
private ComponentDao componentDao;
private ComponentArtifactDao componentArtifactDao;
- private static MdcDataDebugMessage mdcDataDebugMessage = new MdcDataDebugMessage();
private static final String COMPONENT_PREFIX = "org.openecomp.resource.vfc.";
private final Logger LOG = LoggerFactory.getLogger(this.getClass().getName());
@@ -178,10 +176,6 @@ public class MonitoringMibEnricher implements ExternalArtifactEnricherInterface
Version version,
ComponentEntity componentEntry,
Set<String> abstractNodeTypes) {
-
-
- mdcDataDebugMessage.debugEntryMessage(null);
-
Map<String, List<ErrorMessage>> errors = new HashMap<>();
List<ComponentMonitoringUploadInfo> componentMonitoringUploadInfoList =
@@ -189,18 +183,12 @@ public class MonitoringMibEnricher implements ExternalArtifactEnricherInterface
componentMonitoringUploadInfoList.forEach(
componentUploadInfo -> enrichComponentMib(vspId, version, componentUploadInfo, errors));
-
- mdcDataDebugMessage.debugExitMessage(null);
return errors;
}
private List<ComponentMonitoringUploadInfo> extractComponentMibInfo(String vspId, Version version,
ComponentEntity componentEntity,
Set<String> abstractNodeTypes) {
-
-
- mdcDataDebugMessage.debugEntryMessage(null);
-
String componentId = componentEntity.getId();
ComponentMonitoringUploadEntity entity = new ComponentMonitoringUploadEntity();
@@ -211,17 +199,11 @@ public class MonitoringMibEnricher implements ExternalArtifactEnricherInterface
abstractNodeTypes.forEach(unifiedComponentNodeType -> componentMonitoringUploadInfoList
.add(updComponentMibInfoByType(unifiedComponentNodeType, entity)));
-
- mdcDataDebugMessage.debugExitMessage(null);
return componentMonitoringUploadInfoList;
}
private ComponentMonitoringUploadInfo updComponentMibInfoByType(String componentName,
ComponentMonitoringUploadEntity componentMonitoringUploadEntity) {
-
-
- mdcDataDebugMessage.debugEntryMessage(null);
-
ComponentMonitoringUploadInfo componentMonitoringUploadInfo =
new ComponentMonitoringUploadInfo();
@@ -238,8 +220,6 @@ public class MonitoringMibEnricher implements ExternalArtifactEnricherInterface
mibArtifact,
componentMonitoringUploadInfo);
}
-
- mdcDataDebugMessage.debugExitMessage(null);
return componentMonitoringUploadInfo;
}
@@ -262,24 +242,15 @@ public class MonitoringMibEnricher implements ExternalArtifactEnricherInterface
Version version,
ComponentMonitoringUploadInfo componentUploadInfo,
Map<String, List<ErrorMessage>> errors) {
- mdcDataDebugMessage.debugEntryMessage(null);
-
ServiceArtifact mibServiceArtifact = new ServiceArtifact();
mibServiceArtifact.setVspId(vspId);
mibServiceArtifact.setVersion(version);
enrichMibFiles(mibServiceArtifact, componentUploadInfo, errors);
-
-
- mdcDataDebugMessage.debugExitMessage(null);
}
private void enrichMibFiles(ServiceArtifact monitoringArtifact,
ComponentMonitoringUploadInfo componentMonitoringUploadInfo,
Map<String, List<ErrorMessage>> errors) {
-
-
- mdcDataDebugMessage.debugEntryMessage(null);
-
if (componentMonitoringUploadInfo == null) {
return;
}
@@ -292,18 +263,12 @@ public class MonitoringMibEnricher implements ExternalArtifactEnricherInterface
enrichMibByType(componentMonitoringUploadInfo.getVesEvent(), MonitoringUploadType.VES_EVENTS,
monitoringArtifact,
errors);
-
- mdcDataDebugMessage.debugExitMessage(null);
}
private void enrichMibByType(MonitoringArtifactInfo monitoringArtifactInfo,
MonitoringUploadType type,
ServiceArtifact mibServiceArtifact,
Map<String, List<ErrorMessage>> errors) {
-
-
- mdcDataDebugMessage.debugEntryMessage(null);
-
if (monitoringArtifactInfo == null) {
return;
}
@@ -324,8 +289,6 @@ public class MonitoringMibEnricher implements ExternalArtifactEnricherInterface
mibServiceArtifact.setName(monitoringArtifactInfo.getName() + File.separator + fileName);
getEnrichedServiceModelDao().storeExternalArtifact(mibServiceArtifact);
}
-
- mdcDataDebugMessage.debugExitMessage(null);
}
private EnrichedServiceModelDao getEnrichedServiceModelDao() {
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ProcessArtifactEnricher.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ProcessArtifactEnricher.java
index 089cfe7a82..e2ae60d87e 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ProcessArtifactEnricher.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/ProcessArtifactEnricher.java
@@ -9,7 +9,6 @@ import org.openecomp.core.utilities.file.FileUtils;
import org.openecomp.sdc.datatypes.error.ErrorMessage;
import org.openecomp.sdc.enrichment.EnrichmentInfo;
import org.openecomp.sdc.enrichment.inter.ExternalArtifactEnricherInterface;
-import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage;
import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
import org.openecomp.sdc.vendorsoftwareproduct.dao.ComponentDao;
import org.openecomp.sdc.vendorsoftwareproduct.dao.ComponentDaoFactory;
@@ -31,7 +30,6 @@ public class ProcessArtifactEnricher implements ExternalArtifactEnricherInterfac
private ComponentDao componentDao;
private ProcessDao processDao;
- private static MdcDataDebugMessage mdcDataDebugMessage = new MdcDataDebugMessage();
private EnrichedServiceModelDao enrichedServiceModelDao;
@Override
@@ -51,24 +49,14 @@ public class ProcessArtifactEnricher implements ExternalArtifactEnricherInterfac
Map<String, List<ErrorMessage>> enrichComponent(ComponentEntity componentEntry, String vspId,
Version version) {
- mdcDataDebugMessage.debugEntryMessage("LifeCycleOperationArtifactEnricher vspId ",
- vspId);
-
Map<String, List<ErrorMessage>> errors = new HashMap<>();
enrichComponentProcessArtifact(componentEntry, vspId, version, errors);
-
- mdcDataDebugMessage.debugExitMessage("LifeCycleOperationArtifactEnricher vspId ",
- vspId);
return errors;
}
void enrichComponentProcessArtifact(ComponentEntity componentEntity,
String vspId, Version version,
Map<String, List<ErrorMessage>> errors) {
-
-
- mdcDataDebugMessage.debugEntryMessage(null, null);
-
String componentId = componentEntity.getId();
ProcessEntity processEntity = new ProcessEntity(vspId, version, componentId, null);
final Collection<ProcessEntity> processes = getProcessDao().list(processEntity);
@@ -96,20 +84,13 @@ public class ProcessArtifactEnricher implements ExternalArtifactEnricherInterfac
enrichServiceArtifact(componentProcessInfo, processServiceArtifact);
}
});
-
- mdcDataDebugMessage.debugExitMessage(null);
}
void enrichServiceArtifact(ComponentProcessInfo componentProcessInfo,
ServiceArtifact processServiceArtifact) {
-
-
- mdcDataDebugMessage.debugEntryMessage(null);
-
processServiceArtifact.setName(componentProcessInfo.getName());
processServiceArtifact.setContentData(FileUtils.toByteArray(componentProcessInfo.getContent()));
getEnrichedServiceModelDao().storeExternalArtifact(processServiceArtifact);
- mdcDataDebugMessage.debugExitMessage(null);
}
private ComponentDao getComponentDao() {
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/VspInformationArtifactEnricher.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/VspInformationArtifactEnricher.java
index 3836796420..a3f0c4a931 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/VspInformationArtifactEnricher.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/external/artifact/VspInformationArtifactEnricher.java
@@ -30,7 +30,6 @@ import org.openecomp.sdc.datatypes.error.ErrorLevel;
import org.openecomp.sdc.datatypes.error.ErrorMessage;
import org.openecomp.sdc.enrichment.EnrichmentInfo;
import org.openecomp.sdc.enrichment.inter.ExternalArtifactEnricherInterface;
-import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage;
import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
import org.openecomp.sdc.vendorsoftwareproduct.VendorSoftwareProductConstants;
import org.openecomp.sdc.vendorsoftwareproduct.dao.VendorSoftwareProductInfoDao;
@@ -53,7 +52,6 @@ import java.util.Objects;
* Created by Talio on 11/24/2016
*/
public class VspInformationArtifactEnricher implements ExternalArtifactEnricherInterface {
- private static MdcDataDebugMessage mdcDataDebugMessage = new MdcDataDebugMessage();
private static InformationArtifactGenerator informationArtifactGenerator =
InformationArtifactGeneratorFactory.getInstance().createInterface();
private EnrichedServiceModelDao enrichedServiceModelDao =
@@ -75,10 +73,6 @@ public class VspInformationArtifactEnricher implements ExternalArtifactEnricherI
private Map<String, List<ErrorMessage>> enrichInformationArtifact(String vspId, Version version)
throws IOException {
-
-
- mdcDataDebugMessage.debugEntryMessage(null);
-
Map<String, List<ErrorMessage>> errors = new HashMap<>();
ByteBuffer infoArtifactByteBuffer = ByteBuffer.wrap(informationArtifactGenerator.generate(
vspId, version).getBytes());
@@ -88,14 +82,10 @@ public class VspInformationArtifactEnricher implements ExternalArtifactEnricherI
errorList.add(new ErrorMessage(ErrorLevel.ERROR, String.format(
"Cannot enrich information artifact for vendor software product with id %s and version %s",
vspId, version.toString())));
-
- mdcDataDebugMessage.debugExitMessage(null);
return errors;
}
enrichInformationArtifact(vspId, version, infoArtifactByteBuffer);
-
- mdcDataDebugMessage.debugExitMessage(null);
return errors;
}
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/AbstractSubstituteToscaEnricher.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/AbstractSubstituteToscaEnricher.java
index a7762e86ca..fbd0d225a5 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/AbstractSubstituteToscaEnricher.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/AbstractSubstituteToscaEnricher.java
@@ -2,7 +2,6 @@ package org.openecomp.sdc.enrichment.impl.tosca;
import org.apache.commons.lang3.StringUtils;
import org.openecomp.sdc.datatypes.error.ErrorMessage;
-import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage;
import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate;
import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment;
@@ -33,15 +32,11 @@ import static org.openecomp.sdc.translator.services.heattotosca.Constants.ABSTRA
public class AbstractSubstituteToscaEnricher {
private ToscaAnalyzerService toscaAnalyzerService ;
- private static MdcDataDebugMessage mdcDataDebugMessage = new MdcDataDebugMessage();
private ComponentQuestionnaireData componentQuestionnaireData;
public Map<String,List<ErrorMessage>> enrich(ToscaServiceModel toscaModel, String vspId, Version
version) {
-
- mdcDataDebugMessage.debugEntryMessage(vspId, version.toString());
-
componentQuestionnaireData = getComponentQuestionnaireData();
toscaAnalyzerService = new ToscaAnalyzerServiceImpl();
@@ -131,8 +126,6 @@ public class AbstractSubstituteToscaEnricher {
componentDisplayNameToNodeTempalteIds);
}
});
-
- mdcDataDebugMessage.debugExitMessage(vspId, version.toString());
return errors;
}
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/PortMirroringEnricher.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/PortMirroringEnricher.java
index f731e37b6f..4ad81210df 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/PortMirroringEnricher.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/PortMirroringEnricher.java
@@ -21,7 +21,6 @@ import org.apache.commons.collections4.MapUtils;
import org.openecomp.core.utilities.orchestration.OnboardingTypesEnum;
import org.openecomp.sdc.datatypes.error.ErrorMessage;
import org.openecomp.sdc.enrichment.impl.tosca.model.PortMirroringConnectionPointDescription;
-import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage;
import org.openecomp.sdc.tosca.datatypes.ToscaElementTypes;
import org.openecomp.sdc.tosca.datatypes.ToscaNodeType;
import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
@@ -64,7 +63,6 @@ public class PortMirroringEnricher {
//Map of substitution service template name and the list of ports with link requirement from
// the abstract
private Map<String, List<String>> portNodeTemplateIdsFromAbstract = new HashMap<>();
- private static MdcDataDebugMessage mdcDataDebugMessage = new MdcDataDebugMessage();
private Map<String, ServiceTemplate> globalTypesServiceTemplate =
GlobalTypesGenerator.getGlobalTypesServiceTemplate(OnboardingTypesEnum.ZIP);
@@ -75,7 +73,6 @@ public class PortMirroringEnricher {
* @return the map Error descriptor map
*/
public Map<String, List<ErrorMessage>> enrich(ToscaServiceModel toscaServiceModel) {
- mdcDataDebugMessage.debugEntryMessage(null);
Map<String, List<ErrorMessage>> errors = new HashMap<>();
Map<String, ServiceTemplate> serviceTemplates = toscaServiceModel.getServiceTemplates();
serviceTemplates.entrySet().stream()
@@ -89,7 +86,6 @@ public class PortMirroringEnricher {
filterExternalPorts(toscaServiceModel);
//Handle external port changes
handleExternalPorts(toscaServiceModel);
- mdcDataDebugMessage.debugExitMessage(null);
return errors;
}
diff --git a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/ToscaEnricher.java b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/ToscaEnricher.java
index 5ea1176e48..26c1be9938 100644
--- a/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/ToscaEnricher.java
+++ b/openecomp-be/lib/openecomp-sdc-enrichment-lib/openecomp-sdc-enrichment-impl/src/main/java/org/openecomp/sdc/enrichment/impl/tosca/ToscaEnricher.java
@@ -23,7 +23,6 @@ package org.openecomp.sdc.enrichment.impl.tosca;
import org.openecomp.sdc.datatypes.error.ErrorLevel;
import org.openecomp.sdc.datatypes.error.ErrorMessage;
import org.openecomp.sdc.enrichment.inter.Enricher;
-import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage;
import org.openecomp.sdc.tosca.datatypes.ToscaServiceModel;
import java.util.Arrays;
@@ -32,9 +31,6 @@ import java.util.List;
import java.util.Map;
public class ToscaEnricher extends Enricher {
-
- private static MdcDataDebugMessage mdcDataDebugMessage = new MdcDataDebugMessage();
-
@Override
public Map<String, List<ErrorMessage>> enrich() {
Map<String, List<ErrorMessage>> errors = new HashMap<>();
@@ -45,8 +41,6 @@ public class ToscaEnricher extends Enricher {
}
private Map<String, List<ErrorMessage>> enrichAbstractSubstitute() {
- mdcDataDebugMessage.debugEntryMessage(null, null);
-
Map<String, List<ErrorMessage>> enrichErrors = new HashMap<>();
ToscaServiceModel toscaModel = (ToscaServiceModel) model;
@@ -60,13 +54,10 @@ public class ToscaEnricher extends Enricher {
enrichErrors.put("Tosca Enrich", Arrays.asList(new ErrorMessage(ErrorLevel.ERROR, e
.getMessage())));
}
-
- mdcDataDebugMessage.debugExitMessage(null, null);
return enrichErrors;
}
private Map<String, List<ErrorMessage>> enrichPortMirroring() {
- mdcDataDebugMessage.debugEntryMessage(null, null);
Map<String, List<ErrorMessage>> enrichErrors = new HashMap<>();
ToscaServiceModel toscaModel = (ToscaServiceModel) model;
PortMirroringEnricher portMirroringEnricher = new PortMirroringEnricher();
@@ -77,7 +68,6 @@ public class ToscaEnricher extends Enricher {
enrichErrors.put("Tosca Enrich", Arrays.asList(new ErrorMessage(ErrorLevel.ERROR, e
.getMessage())));
}
- mdcDataDebugMessage.debugExitMessage(null, null);
return enrichErrors;
}
}