Update to sdc-tosca 1.4.5

Update to use a newer release of the SDC TOSCA parser.

Change-Id: I8bd3288e000c27c2fbcb5b4b24c3a31cf12bfab8
Issue-ID: AAI-1445
Signed-off-by: mark.j.leonard <mark.j.leonard@gmail.com>

diff --git a/pom.xml b/pom.xml
index f12dcba..5f45688 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
 
                <!-- Dependency Versions -->
                <common.logging.version>1.2.2</common.logging.version>
-               <sdc.tosca.version>1.4.1</sdc.tosca.version>
+               <sdc.tosca.version>1.4.5</sdc.tosca.version>
                <commons.compress.version>1.18</commons.compress.version>
                <javax.ws.rs.version>2.1</javax.ws.rs.version>
                <mvn.jaxb2.version>0.13.2</mvn.jaxb2.version>

diff --git a/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VnfVendorImageExtractor.java b/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VnfVendorImageExtractor.java
index efdbc9c..c272b35 100644 (file)
--- a/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VnfVendorImageExtractor.java
+++ b/src/main/java/org/onap/aai/babel/csar/vnfcatalog/VnfVendorImageExtractor.java
@@ -39,9 +39,9 @@ import org.onap.aai.babel.logging.ApplicationMsgs;
 import org.onap.aai.babel.logging.LogHelper;
 import org.onap.aai.babel.service.data.BabelArtifact;
 import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
+import org.onap.sdc.tosca.parser.enums.SdcTypes;
 import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
 import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory;
-import org.onap.sdc.tosca.parser.impl.SdcTypes;
 import org.onap.sdc.toscaparser.api.NodeTemplate;
 import org.onap.sdc.toscaparser.api.SubstitutionMappings;
 
@@ -310,8 +310,7 @@ public class VnfVendorImageExtractor {
         applicationLogger.debug("Extracting software versions from " + sm);
 
         List<NodeTemplate> imagesNodes = sm.getNodeTemplates().stream()
-                .filter(nodeTemplate -> nodeTemplate.getPropertyValue(IMAGES) != null)
-                .collect(Collectors.toList());
+                .filter(nodeTemplate -> nodeTemplate.getPropertyValue(IMAGES) != null).collect(Collectors.toList());
 
         if (imagesNodes != null && !imagesNodes.isEmpty()) {
             return imagesNodes.stream()