From 53d5049c1b4acab91c90e491abdee7cc0b1c0cc5 Mon Sep 17 00:00:00 2001 From: talig Date: Tue, 1 May 2018 10:10:09 +0300 Subject: Remove vsp and vlm redundant properties Change-Id: I1faf9af304c7c97303e98744b036f9b1c0db8f0c Issue-ID: SDC-343 Signed-off-by: talig --- .../dao/impl/zusammen/VendorLicenseModelDaoZusammenImpl.java | 6 +----- .../dao/impl/zusammen/convertor/ElementToVLMGeneralConvertor.java | 6 ------ 2 files changed, 1 insertion(+), 11 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core') diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/VendorLicenseModelDaoZusammenImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/VendorLicenseModelDaoZusammenImpl.java index 78b31f8865..e4a078d6d6 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/VendorLicenseModelDaoZusammenImpl.java +++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/VendorLicenseModelDaoZusammenImpl.java @@ -134,10 +134,9 @@ public class VendorLicenseModelDaoZusammenImpl implements VendorLicenseModelDao @Override public void delete(VendorLicenseModelEntity entity) { - + throw new UnsupportedOperationException("Delete vlm version is done using versioning manager"); } - private ZusammenElement mapVlmToZusammenElement(VendorLicenseModelEntity vendorLicenseModel, Action action) { ZusammenElement generalElement = @@ -150,14 +149,11 @@ public class VendorLicenseModelDaoZusammenImpl implements VendorLicenseModelDao info.addProperty(InfoPropertyName.name.name(), vendorLicenseModel.getVendorName()); info.addProperty(InfoPropertyName.description.name(), vendorLicenseModel.getDescription()); info.addProperty(InfoPropertyName.iconRef.name(), vendorLicenseModel.getIconRef()); - info.addProperty(InfoPropertyName.oldVersion.name(), vendorLicenseModel.getOldVersion()); } - public enum InfoPropertyName { name, description, iconRef, - oldVersion } } diff --git a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/convertor/ElementToVLMGeneralConvertor.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/convertor/ElementToVLMGeneralConvertor.java index c2ef5a6c41..10a532c572 100644 --- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/convertor/ElementToVLMGeneralConvertor.java +++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-core/src/main/java/org/openecomp/sdc/vendorlicense/dao/impl/zusammen/convertor/ElementToVLMGeneralConvertor.java @@ -30,7 +30,6 @@ public class ElementToVLMGeneralConvertor extends ElementConvertor { } - private VendorLicenseModelEntity mapInfoToVendorLicenseModelEntity(Info info) { VendorLicenseModelEntity vendorLicenseModelEntity = new VendorLicenseModelEntity(); @@ -41,12 +40,7 @@ public class ElementToVLMGeneralConvertor extends ElementConvertor { VendorLicenseModelDaoZusammenImpl.InfoPropertyName.description.name())); vendorLicenseModelEntity.setIconRef(info.getProperty( VendorLicenseModelDaoZusammenImpl.InfoPropertyName.iconRef.name())); - vendorLicenseModelEntity.setOldVersion(info.getProperty( - VendorLicenseModelDaoZusammenImpl.InfoPropertyName.oldVersion.name())); - return vendorLicenseModelEntity; } - - } -- cgit 1.2.3-korg