Fix setting vendor release for VSP with model

When a model is selected, the vendor release should not be set based
on the compatible_specification_version of the manifest metadata.

Change-Id: I7a01941c47a8a7f1d3a7f69bfa0830db3d11fb0c
Issue-ID: SDC-3708
Signed-off-by: andre.schmid <andre.schmid@est.tech>

1 files changed, 3 insertions, 2 deletions

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/services/impl/etsi/ETSIServiceImpl.java b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/etsi/ETSIServiceImpl.java
index 2e06202471..c5e7fcd03d 100644
--- a/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/etsi/ETSIServiceImpl.java
+++ b/openecomp-be/lib/openecomp-sdc-vendor-software-product-lib/openecomp-sdc-vendor-software-product-core/src/main/java/org/openecomp/sdc/vendorsoftwareproduct/services/impl/etsi/ETSIServiceImpl.java
@@ -36,6 +36,7 @@ import java.io.InputStream;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -189,8 +190,8 @@ public class ETSIServiceImpl implements ETSIService {
         try {
             Map<String, String> metadata = getManifest(handler).getMetadata();
             if (metadata.containsKey(COMPATIBLE_SPECIFICATION_VERSIONS.getToken())) {
-                return Arrays.asList(metadata.get(COMPATIBLE_SPECIFICATION_VERSIONS.getToken()).split(",")).stream().map(Semver::new)
-                    .max((v1, v2) -> v1.compareTo(v2)).orElse(new Semver(ETSI_VERSION_2_6_1));
+                return Arrays.stream(metadata.get(COMPATIBLE_SPECIFICATION_VERSIONS.getToken()).split(",")).map(String::trim).map(Semver::new)
+                    .max(Comparator.naturalOrder()).orElse(new Semver(ETSI_VERSION_2_6_1));
             }
         } catch (Exception ex) {
             LOGGER.error("An error occurred while getting highest compatible version from manifest file", ex);