Remove vsp and vlm redundant properties

Change-Id: I1faf9af304c7c97303e98744b036f9b1c0db8f0c
Issue-ID: SDC-343
Signed-off-by: talig <talig@amdocs.com>

4 files changed, 1 insertions, 34 deletions

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/VendorLicenseModelEntity.java b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/VendorLicenseModelEntity.java
index 0d43d7e5eb..aab2e61d4e 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/VendorLicenseModelEntity.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-license-lib/openecomp-sdc-vendor-license-api/src/main/java/org/openecomp/sdc/vendorlicense/dao/types/VendorLicenseModelEntity.java
@@ -147,12 +147,4 @@ public class VendorLicenseModelEntity implements VersionableEntity {
         && Objects.equals(description, that.description)
         && Objects.equals(iconRef, that.iconRef);
   }
-
-  public Long getWritetimeMicroSeconds() {
-    return writetimeMicroSeconds;
-  }
-
-  public void setWritetimeMicroSeconds(Long writetimeMicroSeconds) {
-    this.writetimeMicroSeconds = writetimeMicroSeconds;
-  }
 }
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;
   }
-
-
 }
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/dao/type/VspDetails.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/type/VspDetails.java
index 3ba77ad0ee..9f82b73978 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/type/VspDetails.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-api/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/dao/type/VspDetails.java
@@ -52,8 +52,6 @@ public class VspDetails implements VersionableEntity {
 
   private List<String> featureGroups;
 
-  private Long writetimeMicroSeconds;
-
   private String onboardingMethod;
 
   public VspDetails() {
@@ -172,18 +170,6 @@ public class VspDetails implements VersionableEntity {
     this.featureGroups = featureGroups;
   }
 
-  public Long getWritetimeMicroSeconds() {
-    return this.writetimeMicroSeconds;
-  }
-
-  public void setWritetimeMicroSeconds(Long writetimeMicroSeconds) {
-    this.writetimeMicroSeconds = writetimeMicroSeconds;
-  }
-
-  /*public boolean isOldVersion() {
-    return this.oldVersion;
-  }*/
-
   public String getOnboardingMethod() {
     return onboardingMethod;
   }
@@ -192,7 +178,6 @@ public class VspDetails implements VersionableEntity {
     this.onboardingMethod = onboardingMethod;
   }
 
-
   @Override
   public String toString() {
     return String.format(