Merge branch 'master' into feature/cml-saga-concept

.github/workflows/build_master.yml

@@ -1,4 +1,4 @@
-name: Build (master)
+name: Build & Publish Snapshots (master Branch)
 
 on:
   push:
@@ -9,6 +9,7 @@ on:
 
 jobs:
   build_standalone:
+    name: Build Standalone Libraries (DSL, LSP)
     if: startsWith(github.event.head_commit.message, '[Tycho]') == false && startsWith(github.event.head_commit.message, '[maven-release-plugin] prepare release v') == false
     runs-on: ubuntu-latest
 
@@ -37,6 +38,7 @@ jobs:
       uses: codecov/codecov-action@v1
 
   build_eclipse:
+    name: Build Eclipse Plugin
     if: startsWith(github.event.head_commit.message, '[Tycho]') == false && startsWith(github.event.head_commit.message, '[maven-release-plugin] prepare release v') == false
     runs-on: ubuntu-latest
 
@@ -61,6 +63,7 @@ jobs:
       run: ./mvnw clean verify
 
   publish_standalone_lib:
+    name: Publish Snapshots of Libraries (DSL Standalone Lib, LSP)
     if: startsWith(github.event.head_commit.message, '[Tycho]') == false && startsWith(github.event.head_commit.message, '[maven-release-plugin] prepare release v') == false
     runs-on: ubuntu-latest
 
@@ -103,6 +106,7 @@ jobs:
         OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
 
   publish_eclipse_snapshot:
+    name: Publish Snapshot of Eclipse Plugin (P2 repo)
     if: startsWith(github.event.head_commit.message, '[Tycho]') == false && startsWith(github.event.head_commit.message, '[maven-release-plugin] prepare release v') == false
     runs-on: ubuntu-latest
 

.github/workflows/build_standard.yml

@@ -1,4 +1,4 @@
-name: Build (standard)
+name: Build (non-master branch)
 
 on:
   push:
@@ -8,6 +8,7 @@ on:
 
 jobs:
   build_standalone:
+    name: Build Standalone Libraries (DSL, LSP)
     runs-on: ubuntu-latest
 
     steps:
@@ -35,6 +36,7 @@ jobs:
       uses: codecov/codecov-action@v1
 
   build_eclipse:
+    name: Build Eclipse Plugin
     runs-on: ubuntu-latest
 
     steps:

.github/workflows/release-trigger.yml

@@ -1,10 +1,11 @@
-name: Context Mapper Release Trigger
+name: Trigger Release (manual)
 
 on:
   workflow_dispatch:
 
 jobs:
   prepare_release:
+    name: Prepare Release
     runs-on: ubuntu-latest
 
     steps:

.github/workflows/release.yml

@@ -7,6 +7,7 @@ on:
 
 jobs:
   build_standalone:
+    name: Build Standalone Libraries (DSL, LSP)
     runs-on: ubuntu-latest
 
     steps:
@@ -34,6 +35,7 @@ jobs:
       uses: codecov/codecov-action@v1
 
   build_eclipse:
+    name: Build Eclipse Plugin
     runs-on: ubuntu-latest
 
     steps:
@@ -57,6 +59,7 @@ jobs:
       run: ./mvnw clean verify
 
   publish_standalone_lib:
+    name: Publish Libraries to Maven Central (DSL Standalone Lib, LSP)
     runs-on: ubuntu-latest
 
     needs:
@@ -98,6 +101,7 @@ jobs:
         OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
 
   publish_eclipse:
+    name: Publish Eclipse Plugin (P2 repo)
     runs-on: ubuntu-latest
 
     needs:

README.md

@@ -28,6 +28,8 @@ The Context Mapper project has originally been developed as part of research pro
 * Generate [graphical Context Maps](https://contextmapper.org/docs/context-map-generator/)
 * Generate [PlantUML](http://plantuml.com/) component diagram from context map
 * Generate [PlantUML](http://plantuml.com/) class diagram from bounded context and/or subdomain (tactic DDD)
+* Generate [PlantUML](http://plantuml.com/) state diagrams for aggregate states
+* Generate [PlantUML](http://plantuml.com/) use case diagrams
 * Generate [MDSL](https://socadk.github.io/MDSL/) (micro-) service contracts out of DDD context maps
 * Generate [generic text files](https://contextmapper.org/docs/generic-freemarker-generator/) using [Freemarker](https://freemarker.apache.org/) templates
 * Generate [ServiceCutter](https://github.com/ServiceCutter/ServiceCutter) input files for service decomposition proposals
@@ -62,15 +64,15 @@ If you want to use the Context Mapper DSL (CML) language and the generator tools
 
 **Gradle:**
 ```gradle
-implementation 'org.contextmapper:context-mapper-dsl:6.8.0'
+implementation 'org.contextmapper:context-mapper-dsl:6.9.0'
 ```
 
 **Maven:**
 ```xml
 <dependency>
   <groupId>org.contextmapper</groupId>
   <artifactId>context-mapper-dsl</artifactId>
-  <version>6.8.0</version>
+  <version>6.9.0</version>
 </dependency>
 ```
 In our [context-mapper-standalone-example](https://github.com/ContextMapper/context-mapper-standalone-example) repository you find an example project showing how to include the library within your project. It further contains code examples illustrating how to use the CML models and the generator tools (PlantUML, MDSL, etc.).

org.contextmapper.dsl.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.contextmapper.dsl.feature"
       label="Context Mapper DSL Editor"
-      version="6.8.1.qualifier"
+      version="6.9.1.qualifier"
       provider-name="Context Mapper Project Team"
       plugin="org.contextmapper.dsl.ui">
 

org.contextmapper.dsl.feature/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.contextmapper.dsl</groupId>
 		<artifactId>org.contextmapper.dsl.parent</artifactId>
-		<version>6.8.1-SNAPSHOT</version>
+		<version>6.9.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.contextmapper.dsl.feature</artifactId>
 	<packaging>eclipse-feature</packaging>

org.contextmapper.dsl.ide.tests/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Automatic-Module-Name: org.contextmapper.dsl.ide.tests
 Bundle-ManifestVersion: 2
 Bundle-Name: org.contextmapper.dsl.ide.tests
 Bundle-Vendor: Context Mapper
-Bundle-Version: 6.8.1.qualifier
+Bundle-Version: 6.9.1.qualifier
 Bundle-SymbolicName: org.contextmapper.dsl.ide.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.contextmapper.dsl,

org.contextmapper.dsl.ide.tests/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.contextmapper.dsl</groupId>
 		<artifactId>org.contextmapper.dsl.parent</artifactId>
-		<version>6.8.1-SNAPSHOT</version>
+		<version>6.9.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.contextmapper.dsl.ide.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>

org.contextmapper.dsl.ide/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Automatic-Module-Name: org.contextmapper.dsl.ide
 Bundle-ManifestVersion: 2
 Bundle-Name: org.contextmapper.dsl.ide
 Bundle-Vendor: Context Mapper
-Bundle-Version: 6.8.1.qualifier
+Bundle-Version: 6.9.1.qualifier
 Bundle-SymbolicName: org.contextmapper.dsl.ide; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.contextmapper.dsl,

org.contextmapper.dsl.ide/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.contextmapper.dsl</groupId>
 		<artifactId>org.contextmapper.dsl.parent</artifactId>
-		<version>6.8.1-SNAPSHOT</version>
+		<version>6.9.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.contextmapper.dsl.ide</artifactId>
 	<packaging>eclipse-plugin</packaging>

org.contextmapper.dsl.repository/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.contextmapper.dsl</groupId>
 		<artifactId>org.contextmapper.dsl.parent</artifactId>
-		<version>6.8.1-SNAPSHOT</version>
+		<version>6.9.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.contextmapper.dsl.repository</artifactId>
 	<packaging>eclipse-repository</packaging>

org.contextmapper.dsl.target/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.contextmapper.dsl</groupId>
 		<artifactId>org.contextmapper.dsl.parent</artifactId>
-		<version>6.8.1-SNAPSHOT</version>
+		<version>6.9.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.contextmapper.dsl.target</artifactId>
 	<packaging>eclipse-target-definition</packaging>

org.contextmapper.dsl.tests/META-INF/MANIFEST.MF

@@ -3,7 +3,7 @@ Automatic-Module-Name: org.contextmapper.dsl.tests
 Bundle-ManifestVersion: 2
 Bundle-Name: org.contextmapper.dsl.tests
 Bundle-Vendor: Context Mapper
-Bundle-Version: 6.8.1.qualifier
+Bundle-Version: 6.9.1.qualifier
 Bundle-SymbolicName: org.contextmapper.dsl.tests; singleton:=true
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.contextmapper.dsl,

org.contextmapper.dsl.tests/integ-test-files/generators/plantuml/use-case-interactions-sequence-diagram-generation-test-1.cml

@@ -0,0 +1,22 @@
+UseCase Get_paid_for_car_accident { // title
+  actor "Claimant" // primary actor
+  secondaryActors "Insurance Employee"
+  scope "Insurance company" // scope
+  level "Summary" // level
+  benefit "A claimant submits a claim and and gets paid from the insurance company." // story (brief summary)
+  interactions
+    "submit" a "Claim",                // step 1: claimant submits claim
+    "verifyExistanceOf" "Policy",      // step 2: insurance company verifies that valid policy exists
+    "assign" an "Agent" for a "Claim", // step 3: agent is assigned to claim
+    "verify" "Policy",                 // step 4: agent verifies all details are within policy guidelines
+    "pay" "Claimant",                  // step 5 (1): claimant gets paid
+    "close" "Claim"                    // step 5 (2): file/claim gets closed
+}
+
+UseCase Order_Offer_for_new_Insurance {
+	actor "Claimant"
+}
+
+UseCase Just_do_something {
+	actor "Chiller"
+}

org.contextmapper.dsl.tests/integ-test-files/generators/plantuml/use-case-interactions-sequence-diagram-generation-test-2.cml

@@ -0,0 +1,21 @@
+UseCase Get_paid_for_car_accident { // title
+  secondaryActors "Insurance Employee"
+  scope "Insurance company" // scope
+  level "Summary" // level
+  benefit "A claimant submits a claim and and gets paid from the insurance company." // story (brief summary)
+  interactions
+    "submit" a "Claim",                // step 1: claimant submits claim
+    "verifyExistanceOf" "Policy",      // step 2: insurance company verifies that valid policy exists
+    "assign" an "Agent" for a "Claim", // step 3: agent is assigned to claim
+    "verify" "Policy",                 // step 4: agent verifies all details are within policy guidelines
+    "pay" "Claimant",                  // step 5 (1): claimant gets paid
+    "close" "Claim"                    // step 5 (2): file/claim gets closed
+}
+
+UseCase Order_Offer_for_new_Insurance {
+	actor "Claimant"
+}
+
+UseCase Just_do_something {
+	actor "Chiller"
+}

org.contextmapper.dsl.tests/integ-test-files/generators/plantuml/use-case-interactions-sequence-diagram-generation-test-3.cml

@@ -0,0 +1,21 @@
+UseCase Get_paid_for_car_accident { // title
+  actor "Claimant" // primary actor
+  scope "Insurance company" // scope
+  level "Summary" // level
+  benefit "A claimant submits a claim and and gets paid from the insurance company." // story (brief summary)
+  interactions
+    "submit" a "Claim",                // step 1: claimant submits claim
+    "verifyExistanceOf" "Policy",      // step 2: insurance company verifies that valid policy exists
+    "assign" an "Agent" for a "Claim", // step 3: agent is assigned to claim
+    "verify" "Policy",                 // step 4: agent verifies all details are within policy guidelines
+    "pay" "Claimant",                  // step 5 (1): claimant gets paid
+    "close" "Claim"                    // step 5 (2): file/claim gets closed
+}
+
+UseCase Order_Offer_for_new_Insurance {
+	actor "Claimant"
+}
+
+UseCase Just_do_something {
+	actor "Chiller"
+}

org.contextmapper.dsl.tests/integ-test-files/generators/plantuml/use-case-interactions-sequence-diagram-generation-test-4.cml

@@ -0,0 +1,21 @@
+UseCase Get_paid_for_car_accident { // title
+  actor "Claimant" // primary actor
+  secondaryActors "Insurance Employee"
+  scope "Insurance company" // scope
+  level "Summary" // level
+  interactions
+    "submit" a "Claim",                // step 1: claimant submits claim
+    "verifyExistanceOf" "Policy",      // step 2: insurance company verifies that valid policy exists
+    "assign" an "Agent" for a "Claim", // step 3: agent is assigned to claim
+    "verify" "Policy",                 // step 4: agent verifies all details are within policy guidelines
+    "pay" "Claimant",                  // step 5 (1): claimant gets paid
+    "close" "Claim"                    // step 5 (2): file/claim gets closed
+}
+
+UseCase Order_Offer_for_new_Insurance {
+	actor "Claimant"
+}
+
+UseCase Just_do_something {
+	actor "Chiller"
+}

org.contextmapper.dsl.tests/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>org.contextmapper.dsl</groupId>
 		<artifactId>org.contextmapper.dsl.parent</artifactId>
-		<version>6.8.1-SNAPSHOT</version>
+		<version>6.9.1-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.contextmapper.dsl.tests</artifactId>
 	<packaging>eclipse-test-plugin</packaging>

org.contextmapper.dsl.tests/src/org/contextmapper/dsl/generators/plantuml/PlantUMLGeneratorTest.java

@@ -15,13 +15,12 @@
  */
 package org.contextmapper.dsl.generators.plantuml;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.io.IOException;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-
 import org.contextmapper.dsl.AbstractCMLInputFileTest;
 import org.contextmapper.dsl.contextMappingDSL.BoundedContext;
 import org.contextmapper.dsl.contextMappingDSL.ContextMap;
@@ -31,7 +30,6 @@
 import org.contextmapper.dsl.contextMappingDSL.Subdomain;
 import org.contextmapper.dsl.generator.PlantUMLGenerator;
 import org.contextmapper.dsl.generator.exception.GeneratorInputException;
-import org.contextmapper.dsl.generator.exception.NoContextMapDefinedException;
 import org.contextmapper.dsl.generators.mocks.ContextMappingModelResourceMock;
 import org.contextmapper.dsl.generators.mocks.IFileSystemAccess2Mock;
 import org.contextmapper.dsl.generators.mocks.IGeneratorContextMock;
@@ -168,6 +166,32 @@ void canCreateStateDiagram4AggregateIfAvailable() throws IOException {
 		// then
 		assertTrue(filesystem.getGeneratedFilesSet().contains("testmodel_BC_InsuranceQuotes_QuoteRequest_StateDiagram.puml"));
 	}
+
+	@Test
+	void canCreateUseCaseDiagram4UseCasesIfAvailable() throws IOException {
+		// given
+		ContextMappingModel model = getOriginalResourceOfTestCML("use-case-diagram-generation-test-1.cml").getContextMappingModel();
+
+		// when
+		IFileSystemAccess2Mock filesystem = new IFileSystemAccess2Mock();
+		this.generator.doGenerate(new ContextMappingModelResourceMock(model, "testmodel", "cml"), filesystem, new IGeneratorContextMock());
+
+		// then
+		assertTrue(filesystem.getGeneratedFilesSet().contains("testmodel_UseCases.puml"));
+	}
+
+	@Test
+	void canCreateSequenceDiagram4UseCaseInteractionsIfAvailable() throws IOException {
+		// given
+		ContextMappingModel model = getOriginalResourceOfTestCML("use-case-diagram-generation-test-1.cml").getContextMappingModel();
+
+		// when
+		IFileSystemAccess2Mock filesystem = new IFileSystemAccess2Mock();
+		this.generator.doGenerate(new ContextMappingModelResourceMock(model, "testmodel", "cml"), filesystem, new IGeneratorContextMock());
+
+		// then
+		assertTrue(filesystem.getGeneratedFilesSet().contains("testmodel_UseCase_Get_paid_for_car_accident_Interactions.puml"));
+	}
 
 	@Test
 	void expectExceptionForEmptyResource() {