Added the dmaap plugin changes needed

Added the dmaap plugin changes along with a few other changes (fixed
format by pressing backspace a lot)

Issue-ID: DCAEGEN2-1517
Change-Id: I9167b7001c5916686a04112771093b0ce6cc2cff
Signed-off-by: ms236b <ms236b@att.com>

1 files changed, 7 insertions, 6 deletions

diff --git a/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Imports.java b/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Imports.java
index e4cea63..8bcdbbc 100644
--- a/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Imports.java
+++ b/blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Imports.java
@@ -42,20 +42,23 @@ import lombok.NoArgsConstructor;
 @Getter @Setter
 @JsonInclude(value=Include.NON_NULL)
 public class Imports {
-	
 	/** The 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/R4/k8splugin/1.4.5/k8splugin_types.yaml");
 		imps.add("https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml");
-		
 		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");
+		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));
@@ -65,12 +68,10 @@ public class Imports {
 		} catch (IOException e) {
 			throw new RuntimeException(e);
 		}
-		
 		ArrayList<String> imps = new ArrayList<String>();
 		for(String s: imports.getImports()) {
 			imps.add(s);
 		}
-		
 		return imps;
 	}
 }