From 49ddc1f78fa98356e2ab6207d17282a426624ac0 Mon Sep 17 00:00:00 2001
From: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Date: Thu, 24 Sep 2020 07:47:30 +0200
Subject: Filter empty imports from files in bpgen

Issue-ID: DCAEGEN2-2454
Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Change-Id: Ia51750c17483c3120d86949ea60be416065b0da9
---
 .../org/onap/blueprintgenerator/models/blueprint/Imports.java | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'mod/bpgenerator/src/main/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
--- 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();
 	}
 }
-- 
cgit 1.2.3-korg