Modify Runtime for new bpgen dependency

Modify Runtime core and web components to build with the new bpgen dependency

Issue-ID: DCAEGEN2-2091
Change-Id: Id9dac8f4cc24a39dac2dac8dce7a84b54c1e1229
Signed-off-by: Deven <dp023n@att.com>

4 files changed, 7 insertions, 7 deletions

diff --git a/mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/blueprint_creator/BlueprintCreatorOnapDublin.java b/mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/blueprint_creator/BlueprintCreatorOnap.java
index 2225971..c12b970 100644
--- a/mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/blueprint_creator/BlueprintCreatorOnapDublin.java
+++ b/mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/blueprint_creator/BlueprintCreatorOnap.java
@@ -25,7 +25,7 @@ import org.yaml.snakeyaml.Yaml;
 
 import java.util.Map;
 
-public class BlueprintCreatorOnapDublin implements BlueprintCreator{
+public class BlueprintCreatorOnap implements BlueprintCreator{
 
     private String topicUrl;
     private String importFilePath;
@@ -42,7 +42,7 @@ public class BlueprintCreatorOnapDublin implements BlueprintCreator{
     public String createBlueprint(String componentSpecString) {
         ComponentSpec componentSpec = new ComponentSpec();
         componentSpec.createComponentSpecFromString(componentSpecString);
-        Blueprint blueprint = new Blueprint().createBlueprint(componentSpec,"",'o',importFilePath);
+        Blueprint blueprint = new Blueprint().createBlueprint(componentSpec,"",'o',importFilePath,"");
         return blueprint.blueprintToString();
     }
 
diff --git a/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestFlowGraphParser.java b/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestFlowGraphParser.java
index 8412133..25e3e54 100644
--- a/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestFlowGraphParser.java
+++ b/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestFlowGraphParser.java
@@ -26,7 +26,7 @@ import org.junit.Rule;
 import org.junit.rules.TemporaryFolder;
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
-import org.onap.dcae.runtime.core.blueprint_creator.BlueprintCreatorOnapDublin;
+import org.onap.dcae.runtime.core.blueprint_creator.BlueprintCreatorOnap;
 
 public class TestFlowGraphParser {
 
@@ -47,7 +47,7 @@ public class TestFlowGraphParser {
         }
         FlowGraph<Node, Edge> mainFlowGraph = new FlowGraph<>("1234", "nifi-main", true, "mock graph");
         mainFlowGraph.addNode(new Node("dummy_id", "dummy_name", "dummy_compspec"));
-        BlueprintCreatorOnapDublin bcod = new BlueprintCreatorOnapDublin();
+        BlueprintCreatorOnap bcod = new BlueprintCreatorOnap();
         bcod.setTopicUrl("u.r.l");
         bcod.setImportFilePath(importsfile.getAbsolutePath());
         FlowGraphParser flowGraphParser = new FlowGraphParser(bcod);
diff --git a/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestIntegeration.java b/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestIntegeration.java
index 612f9f0..615993a 100644
--- a/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestIntegeration.java
+++ b/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestIntegeration.java
@@ -21,7 +21,7 @@ import org.onap.dcae.runtime.core.blueprint_creator.BlueprintCreator;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.onap.dcae.runtime.core.blueprint_creator.BlueprintCreatorOnapDublin;
+import org.onap.dcae.runtime.core.blueprint_creator.BlueprintCreatorOnap;
 
 public class TestIntegeration {
 
@@ -33,7 +33,7 @@ public class TestIntegeration {
         FlowGraph<Node, Edge> flowGraph = Helper.prepareFlowGraph();
 
         //2. Inject graph in FlowGraphParser
-        BlueprintCreator blueprintCreator = new BlueprintCreatorOnapDublin();
+        BlueprintCreator blueprintCreator = new BlueprintCreatorOnap();
         flowGraphParser = new FlowGraphParser(blueprintCreator);
         flowGraphParser.parse(flowGraph);
     }
diff --git a/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestOnapBpGen.java b/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestOnapBpGen.java
index f717022..60ba323 100644
--- a/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestOnapBpGen.java
+++ b/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestOnapBpGen.java
@@ -29,7 +29,7 @@ public class TestOnapBpGen {
         componentSpec.createComponentSpecFromString(Helper.loadFileContent(
                 "src/test/data/compspecs/componentSpec_hello_world_only_MR.json"));
 
-        Blueprint bp = new Blueprint().createBlueprint(componentSpec,"",'d',"");
+        Blueprint bp = new Blueprint().createBlueprint(componentSpec,"",'d',"","");
         System.out.println(bp.getInputs());
     }
 }