X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=openecomp-be%2Flib%2Fopenecomp-sdc-translator-lib%2Fopenecomp-sdc-translator-core%2Fsrc%2Fmain%2Fjava%2Forg%2Fopenecomp%2Fsdc%2Ftranslator%2Fservices%2Fheattotosca%2Fimpl%2Fresourcetranslation%2FBaseResourceConnection.java;h=065092b00f6042a07552d4e9a28cc8ec8329d05e;hb=42c920baf4dbb9fe8775843a6d4c9f70fa29f064;hp=b0094b0a7c1f2efc717fd4b62aaa993619cebf90;hpb=b8e2faf476202b6ffe61bc3a9a37df1304881d40;p=sdc.git

diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceConnection.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceConnection.java
index b0094b0a7c..065092b00f 100644
--- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceConnection.java
+++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/main/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceConnection.java
@@ -21,29 +21,22 @@
 package org.openecomp.sdc.translator.services.heattotosca.impl.resourcetranslation;
 
 import org.apache.commons.collections4.MapUtils;
-import org.openecomp.sdc.tosca.services.YamlUtil;
 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.heat.datatypes.manifest.FileData;
 import org.openecomp.sdc.heat.datatypes.model.HeatOrchestrationTemplate;
 import org.openecomp.sdc.heat.datatypes.model.Resource;
 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;
-import org.openecomp.sdc.logging.types.LoggerErrorDescription;
-import org.openecomp.sdc.logging.types.LoggerTragetServiceName;
-import org.openecomp.sdc.tosca.datatypes.model.NodeTemplate;
-import org.openecomp.sdc.tosca.datatypes.model.NodeType;
-import org.openecomp.sdc.tosca.datatypes.model.RequirementAssignment;
-import org.openecomp.sdc.tosca.datatypes.model.RequirementDefinition;
-import org.openecomp.sdc.tosca.datatypes.model.ServiceTemplate;
+import org.onap.sdc.tosca.datatypes.model.NodeTemplate;
+import org.onap.sdc.tosca.datatypes.model.NodeType;
+import org.onap.sdc.tosca.datatypes.model.RequirementAssignment;
+import org.onap.sdc.tosca.datatypes.model.RequirementDefinition;
+import org.onap.sdc.tosca.datatypes.model.ServiceTemplate;
 import org.openecomp.sdc.tosca.services.DataModelUtil;
 import org.openecomp.sdc.tosca.services.ToscaAnalyzerService;
+import org.onap.sdc.tosca.services.YamlUtil;
 import org.openecomp.sdc.tosca.services.impl.ToscaAnalyzerServiceImpl;
 import org.openecomp.sdc.translator.datatypes.heattotosca.AttachedResourceId;
 import org.openecomp.sdc.translator.datatypes.heattotosca.to.TranslateTo;
@@ -59,8 +52,7 @@ import java.util.Optional;
 import java.util.function.Predicate;
 
 abstract class BaseResourceConnection<T> {
-  protected static Logger logger = (Logger) LoggerFactory.getLogger(BaseResourceConnection.class);
-  protected static MdcDataDebugMessage mdcDataDebugMessage = new MdcDataDebugMessage();
+  protected static Logger logger = LoggerFactory.getLogger(BaseResourceConnection.class);
   protected TranslateTo translateTo;
   FileData nestedFileData;
   NodeTemplate substitutionNodeTemplate;
@@ -132,10 +124,6 @@ abstract class BaseResourceConnection<T> {
                                                       nestedHeatOrchestrationTemplate,
                                                   String nestedHeatFileName,
                                                   Map.Entry<String, T> connectionPointEntry) {
-
-
-    mdcDataDebugMessage.debugEntryMessage(null, null);
-
     List<String> connectionParameterNameList = new ArrayList<>();
     String mappedTranslatedResourceId =
         getMappedNodeTranslatedResourceId(nestedServiceTemplate, connectionPointEntry);
@@ -177,13 +165,9 @@ abstract class BaseResourceConnection<T> {
             }
           }
         }
-
-        mdcDataDebugMessage.debugExitMessage(null, null);
         return connectionParameterNameList;
       }
     }
-
-    mdcDataDebugMessage.debugExitMessage(null, null);
     return null;
   }
 
@@ -191,10 +175,6 @@ abstract class BaseResourceConnection<T> {
                                                            HeatOrchestrationTemplate
                                                                nestedHeatOrchestrationTemplate,
                                                            String nestedHeatFileName) {
-
-
-    mdcDataDebugMessage.debugEntryMessage(null, null);
-
     List<String> params = new ArrayList<>();
     Optional<List<Map.Entry<String, Resource>>> heatResources =
         getResourceByTranslatedResourceId(translatedResourceId, nestedHeatOrchestrationTemplate);
@@ -209,8 +189,6 @@ abstract class BaseResourceConnection<T> {
         }
       }
     }
-
-    mdcDataDebugMessage.debugExitMessage(null, null);
     return params;
   }
 
@@ -221,9 +199,6 @@ abstract class BaseResourceConnection<T> {
             nestedHeatOrchestrationTemplate, translatedResourceId, translateTo,
             getDesiredResourceType());
     if (!resourceByTranslatedResourceId.isPresent()) {
-      MdcDataErrorMessage.createErrorMessageAndUpdateMdc(LoggerConstants.TARGET_ENTITY_DB,
-          LoggerTragetServiceName.GET_RESOURCE, ErrorLevel.ERROR.name(),
-          LoggerErrorCode.DATA_ERROR.getErrorCode(), LoggerErrorDescription.TRANSLATE_HEAT);
       throw new CoreException((new ErrorCode.ErrorCodeBuilder()).withMessage(
           "Failed to get original resource from heat for translate resource id '"
               + translatedResourceId + "'")
@@ -236,8 +211,6 @@ abstract class BaseResourceConnection<T> {
   RequirementAssignment createRequirementAssignment(Map.Entry<String, RequirementDefinition>
                                                         requirementEntry, String node,
                                                     NodeTemplate nodeTemplate) {
-
-    mdcDataDebugMessage.debugEntryMessage(null, null);
     RequirementAssignment requirementAssignment = null;
     if (Objects.nonNull(node)) {
       requirementAssignment = new RequirementAssignment();
@@ -247,7 +220,6 @@ abstract class BaseResourceConnection<T> {
       DataModelUtil
           .addRequirementAssignment(nodeTemplate, requirementEntry.getKey(), requirementAssignment);
     }
-    mdcDataDebugMessage.debugExitMessage(null, null);
     return requirementAssignment;
   }