summaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib/openecomp-sdc-vendor-license-lib
diff options
context:
space:
mode:
Diffstat (limited to 'openecomp-be/lib/openecomp-sdc-vendor-license-lib')
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/VendorLicenseUtil.java8
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/EntitlementPoolEntity.java9
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/LicenseKeyGroupEntity.java9
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/facade/impl/VendorLicenseFacadeImpl.java7
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/healing/impl/SimpleHealingServiceImpl.java9
-rw-r--r--openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/licenseartifacts/impl/VendorLicenseArtifactsServiceImpl.java23
6 files changed, 0 insertions, 65 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/VendorLicenseUtil.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/VendorLicenseUtil.java
index 3ee326af4c..cb13f5de5a 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/VendorLicenseUtil.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/VendorLicenseUtil.java
@@ -1,16 +1,11 @@
package org.openecomp.sdc.vendorlicense;
-import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage;
import java.text.ParseException;
import java.text.SimpleDateFormat;
public class VendorLicenseUtil {
-
- private static MdcDataDebugMessage mdcDataDebugMessage = new MdcDataDebugMessage();
-
public static String getIsoFormatDate(String inputDate) {
- mdcDataDebugMessage.debugEntryMessage("inputDate date", inputDate);
String isoFormatDate = null;
SimpleDateFormat isoDateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
SimpleDateFormat inputDateFormat = new SimpleDateFormat("MM/dd/yyyy'T'HH:mm:ss'Z'");
@@ -18,11 +13,8 @@ public class VendorLicenseUtil {
try {
isoFormatDate = isoDateFormat.format(inputDateFormat.parse(inputDate));
} catch (ParseException e) {
- mdcDataDebugMessage.debugExitMessage("parsing error", isoFormatDate);
isoFormatDate = null;
}
-
- mdcDataDebugMessage.debugExitMessage("formatted date", isoFormatDate);
return isoFormatDate;
}
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/EntitlementPoolEntity.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/EntitlementPoolEntity.java
index 4bcfd9d4d1..d76b434f29 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/EntitlementPoolEntity.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/EntitlementPoolEntity.java
@@ -27,7 +27,6 @@ import com.datastax.driver.mapping.annotations.Frozen;
import com.datastax.driver.mapping.annotations.PartitionKey;
import com.datastax.driver.mapping.annotations.Table;
import org.apache.commons.lang3.StringUtils;
-import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage;
import org.openecomp.sdc.vendorlicense.VendorLicenseUtil;
import org.openecomp.sdc.vendorlicense.dao.types.xml.LimitForXml;
import org.openecomp.sdc.vendorlicense.dao.types.xml.LimitXml;
@@ -43,8 +42,6 @@ import java.util.Set;
@Table(keyspace = "dox", name = "entitlement_pool")
public class EntitlementPoolEntity implements VersionableEntity {
-
- private static final MdcDataDebugMessage MDC_DATA_DEBUG_MESSAGE = new MdcDataDebugMessage();
private static final String ENTITY_TYPE = "Entitlement Pool";
@PartitionKey
@@ -387,24 +384,18 @@ public class EntitlementPoolEntity implements VersionableEntity {
}
public String getIsoFormatStartDate() {
- MDC_DATA_DEBUG_MESSAGE.debugEntryMessage("start date", startDate);
String isoFormatStartDate = null;
if (!StringUtils.isEmpty(startDate)) {
isoFormatStartDate = VendorLicenseUtil.getIsoFormatDate(startDate);
- MDC_DATA_DEBUG_MESSAGE.debugExitMessage("start date", "iso format start date", startDate,
- isoFormatStartDate);
}
return isoFormatStartDate;
}
public String getIsoFormatExpiryDate() {
- MDC_DATA_DEBUG_MESSAGE.debugEntryMessage("expiry date", expiryDate);
String isoFormatExpDate = null;
if (!StringUtils.isEmpty(expiryDate)) {
isoFormatExpDate = VendorLicenseUtil.getIsoFormatDate(expiryDate);
- MDC_DATA_DEBUG_MESSAGE.debugExitMessage("expiry date", "iso format expiry date", expiryDate,
- isoFormatExpDate);
}
return isoFormatExpDate;
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/LicenseKeyGroupEntity.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/LicenseKeyGroupEntity.java
index 43de02b174..3f51a2eeca 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/LicenseKeyGroupEntity.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/LicenseKeyGroupEntity.java
@@ -27,7 +27,6 @@ import com.datastax.driver.mapping.annotations.Frozen;
import com.datastax.driver.mapping.annotations.PartitionKey;
import com.datastax.driver.mapping.annotations.Table;
import org.apache.commons.lang3.StringUtils;
-import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage;
import org.openecomp.sdc.vendorlicense.VendorLicenseUtil;
import org.openecomp.sdc.vendorlicense.dao.types.xml.LicenseKeyTypeForXml;
import org.openecomp.sdc.vendorlicense.dao.types.xml.LimitForXml;
@@ -44,8 +43,6 @@ import java.util.Set;
@Table(keyspace = "dox", name = "license_key_group")
public class LicenseKeyGroupEntity implements VersionableEntity {
-
- private static final MdcDataDebugMessage MDC_DATA_DEBUG_MESSAGE = new MdcDataDebugMessage();
private static final String ENTITY_TYPE = "License Key Group";
@PartitionKey
@@ -392,24 +389,18 @@ public class LicenseKeyGroupEntity implements VersionableEntity {
}
public String getIsoFormatStartDate() {
- MDC_DATA_DEBUG_MESSAGE.debugEntryMessage("start date", startDate);
String isoFormatStartDate = null;
if (!StringUtils.isEmpty(startDate)) {
isoFormatStartDate = VendorLicenseUtil.getIsoFormatDate(startDate);
- MDC_DATA_DEBUG_MESSAGE.debugExitMessage("start date", "iso format start date", startDate,
- isoFormatStartDate);
}
return isoFormatStartDate;
}
public String getIsoFormatExpiryDate() {
- MDC_DATA_DEBUG_MESSAGE.debugEntryMessage("expiry date", expiryDate);
String isoFormatExpDate = null;
if (!StringUtils.isEmpty(expiryDate)) {
isoFormatExpDate = VendorLicenseUtil.getIsoFormatDate(expiryDate);
- MDC_DATA_DEBUG_MESSAGE.debugExitMessage("expiry date", "iso format expiry date", expiryDate,
- isoFormatExpDate);
}
return isoFormatExpDate;
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/facade/impl/VendorLicenseFacadeImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/facade/impl/VendorLicenseFacadeImpl.java
index 0898e48b54..33e3b4c545 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/facade/impl/VendorLicenseFacadeImpl.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/facade/impl/VendorLicenseFacadeImpl.java
@@ -26,7 +26,6 @@ import org.openecomp.core.utilities.CommonMethods;
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;
@@ -82,8 +81,6 @@ public class VendorLicenseFacadeImpl implements VendorLicenseFacade {
private static final LicenseKeyGroupDao
licenseKeyGroupDao = LicenseKeyGroupDaoFactory.getInstance().createInterface();
private static final LimitDao limitDao = LimitDaoFactory.getInstance().createInterface();
- private static MdcDataDebugMessage mdcDataDebugMessage = new MdcDataDebugMessage();
-
/**
* Instantiates a new Vendor license facade.
*/
@@ -207,8 +204,6 @@ public class VendorLicenseFacadeImpl implements VendorLicenseFacade {
@Override
public VendorLicenseModelEntity getVendorLicenseModel(String vlmId, Version version) {
- mdcDataDebugMessage.debugEntryMessage("VLM id", vlmId);
-
VendorLicenseModelEntity vendorLicenseModel =
vendorLicenseModelDao.get(new VendorLicenseModelEntity(vlmId, version));
if (vendorLicenseModel == null) {
@@ -217,8 +212,6 @@ public class VendorLicenseFacadeImpl implements VendorLicenseFacade {
LoggerErrorCode.DATA_ERROR.getErrorCode(), LoggerErrorDescription.ENTITY_NOT_FOUND);
throw new CoreException(new VendorLicenseModelNotFoundErrorBuilder(vlmId).build());
}
-
- mdcDataDebugMessage.debugExitMessage("VLM id", vlmId);
return vendorLicenseModel;
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/healing/impl/SimpleHealingServiceImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/healing/impl/SimpleHealingServiceImpl.java
index c62061e529..456348688e 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/healing/impl/SimpleHealingServiceImpl.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/healing/impl/SimpleHealingServiceImpl.java
@@ -21,7 +21,6 @@
package org.openecomp.sdc.vendorlicense.healing.impl;
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;
@@ -43,8 +42,6 @@ public class SimpleHealingServiceImpl implements HealingService {
EntitlementPoolDaoFactory.getInstance().createInterface();
private static final LicenseKeyGroupDao licenseKeyGroupDao =
LicenseKeyGroupDaoFactory.getInstance().createInterface();
- private static MdcDataDebugMessage mdcDataDebugMessage = new MdcDataDebugMessage();
-
@Override
public VersionableEntity heal(VersionableEntity toHeal) {
return handleMissingVersionId(toHeal);
@@ -60,10 +57,6 @@ public class SimpleHealingServiceImpl implements HealingService {
}
private VersionableEntity handleMissingVersionId(VersionableEntity toHeal) {
-
-
- mdcDataDebugMessage.debugEntryMessage(null);
-
if (toHeal != null && toHeal.getVersionUuId() != null) {
return toHeal;
}
@@ -81,8 +74,6 @@ public class SimpleHealingServiceImpl implements HealingService {
throw new UnsupportedOperationException(
"Unsupported operation for 1610 release/1607->1610 migration.");
}
-
- mdcDataDebugMessage.debugExitMessage(null);
return toHeal;
}
}
diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/licenseartifacts/impl/VendorLicenseArtifactsServiceImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/licenseartifacts/impl/VendorLicenseArtifactsServiceImpl.java
index 07f19b1e2b..613cdd20f5 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/licenseartifacts/impl/VendorLicenseArtifactsServiceImpl.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/licenseartifacts/impl/VendorLicenseArtifactsServiceImpl.java
@@ -22,7 +22,6 @@ package org.openecomp.sdc.vendorlicense.licenseartifacts.impl;
import org.apache.commons.collections.CollectionUtils;
import org.openecomp.core.utilities.file.FileContentHandler;
-import org.openecomp.sdc.logging.context.impl.MdcDataDebugMessage;
import org.openecomp.sdc.vendorlicense.HealingServiceFactory;
import org.openecomp.sdc.vendorlicense.dao.types.EntitlementPoolEntity;
import org.openecomp.sdc.vendorlicense.dao.types.FeatureGroupEntity;
@@ -58,15 +57,8 @@ public class VendorLicenseArtifactsServiceImpl implements VendorLicenseArtifacts
VendorLicenseFacadeFactory.getInstance().createInterface();
public static final HealingService healingService =
HealingServiceFactory.getInstance().createInterface();
- private static MdcDataDebugMessage mdcDataDebugMessage = new MdcDataDebugMessage();
-
-
private static byte[] createVnfArtifact(String vspId, String vlmId, Version vlmVersion, String vendorName,
List<String> featureGroups) {
-
-
- mdcDataDebugMessage.debugEntryMessage("VLM name", vendorName);
-
VnfLicenseArtifact artifact = new VnfLicenseArtifact();
artifact.setVspId(vspId);
@@ -102,16 +94,10 @@ public class VendorLicenseArtifactsServiceImpl implements VendorLicenseArtifacts
artifact.getFeatureGroups().add(featureGroupModel);
}
}
-
- mdcDataDebugMessage.debugExitMessage("VLM name", vendorName);
return artifact.toXml().getBytes();
}
private static byte[] createVendorLicenseArtifact(String vlmId, String vendorName) {
-
-
- mdcDataDebugMessage.debugEntryMessage("VLM name", vendorName);
-
VendorLicenseArtifact vendorLicenseArtifact = new VendorLicenseArtifact();
vendorLicenseArtifact.setVendorName(vendorName);
Set<EntitlementPoolEntity> entitlementPoolEntities = new HashSet<>();
@@ -152,8 +138,6 @@ public class VendorLicenseArtifactsServiceImpl implements VendorLicenseArtifacts
healLkgs(filterChangedEntities(prepareForFiltering(licenseKeyGroupEntities, false)));
vendorLicenseArtifact.setEntitlementPoolEntities(entitlementPoolEntities);
vendorLicenseArtifact.setLicenseKeyGroupEntities(licenseKeyGroupEntities);
-
- mdcDataDebugMessage.debugExitMessage("VLM name", vendorName);
return vendorLicenseArtifact.toXml().getBytes();
}
@@ -187,10 +171,6 @@ public class VendorLicenseArtifactsServiceImpl implements VendorLicenseArtifacts
*/
public FileContentHandler createLicenseArtifacts(String vspId, String vlmId, Version vlmVersion,
List<String> featureGroups) {
-
-
- mdcDataDebugMessage.debugEntryMessage("VSP Id", vspId);
-
FileContentHandler artifacts = new FileContentHandler();
String vendorName = getVendorName(vlmId);
@@ -198,9 +178,6 @@ public class VendorLicenseArtifactsServiceImpl implements VendorLicenseArtifacts
createVnfArtifact(vspId, vlmId, vlmVersion, vendorName, featureGroups));
artifacts.addFile(VENDOR_LICENSE_MODEL_ARTIFACT_NAME_WITH_PATH,
createVendorLicenseArtifact(vlmId, vendorName));
-
- mdcDataDebugMessage.debugExitMessage("VSP Id", vspId);
-
return artifacts;
}