Filter empty imports from files in bpgen

[dcaegen2/platform.git] / mod / bpgenerator / src / main / java / org / onap / blueprintgenerator / models / blueprint / Imports.java

diff --git a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Imports.java b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Imports.java
index 4e7a4f1..7b55e17 100644 (file)
--- a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Imports.java
+++ b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Imports.java
@@ -20,7 +20,6 @@
 
 package org.onap.blueprintgenerator.models.blueprint;
 
-
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -32,8 +31,6 @@ import java.util.ArrayList;
 import lombok.Getter;
 import lombok.Setter;
 
-
-
 @Getter @Setter
 @JsonInclude(value=Include.NON_NULL)
 public class Imports {
@@ -47,6 +44,7 @@ public class Imports {
                imps.add("plugin:dcaepolicyplugin?version=2.4.0");
                return imps;
        }
+
        public static ArrayList<String> createDmaapImports(){
                ArrayList<String> imps = new ArrayList<>();
                imps.add("https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml");
@@ -54,15 +52,16 @@ public class Imports {
                imps.add("plugin:dmaap?version=1.5.0");
                return imps;
        }
+
        public static ArrayList<String> createImportsFromFile(String path) {
-               Imports imports;
                ObjectMapper importMapper = new ObjectMapper(new YAMLFactory().configure(YAMLGenerator.Feature.MINIMIZE_QUOTES, true));
                File importPath = new File(path);
                try {
-                       imports = importMapper.readValue(importPath, Imports.class);
+                       Imports imports = importMapper.readValue(importPath, Imports.class);
+                       imports.getImports().removeIf(String::isBlank);
+                       return imports.getImports();
                } catch (IOException e) {
                        throw new RuntimeException(e);
                }
-               return imports.getImports();
        }
 }