aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib
diff options
context:
space:
mode:
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-vendor-software-product-lib')
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/utils/CandidateEntityBuilder.java9
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/PackageInfoDaoImpl.java6
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/informationArtifact/impl/TxtInformationArtifactGeneratorImpl.java41
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/quiestionnaire/QuestionnaireDataServiceImpl.java7
4 files changed, 0 insertions, 63 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/utils/CandidateEntityBuilder.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/utils/CandidateEntityBuilder.java
index c34e6541e9..6702479864 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/utils/CandidateEntityBuilder.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/utils/CandidateEntityBuilder.java
@@ -29,7 +29,6 @@ import org.openecomp.sdc.heat.datatypes.manifest.ManifestContent;
import org.openecomp.sdc.heat.datatypes.structure.HeatStructureTree;
import org.openecomp.sdc.heat.services.tree.HeatTreeManager;
import org.openecomp.sdc.heat.services.tree.HeatTreeManagerUtil;
-import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage;
import org.openecomp.sdc.vendorsoftwareproduct.dao.type.OrchestrationTemplateCandidateData;
import org.openecomp.sdc.vendorsoftwareproduct.dao.type.VspDetails;
import org.openecomp.sdc.vendorsoftwareproduct.services.HeatFileAnalyzer;
@@ -46,9 +45,6 @@ import java.util.Objects;
import java.util.Optional;
public class CandidateEntityBuilder {
-
- private static final MdcDataDebugMessage MDC_DATA_DEBUG_MESSAGE = new MdcDataDebugMessage();
-
private final CandidateService candidateService;
public CandidateEntityBuilder(CandidateService candidateService) {
@@ -73,8 +69,6 @@ public class CandidateEntityBuilder {
OrchestrationTemplateCandidateData candidateDataEntity =
candidateService.createCandidateDataEntity(candidateDataEntityTo, zipFileManifest,
analyzedZipHeatFiles);
-
- MDC_DATA_DEBUG_MESSAGE.debugExitMessage("VSP Id", vspDetails.getId());
return candidateDataEntity;
}
}
@@ -93,8 +87,6 @@ public class CandidateEntityBuilder {
FileContentHandler fileContentHandler,
AnalyzedZipHeatFiles analyzedZipHeatFiles)
throws IOException {
- MDC_DATA_DEBUG_MESSAGE.debugEntryMessage("VSP Id", vspDetails.getId());
-
try (InputStream manifest = fileContentHandler.getFileContent(SdcCommon.MANIFEST_NAME)) {
if (Objects.isNull(manifest)) {
@@ -109,7 +101,6 @@ public class CandidateEntityBuilder {
String.valueOf(JsonUtil.sbObject2Json(manifestContent)).getBytes());
}
} finally {
- MDC_DATA_DEBUG_MESSAGE.debugExitMessage("VSP Id", vspDetails.getId());
}
}
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/PackageInfoDaoImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/PackageInfoDaoImpl.java
index 41ab1a35ae..6b8144cd09 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/PackageInfoDaoImpl.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/impl/PackageInfoDaoImpl.java
@@ -27,7 +27,6 @@ import com.datastax.driver.mapping.annotations.Query;
import org.openecomp.core.dao.impl.CassandraBaseDao;
import org.openecomp.core.nosqldb.api.NoSqlDb;
import org.openecomp.core.nosqldb.factory.NoSqlDbFactory;
-import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage;
import org.openecomp.sdc.vendorsoftwareproduct.dao.PackageInfoDao;
import org.openecomp.sdc.vendorsoftwareproduct.dao.type.PackageInfo;
@@ -42,9 +41,6 @@ public class PackageInfoDaoImpl extends CassandraBaseDao<PackageInfo> implements
noSqlDb.getMappingManager().mapper(PackageInfo.class);
private static final PackageInfoAccessor accessor =
noSqlDb.getMappingManager().createAccessor(PackageInfoAccessor.class);
-
- private static MdcDataDebugMessage mdcDataDebugMessage = new MdcDataDebugMessage();
-
@Override
protected Mapper<PackageInfo> getMapper() {
return mapper;
@@ -62,7 +58,6 @@ public class PackageInfoDaoImpl extends CassandraBaseDao<PackageInfo> implements
@Override
public List<PackageInfo> listByCategory(String category, String subCategory) {
- mdcDataDebugMessage.debugEntryMessage(null);
Result<PackageInfo> packages = accessor.listInfo();
List<PackageInfo> filteredPackages = new ArrayList<>();
@@ -79,7 +74,6 @@ public class PackageInfoDaoImpl extends CassandraBaseDao<PackageInfo> implements
filteredPackages.add(packageInfo);
}
}
- mdcDataDebugMessage.debugExitMessage(null);
return filteredPackages;
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/informationArtifact/impl/TxtInformationArtifactGeneratorImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/informationArtifact/impl/TxtInformationArtifactGeneratorImpl.java
index 7efb70494d..9aba18ed57 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/informationArtifact/impl/TxtInformationArtifactGeneratorImpl.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/informationArtifact/impl/TxtInformationArtifactGeneratorImpl.java
@@ -20,7 +20,6 @@
package org.openecomp.sdc.vendorsoftwareproduct.informationArtifact.impl;
-import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage;
import org.openecomp.sdc.vendorsoftwareproduct.dao.type.VspDetails;
import org.openecomp.sdc.vendorsoftwareproduct.factory.QuestionnnaireDataServiceFactory;
import org.openecomp.sdc.vendorsoftwareproduct.informationArtifact.InformationArtifactData;
@@ -55,8 +54,6 @@ public class TxtInformationArtifactGeneratorImpl implements InformationArtifactG
private QuestionnaireDataService questionnaireDataService = QuestionnnaireDataServiceFactory
.getInstance().createInterface();
private StringBuilder textArtifact;
- private static MdcDataDebugMessage mdcDataDebugMessage = new MdcDataDebugMessage();
-
@Override
public String generate(String vspId, Version version) {
InformationArtifactData informationArtifactData =
@@ -65,10 +62,6 @@ public class TxtInformationArtifactGeneratorImpl implements InformationArtifactG
}
private String createTxtArtifact(InformationArtifactData informationArtifactData) {
-
-
- mdcDataDebugMessage.debugEntryMessage(null);
-
textArtifact = new StringBuilder(TxtInformationArtifactConstants.HEADER);
addVspVlmEntries(informationArtifactData);
addAvailabilityEntries();
@@ -92,17 +85,11 @@ public class TxtInformationArtifactGeneratorImpl implements InformationArtifactG
addRecoveryEntriesPerComponent(componentQuestionnaire);
}
textArtifact.append(TxtInformationArtifactConstants.FOOTER);
-
- mdcDataDebugMessage.debugExitMessage(null);
return textArtifact.toString();
}
private void addDataEntries(InformationArtifactData informationArtifactData) {
-
-
- mdcDataDebugMessage.debugEntryMessage(null);
-
addEntryWithIndent(STORAGE_BACKUP_DETAILS, "", TAB);
Optional<StorageDataReplication> storageDataReplication =
@@ -124,13 +111,9 @@ public class TxtInformationArtifactGeneratorImpl implements InformationArtifactG
storageDataReplication.ifPresent(rep -> addEntryWithIndent(DATA_REP_DEST,
String.valueOf(rep.getStorageReplicationDestination()), TAB + TAB));
-
- mdcDataDebugMessage.debugExitMessage(null);
}
private void addAvailabilityEntries() {
- mdcDataDebugMessage.debugEntryMessage(null);
-
addEntryWithIndent(HIGH_AVAILABILITY, "", TAB);
Optional<Availability> availability =
@@ -139,13 +122,9 @@ public class TxtInformationArtifactGeneratorImpl implements InformationArtifactG
availability
.ifPresent(availabilityVal -> addEntryWithIndent(USING_AVAILABILITY_ZONES, String.valueOf(
availabilityVal.isUseAvailabilityZonesForHighAvailability()), TAB + TAB));
-
- mdcDataDebugMessage.debugExitMessage(null);
}
private void addVspVlmEntries(InformationArtifactData informationArtifactData) {
- mdcDataDebugMessage.debugEntryMessage(null);
-
addEntryWithIndent(TITLE, "", "");
Optional<VspDetails> vspDetails = Optional.of(informationArtifactData).map
(InformationArtifactData::getVspDetails);
@@ -166,8 +145,6 @@ public class TxtInformationArtifactGeneratorImpl implements InformationArtifactG
addEntryWithIndent(LIST_OF_FEATURE_GROUPS, "", TAB + TAB);
vspDetails.ifPresent(vspDets -> addListEntriesWithIndent(vspDets
.getFeatureGroups(), TAB + TAB + TAB));
-
- mdcDataDebugMessage.debugExitMessage(null);
}
static String roundVersionAsNeeded(Version version) {
@@ -179,9 +156,6 @@ public class TxtInformationArtifactGeneratorImpl implements InformationArtifactG
}
private void addRecoveryEntriesPerComponent(ComponentQuestionnaire componentQuestionnaire) {
-
- mdcDataDebugMessage.debugEntryMessage(null);
-
addEntryWithIndent(RECOVERY_DETAILS, "", TAB + TAB + TAB);
Optional<Recovery> recovery = Optional.of(componentQuestionnaire).map(
ComponentQuestionnaire::getGeneral).map(
@@ -192,15 +166,9 @@ public class TxtInformationArtifactGeneratorImpl implements InformationArtifactG
recovery.ifPresent(recoveryVal -> addEntryWithIndent(RECOVERY_DETAILS_TIME, String.valueOf(
recoveryVal.getTimeObjective()), TAB + TAB + TAB + TAB));
-
- mdcDataDebugMessage.debugExitMessage(null);
}
private void addEntriesPerNic(NicQuestionnaire nicQuestionnaire) {
-
-
- mdcDataDebugMessage.debugEntryMessage(null);
-
addEntryWithIndent(VNICS, "", TAB + TAB + TAB);
Optional<Network> networkOpt = Optional.of(nicQuestionnaire).map(
NicQuestionnaire::getNetwork);
@@ -223,15 +191,9 @@ public class TxtInformationArtifactGeneratorImpl implements InformationArtifactG
.isIpv4Required()), TAB + TAB + TAB + TAB));
ipconfigOpt.ifPresent(ipconfig -> addEntryWithIndent(VNICS_IPV6, String.valueOf(ipconfig
.isIpv6Required()), TAB + TAB + TAB + TAB));
-
- mdcDataDebugMessage.debugExitMessage(null);
}
private void addEntriesPerComponent(ComponentQuestionnaire componentQuestionnaire) {
-
-
- mdcDataDebugMessage.debugEntryMessage(null);
-
addEntryWithIndent(VFC_NAME, "", TAB + TAB + TAB);
addEntryWithIndent(VFC_DESC, "", TAB + TAB + TAB);
addEntryWithIndent(VFC_IMAGES, "", TAB + TAB + TAB);
@@ -279,9 +241,6 @@ public class TxtInformationArtifactGeneratorImpl implements InformationArtifactG
numVmsOpt.ifPresent(numVms -> addEntryWithIndent(VFC_INSTANCE_NUMBER_MAX, String.valueOf
(numVms.getMaximum()), TAB + TAB + TAB + TAB));
-
-
- mdcDataDebugMessage.debugExitMessage(null);
}
private void addListEntriesWithIndent(List<String> fieldValues, String indent) {
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/quiestionnaire/QuestionnaireDataServiceImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/quiestionnaire/QuestionnaireDataServiceImpl.java
index c48bc5d3d6..4eeb2851ba 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/quiestionnaire/QuestionnaireDataServiceImpl.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/quiestionnaire/QuestionnaireDataServiceImpl.java
@@ -18,7 +18,6 @@ package org.openecomp.sdc.vendorsoftwareproduct.quiestionnaire;
import org.openecomp.core.utilities.json.JsonUtil;
-import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage;
import org.openecomp.sdc.vendorsoftwareproduct.dao.ComponentDao;
import org.openecomp.sdc.vendorsoftwareproduct.dao.ComponentDaoFactory;
import org.openecomp.sdc.vendorsoftwareproduct.dao.NicDao;
@@ -50,13 +49,9 @@ public class QuestionnaireDataServiceImpl implements QuestionnaireDataService {
private static final NicDao nicDao = NicDaoFactory.getInstance().createInterface();
private static final VendorSoftwareProductInfoDao vspInfoDao =
VendorSoftwareProductInfoDaoFactory.getInstance().createInterface();
- private static MdcDataDebugMessage mdcDataDebugMessage = new MdcDataDebugMessage();
-
@Override
public InformationArtifactData generateQuestionnaireDataForInformationArtifact(String vspId,
Version version) {
- mdcDataDebugMessage.debugEntryMessage("VSP Id", vspId);
-
VspDetails vspDetails = vspInfoDao.get(new VspDetails(vspId, version));
Collection<ComponentEntity> componentEntities = componentDao.listQuestionnaires(vspId, version);
Collection<NicEntity> nicEntities = nicDao.listByVsp(vspId, version);
@@ -65,8 +60,6 @@ public class QuestionnaireDataServiceImpl implements QuestionnaireDataService {
List<ComponentQuestionnaire> componentQuestionnaireList =
getListOfComponentQuestionnaireFromJson(componentEntities);
List<NicQuestionnaire> nicQuestionnaireList = getListOfNicQuestionnaireFromJson(nicEntities);
-
- mdcDataDebugMessage.debugExitMessage("VSP Id", vspId);
return new InformationArtifactData(vspDetails, vspQuestionnaire, componentQuestionnaireList,
nicQuestionnaireList);
}