1 files changed, 18 insertions, 28 deletions

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 b17b045..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,24 +20,16 @@
 
 package org.onap.blueprintgenerator.models.blueprint;
 
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-
-
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
 import com.fasterxml.jackson.dataformat.yaml.YAMLGenerator;
-import lombok.AllArgsConstructor;
-import lombok.Getter; import lombok.Setter;
-import lombok.NoArgsConstructor;
-
-
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import lombok.Getter;
+import lombok.Setter;
 
 @Getter @Setter
 @JsonInclude(value=Include.NON_NULL)
@@ -46,32 +38,30 @@ public class Imports {
 	private ArrayList<String> imports;
 
 	public static ArrayList<String> createOnapImports() {
-		ArrayList<String> imps = new ArrayList<String>();
-		imps.add("http://www.getcloudify.org/spec/cloudify/3.4/types.yaml");
-		imps.add("https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml");
-		imps.add("https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/dcaepolicyplugin/2.4.0/dcaepolicyplugin_types.yaml");
+		ArrayList<String> imps = new ArrayList<>();
+		imps.add("https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml");
+		imps.add("plugin:k8splugin?version=3.4.2");
+		imps.add("plugin:dcaepolicyplugin?version=2.4.0");
 		return imps;
 	}
+
 	public static ArrayList<String> createDmaapImports(){
-		ArrayList<String> imps = new ArrayList<String>();
-		imps.add("http://www.getcloudify.org/spec/cloudify/3.4/types.yaml");
-		imps.add("https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R5/k8splugin/1.6.0/k8splugin_types.yaml");
-		imps.add("https://nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins/type_files/dmaap/dmaap.yaml");
+		ArrayList<String> imps = new ArrayList<>();
+		imps.add("https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml");
+		imps.add("plugin:k8splugin?version=3.4.2");
+		imps.add("plugin:dmaap?version=1.5.0");
 		return imps;
 	}
+
 	public static ArrayList<String> createImportsFromFile(String path) {
-		Imports imports = new 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);
 		}
-		ArrayList<String> imps = new ArrayList<String>();
-		for(String s: imports.getImports()) {
-			imps.add(s);
-		}
-		return imps;
 	}
 }