diff options
author | Remigiusz Janeczek <remigiusz.janeczek@nokia.com> | 2020-09-21 12:20:40 +0200 |
---|---|---|
committer | Remigiusz Janeczek <remigiusz.janeczek@nokia.com> | 2020-09-23 10:00:29 +0200 |
commit | 9daf8aa8049a347f1f8010071df73c663e4c3bbd (patch) | |
tree | 6ac08954a493cfa953af80c605ce019fa49941f8 /mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Imports.java | |
parent | 04ceefb1f221420c6e27c5aa73b8a574b0e79668 (diff) |
Restore test assertions. Update default plugin imports. Fix sonar
issues in bpgenerator models/componentspec package.
Issue-ID: DCAEGEN2-2449
Issue-ID: DCAEGEN2-2239
Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com>
Change-Id: I2b1a541adaa5873a8450cf6341a1f73d760c2d72
Diffstat (limited to 'mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Imports.java')
-rw-r--r-- | mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Imports.java | 24 |
1 files changed, 10 insertions, 14 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 139790a..4e7a4f1 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 @@ -41,21 +41,21 @@ 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(); + Imports imports; ObjectMapper importMapper = new ObjectMapper(new YAMLFactory().configure(YAMLGenerator.Feature.MINIMIZE_QUOTES, true)); File importPath = new File(path); try { @@ -63,10 +63,6 @@ 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; + return imports.getImports(); } } |