[SDC-29] Amdocs OnBoard 1707 initial commit.

Change-Id: Ie4d12a3f574008b792899b368a0902a8b46b5370
Signed-off-by: AviZi <avi.ziv@amdocs.com>

1 files changed, 8 insertions, 5 deletions

diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/mapping/MapVersionedVendorSoftwareProductInfoToVspDetailsDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/mapping/MapVersionedVendorSoftwareProductInfoToVspDetailsDto.java
index 9f03f7ff0d..6eca00e8aa 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/mapping/MapVersionedVendorSoftwareProductInfoToVspDetailsDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/vendor-software-products-rest/vendor-software-products-rest-services/src/main/java/org/openecomp/sdcrests/vsp/rest/mapping/MapVersionedVendorSoftwareProductInfoToVspDetailsDto.java
@@ -24,7 +24,7 @@ import org.openecomp.core.utilities.CommonMethods;
 import org.openecomp.sdc.vendorsoftwareproduct.dao.type.VspDetails;
 import org.openecomp.sdc.vendorsoftwareproduct.types.LicensingData;
 import org.openecomp.sdc.vendorsoftwareproduct.types.VersionedVendorSoftwareProductInfo;
-import org.openecomp.sdc.versioning.dao.types.Version;
+import org.openecomp.sdcrests.common.types.VersionDto;
 import org.openecomp.sdcrests.mapping.MappingBase;
 import org.openecomp.sdcrests.vendorsoftwareproducts.types.VspDetailsDto;
 
@@ -38,14 +38,15 @@ public class MapVersionedVendorSoftwareProductInfoToVspDetailsDto
     VspDetails vsp = source.getVspDetails();
 
     target.setId(vsp.getId());
-    target.setVersion(vsp.getVersion().toString());
+    target.setVersion(new VersionDto(vsp.getVersion().toString(), vsp.getVersion().toString()));
     target.setName(vsp.getName());
     target.setDescription(vsp.getDescription());
     target.setCategory(vsp.getCategory());
     target.setSubCategory(vsp.getSubCategory());
     target.setVendorId(vsp.getVendorId());
     target.setVendorName(vsp.getVendorName());
-    target.setLicensingVersion(vsp.getVlmVersion() == null ? null : vsp.getVlmVersion().toString());
+    target.setLicensingVersion(vsp.getVlmVersion() == null ? null : new VersionDto(vsp.getVlmVersion().toString(), vsp.getVlmVersion().toString()));
+    target.setIsOldVersion("False");
 
     if (vsp.getLicenseAgreement() != null || vsp.getFeatureGroups() != null) {
       LicensingData licensingData = new LicensingData();
@@ -61,13 +62,15 @@ public class MapVersionedVendorSoftwareProductInfoToVspDetailsDto
 
     if (!CommonMethods.isEmpty(source.getVersionInfo().getViewableVersions())) {
       target.setViewableVersions(
-          source.getVersionInfo().getViewableVersions().stream().map(Version::toString)
+          source.getVersionInfo().getViewableVersions().stream()
+              .map(version -> new VersionDto(version.toString(), version.toString()))
               .collect(Collectors.toList()));
     }
 
     if (!CommonMethods.isEmpty(source.getVersionInfo().getFinalVersions())) {
       target.setFinalVersions(
-          source.getVersionInfo().getFinalVersions().stream().map(Version::toString)
+          source.getVersionInfo().getFinalVersions().stream()
+              .map(version -> new VersionDto(version.toString(), version.toString()))
               .collect(Collectors.toList()));
     }
   }