Adjust BP-gen to correctly support DFC component spec - types

[dcaegen2/platform.git] / mod / bpgenerator / src / main / java / org / onap / blueprintgenerator / models / dmaapbp / DmaapBlueprint.java

diff --git a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/dmaapbp/DmaapBlueprint.java b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/dmaapbp/DmaapBlueprint.java
index 2774abb..0c8f8a9 100644 (file)
--- a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/dmaapbp/DmaapBlueprint.java
+++ b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/dmaapbp/DmaapBlueprint.java
@@ -33,9 +33,12 @@ import org.onap.blueprintgenerator.models.componentspec.ComponentSpec;
 import org.onap.blueprintgenerator.models.componentspec.Publishes;
 import org.onap.blueprintgenerator.models.componentspec.Subscribes;
 
+import static org.onap.blueprintgenerator.common.blueprint.BlueprintHelper.isDataRouterType;
+import static org.onap.blueprintgenerator.common.blueprint.BlueprintHelper.isMessageRouterType;
 import static org.onap.blueprintgenerator.common.blueprint.BlueprintHelper.joinUnderscore;
 import static org.onap.blueprintgenerator.models.blueprint.Imports.createDmaapImports;
 import static org.onap.blueprintgenerator.models.blueprint.Imports.createImportsFromFile;
+import static org.onap.blueprintgenerator.models.blueprint.BpConstants.CLOUDIFY_DSL_1_3;
 
 public class DmaapBlueprint extends Blueprint {
 
@@ -46,7 +49,7 @@ public class DmaapBlueprint extends Blueprint {
         Blueprint blueprint = new Blueprint();
 
         //set tosca definition
-        blueprint.setTosca_definitions_version("cloudify_dsl_1_3");
+        blueprint.setTosca_definitions_version(CLOUDIFY_DSL_1_3);
 
         //set the description
         blueprint.setDescription(componentSpec.getSelf().getDescription());
@@ -74,12 +77,12 @@ public class DmaapBlueprint extends Blueprint {
         //go through the streams publishes
         if (componentSpec.getStreams().getPublishes() != null) {
             for (Publishes publisher : componentSpec.getStreams().getPublishes()) {
-                if (isMessageRouter(publisher.getType())) {
+                if (isMessageRouterType(publisher.getType())) {
                     String topic = joinUnderscore(publisher.getConfig_key(), TOPIC);
                     DmaapNode topicNode = new DmaapNode();
                     inps = topicNode.createTopicNode(componentSpec, inps, topic);
                     nodeTemplate.put(topic, topicNode);
-                } else if (isDataRouter(publisher.getType())) {
+                } else if (isDataRouterType(publisher.getType())) {
                     String feed = joinUnderscore(publisher.getConfig_key(), FEED);
                     DmaapNode feedNode = new DmaapNode();
                     inps = feedNode.createFeedNode(componentSpec, inps, feed);
@@ -90,12 +93,12 @@ public class DmaapBlueprint extends Blueprint {
         //go through the stream subscribes
         if (componentSpec.getStreams().getSubscribes() != null) {
             for (Subscribes subscriber : componentSpec.getStreams().getSubscribes()) {
-                if (isMessageRouter(subscriber.getType())) {
+                if (isMessageRouterType(subscriber.getType())) {
                     String topic = joinUnderscore(subscriber.getConfig_key(), TOPIC);
                     DmaapNode topicNode = new DmaapNode();
                     inps = topicNode.createTopicNode(componentSpec, inps, topic);
                     nodeTemplate.put(topic, topicNode);
-                } else if (isDataRouter(subscriber.getType())) {
+                } else if (isDataRouterType(subscriber.getType())) {
                     String feed = joinUnderscore(subscriber.getConfig_key(), FEED);
                     DmaapNode feedNode = new DmaapNode();
                     inps = feedNode.createFeedNode(componentSpec, inps, feed);
@@ -120,11 +123,4 @@ public class DmaapBlueprint extends Blueprint {
         return blueprint;
     }
 
-    private boolean isDataRouter(String type) {
-        return type.equals("data_router") || type.equals("data router");
-    }
-
-    private boolean isMessageRouter(String type) {
-        return type.equals("message_router") || type.equals("message router");
-    }
 }