Apache Camel template simplified, test cases adjusted

Author: socadk

dsl-core/io.mdsl.cli/README.md

@@ -7,8 +7,8 @@ Once you built the project with Gradle by calling `./gradlew clean build` in the
 
 You can also download the CLI binaries here:
 
- * [mdsl-cli-5.4.6.tar](https://github.com/Microservice-API-Patterns/MDSL-Specification/releases/download/v5.4.6/mdsl-cli-mdsl-5.4.6.tar)
- * [mdsl-cli-5.4.6.zip](https://github.com/Microservice-API-Patterns/MDSL-Specification/releases/download/v5.4.6/mdsl-cli-mdsl-5.4.6.zip)
+ * [mdsl-cli-5.4.6.tar](https://github.com/socadk/MDSL/releases/download/v5.4.6/mdsl-cli-mdsl-5.4.6.tar)
+ * [mdsl-cli-5.4.6.zip](https://github.com/socadk/MDSL/releases/download/v5.4.6/mdsl-cli-mdsl-5.4.6.zip)
 
 1. Uncompress the ZIP or TAR file into a directory of your choice.
 2. Run the CLI by using the executable in the `bin` folder:

dsl-core/io.mdsl.tests/test-data/flowgenmodel-tests/apache-camel-configuration.java.ftl

@@ -88,21 +88,16 @@ public class ${oflow.name} extends RouteBuilder {
         // create a producer to send all initial events to the process flow
         ProducerTemplate template = camelContext.createProducerTemplate();
         String testMessage = "Test message for flow ${oflow.name} in ${genModel.apiName}";
-        <#if oflow.initEvents()??>
-        <#assign iecount=0>
         <#list oflow.initEvents() as ename, event>
-        <#assign iecount=iecount+1>
 		template.sendBody("direct:${ename}", testMessage);
         // TODO add header to message if flow contains a choice, example (replace "choice-nn" with names from flow):
         // template.sendBodyAndHeader("direct:${ename}", testMessage, "ChoiceCondition", "choiceValue"); 
     	</#list>
-        <#if iecount==0>
-        // flow might start with command (the ones coming from miro via CML do):
         <#list oflow.initCommands() as command>
         template.sendBody("direct:${command.name}", testMessage);
+        // TODO add header to testMessage if flow contains a choice, example (replace "choice-nn" with names from flow):
+        // template.sendBodyAndHeader("direct:${command.name}", testMessage, "ChoiceCondition", "choiceValue");
         </#list>
-        <#assign firstEndpoint=oflow.commands[0]>
-        <#else><#assign firstEndpoint=oflow.initEvents()?values[0]></#if></#if>
         camelContext.stop();
         camelContext.close();
     }

dsl-core/io.mdsl.tests/test-data/flowgenmodel-tests/esoad-blog-post.java

@@ -333,8 +333,9 @@ public void runWrite_Paper_WithInitCommand() throws Exception {
         // create a producer to send all initial events to the process flow
         ProducerTemplate template = camelContext.createProducerTemplate();
         String testMessage = "Test message for flow Write_Paper_WithInitCommand in EventStormingBoardContextAPI";
-        // flow might start with command (the ones coming from miro via CML do):
         template.sendBody("direct:Conduct_Research_Command", testMessage);
+        // TODO add header to testMessage if flow contains a choice, example (replace "choice-nn" with names from flow):
+        // template.sendBodyAndHeader("direct:Conduct_Research_Command", testMessage, "ChoiceCondition", "choiceValue");
         camelContext.stop();
         camelContext.close();
     }
@@ -495,7 +496,6 @@ public void runWrite_Paper_NoInitEventOrCommand() throws Exception {
         // create a producer to send all initial events to the process flow
         ProducerTemplate template = camelContext.createProducerTemplate();
         String testMessage = "Test message for flow Write_Paper_NoInitEventOrCommand in EventStormingBoardContextAPI";
-        // flow might start with command (the ones coming from miro via CML do):
         camelContext.stop();
         camelContext.close();
     }

dsl-core/io.mdsl.tests/test-data/flowgenmodel-tests/flowtest1-sequence.java

@@ -218,8 +218,9 @@ public void runSequentialFlowStartingWithCommand() throws Exception {
         // create a producer to send all initial events to the process flow
         ProducerTemplate template = camelContext.createProducerTemplate();
         String testMessage = "Test message for flow SequentialFlowStartingWithCommand in FlowTest1";
-        // flow might start with command (the ones coming from miro via CML do):
         template.sendBody("direct:FlowStep1", testMessage);
+        // TODO add header to testMessage if flow contains a choice, example (replace "choice-nn" with names from flow):
+        // template.sendBodyAndHeader("direct:FlowStep1", testMessage, "ChoiceCondition", "choiceValue");
         camelContext.stop();
         camelContext.close();
     }

dsl-core/io.mdsl.tests/test-data/flowgenmodel-tests/test-combinedsteps-and-alloperators.java

@@ -110,8 +110,9 @@ public void runTestFlowWithCombinedSteps() throws Exception {
         // create a producer to send all initial events to the process flow
         ProducerTemplate template = camelContext.createProducerTemplate();
         String testMessage = "Test message for flow TestFlowWithCombinedSteps in TestCombinedStepsAndAllOptionsBrief";
-        // flow might start with command (the ones coming from miro via CML do):
         template.sendBody("direct:c0", testMessage);
+        // TODO add header to testMessage if flow contains a choice, example (replace "choice-nn" with names from flow):
+        // template.sendBodyAndHeader("direct:c0", testMessage, "ChoiceCondition", "choiceValue");
         camelContext.stop();
         camelContext.close();
     }

dsl-core/io.mdsl/src/io/mdsl/validation/ChannelContractValidator.java

@@ -181,7 +181,7 @@ private void checkMissingParameterInChannelPathError(String channelName, Channel
 	@Check
 	public void checkDeliveryGuaranteeConsistency(ChannelContract channel){
 
-		// https://github.com/Microservice-API-Patterns/MDSL-Specification/issues/65
+		// https://github.com/socadk/MDSL/issues/65
 		// GUARANTEED_DELIVERY is only used in combination with the delivery guarantee set to AT_LEAST_ONCE or EXACTLY_ONCE
 
 		List<ChannelType> channelTypes = channel.getTypes();