Fixed SONAR issues

[sdc.git] / openecomp-be / lib / openecomp-sdc-vendor-software-product-lib / openecomp-sdc-vendor-software-product-core / src / main / java / org / openecomp / sdc / vendorsoftwareproduct / dao / impl / zusammen / VendorSoftwareProductInfoDaoZusammenImpl.java

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/zusammen/VendorSoftwareProductInfoDaoZusammenImpl.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/zusammen/VendorSoftwareProductInfoDaoZusammenImpl.java
index eef90d4..517a01e 100644 (file)
--- 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/zusammen/VendorSoftwareProductInfoDaoZusammenImpl.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/zusammen/VendorSoftwareProductInfoDaoZusammenImpl.java
@@ -1,6 +1,5 @@
 package org.openecomp.sdc.vendorsoftwareproduct.dao.impl.zusammen;
 
-import com.amdocs.zusammen.adaptor.inbound.api.types.item.ElementInfo;
 import com.amdocs.zusammen.adaptor.inbound.api.types.item.ZusammenElement;
 import com.amdocs.zusammen.datatypes.Id;
 import com.amdocs.zusammen.datatypes.SessionContext;
@@ -22,7 +21,6 @@ import org.openecomp.sdc.versioning.types.VersionableEntityStoreType;
 import java.io.ByteArrayInputStream;
 import java.util.Collection;
 import java.util.Date;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 public class VendorSoftwareProductInfoDaoZusammenImpl implements VendorSoftwareProductInfoDao {
@@ -200,6 +198,8 @@ public class VendorSoftwareProductInfoDaoZusammenImpl implements VendorSoftwareP
     info.addProperty(InfoPropertyName.featureGroups.name(), vspDetails.getFeatureGroups());
     info.addProperty(InfoPropertyName.oldVersion.name(), vspDetails.getOldVersion());
     info.addProperty(InfoPropertyName.onboardingMethod.name(), vspDetails.getOnboardingMethod());
+    info.addProperty(InfoPropertyName.obBoardingOrigin.name(), vspDetails.getOnboardingOrigin());
+    info.addProperty(InfoPropertyName.networkPackageName.name(), vspDetails.getNetworkPackageName());
   }
 
   private VspDetails mapInfoToVspDetails(String vspId, Version version, Info info,
@@ -215,6 +215,7 @@ public class VendorSoftwareProductInfoDaoZusammenImpl implements VendorSoftwareP
         Version.valueOf(info.getProperty(InfoPropertyName.vendorVersion.name())));
     vspDetails.setLicenseAgreement(info.getProperty(InfoPropertyName.licenseAgreement.name()));
     vspDetails.setFeatureGroups(info.getProperty(InfoPropertyName.featureGroups.name()));
+
     vspDetails.setWritetimeMicroSeconds(
         modificationTime == null ? creationTime.getTime() : modificationTime.getTime());
     vspDetails.setVersion(version);
@@ -223,7 +224,8 @@ public class VendorSoftwareProductInfoDaoZusammenImpl implements VendorSoftwareP
     //Boolean oldVersion = ind == null || "true".equals( ind.toLowerCase());
     vspDetails.setOldVersion(oldVersion);
     vspDetails.setOnboardingMethod(info.getProperty(InfoPropertyName.onboardingMethod.name()));
-
+    vspDetails.setOnboardingOrigin(info.getProperty(InfoPropertyName.obBoardingOrigin.name()));
+    vspDetails.setNetworkPackageName(info.getProperty(InfoPropertyName.networkPackageName.name()));
     return vspDetails;
   }
 
@@ -239,7 +241,9 @@ public class VendorSoftwareProductInfoDaoZusammenImpl implements VendorSoftwareP
     licenseAgreement,
     featureGroups,
     oldVersion,
-    onboardingMethod
+    onboardingMethod,
+    obBoardingOrigin,
+    networkPackageName
   }
 
 }