From 403897151adfd785a14ad3568ba75b3010937307 Mon Sep 17 00:00:00 2001 From: ms236b Date: Fri, 19 Jul 2019 08:20:08 -0400 Subject: 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 --- .../onap/blueprintgenerator/models/blueprint/Imports.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'blueprint-generator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Imports.java') 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 imports; public static ArrayList createOnapImports() { ArrayList imps = new ArrayList(); - 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 createDmaapImports(){ + ArrayList imps = new ArrayList(); + 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 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 imps = new ArrayList(); for(String s: imports.getImports()) { imps.add(s); } - return imps; } } -- cgit 1.2.3-korg