Skip to content

Commit 45b32c3

Browse files
stefan-kastefan-ka
authored
Final JEDi adjustments (#360)
1 parent 98a3a62 commit 45b32c3

File tree

11 files changed

+220
-104
lines changed

11 files changed

+220
-104
lines changed

‎org.contextmapper.dsl.tests/src/org/contextmapper/dsl/generators/plantuml/PlantUMLStakeholderDiagramCreatorTest.java

+79-61
Original file line numberDiff line numberDiff line change
@@ -43,28 +43,34 @@ public void canCreateStakeholderDiagramWithContext() throws IOException {
4343
// then
4444
assertEquals("@startmindmap" + System.lineSeparator()
4545
+ System.lineSeparator()
46+
+ "<style>" + System.lineSeparator()
47+
+ "node {" + System.lineSeparator()
48+
+ " MaximumWidth 300" + System.lineSeparator()
49+
+ "}" + System.lineSeparator()
50+
+ "</style>" + System.lineSeparator()
51+
+ "" + System.lineSeparator()
4652
+ "* SameDayDelivery" + System.lineSeparator()
47-
+ "** Product_Suppliers" + System.lineSeparator()
48-
+ "*** Managers" + System.lineSeparator()
49-
+ "*** Logistics_Warehouse_Staff_of_Suppliers" + System.lineSeparator()
50-
+ "*** Delivery_Staff_of_Suppliers" + System.lineSeparator()
51-
+ "** Competing_Companies" + System.lineSeparator()
52-
+ "** Government" + System.lineSeparator()
53+
+ "** <b>Product_Suppliers</b>" + System.lineSeparator()
54+
+ "*** <b>Managers</b>" + System.lineSeparator()
55+
+ "*** <b>Logistics_Warehouse_Staff_of_Suppliers</b>" + System.lineSeparator()
56+
+ "*** <b>Delivery_Staff_of_Suppliers</b>" + System.lineSeparator()
57+
+ "** <b>Competing_Companies</b>" + System.lineSeparator()
58+
+ "** <b>Government</b>" + System.lineSeparator()
5359
+ System.lineSeparator()
54-
+ "left side" + System.lineSeparator()
55-
+ "** Online_Shopping_Company" + System.lineSeparator()
56-
+ "*** Development_Team" + System.lineSeparator()
57-
+ "*** Product_Management" + System.lineSeparator()
58-
+ "*** Customer_Relationship_Manager" + System.lineSeparator()
59-
+ "** Delivery_Partners" + System.lineSeparator()
60-
+ "*** Route_Planners" + System.lineSeparator()
61-
+ "*** Drivers" + System.lineSeparator()
62-
+ "** Logistics_Team" + System.lineSeparator()
63-
+ "*** Logistics_Manager" + System.lineSeparator()
64-
+ "*** Warehouse_Staff" + System.lineSeparator()
65-
+ "** Customers_and_Shoppers" + System.lineSeparator()
66-
+ "*** Shoppers_in_Emergency_Situations" + System.lineSeparator()
67-
+ "*** Others" + System.lineSeparator()
60+
+ "left side" + System.lineSeparator()
61+
+ "** <b>Online_Shopping_Company</b>" + System.lineSeparator()
62+
+ "*** <b>Development_Team</b>" + System.lineSeparator()
63+
+ "*** <b>Product_Management</b>" + System.lineSeparator()
64+
+ "*** <b>Customer_Relationship_Manager</b>" + System.lineSeparator()
65+
+ "** <b>Delivery_Partners</b>" + System.lineSeparator()
66+
+ "*** <b>Route_Planners</b>" + System.lineSeparator()
67+
+ "*** <b>Drivers</b>" + System.lineSeparator()
68+
+ "** <b>Logistics_Team</b>" + System.lineSeparator()
69+
+ "*** <b>Logistics_Manager</b>" + System.lineSeparator()
70+
+ "*** <b>Warehouse_Staff</b>" + System.lineSeparator()
71+
+ "** <b>Customers_and_Shoppers</b>" + System.lineSeparator()
72+
+ "*** <b>Shoppers_in_Emergency_Situations</b>" + System.lineSeparator()
73+
+ "*** <b>Others</b>" + System.lineSeparator()
6874
+ System.lineSeparator()
6975
+ System.lineSeparator()
7076
+ "@endmindmap" + System.lineSeparator(), stakeholderDiagram);
@@ -81,28 +87,34 @@ public void canCreateStakeholderDiagramWithMultipleContext() throws IOException
8187
// then
8288
assertEquals("@startmindmap" + System.lineSeparator()
8389
+ System.lineSeparator()
84-
+ "* SameDayDelivery, Context2" + System.lineSeparator()
85-
+ "** Product_Suppliers" + System.lineSeparator()
86-
+ "*** Managers" + System.lineSeparator()
87-
+ "*** Logistics_Warehouse_Staff_of_Suppliers" + System.lineSeparator()
88-
+ "*** Delivery_Staff_of_Suppliers" + System.lineSeparator()
89-
+ "** Competing_Companies" + System.lineSeparator()
90-
+ "** Government" + System.lineSeparator()
90+
+ "<style>" + System.lineSeparator()
91+
+ "node {" + System.lineSeparator()
92+
+ " MaximumWidth 300" + System.lineSeparator()
93+
+ "}" + System.lineSeparator()
94+
+ "</style>" + System.lineSeparator()
9195
+ System.lineSeparator()
92-
+ "left side" + System.lineSeparator()
93-
+ "** Online_Shopping_Company" + System.lineSeparator()
94-
+ "*** Development_Team" + System.lineSeparator()
95-
+ "*** Product_Management" + System.lineSeparator()
96-
+ "*** Customer_Relationship_Manager" + System.lineSeparator()
97-
+ "** Delivery_Partners" + System.lineSeparator()
98-
+ "*** Route_Planners" + System.lineSeparator()
99-
+ "*** Drivers" + System.lineSeparator()
100-
+ "** Logistics_Team" + System.lineSeparator()
101-
+ "*** Logistics_Manager" + System.lineSeparator()
102-
+ "*** Warehouse_Staff" + System.lineSeparator()
103-
+ "** Customers_and_Shoppers" + System.lineSeparator()
104-
+ "*** Shoppers_in_Emergency_Situations" + System.lineSeparator()
105-
+ "*** Others" + System.lineSeparator()
96+
+ "* SameDayDelivery, Context2" + System.lineSeparator()
97+
+ "** <b>Product_Suppliers</b>" + System.lineSeparator()
98+
+ "*** <b>Managers</b>" + System.lineSeparator()
99+
+ "*** <b>Logistics_Warehouse_Staff_of_Suppliers</b>" + System.lineSeparator()
100+
+ "*** <b>Delivery_Staff_of_Suppliers</b>" + System.lineSeparator()
101+
+ "** <b>Competing_Companies</b>" + System.lineSeparator()
102+
+ "** <b>Government</b>" + System.lineSeparator()
103+
+ "" + System.lineSeparator()
104+
+ "left side" + System.lineSeparator()
105+
+ "** <b>Online_Shopping_Company</b>" + System.lineSeparator()
106+
+ "*** <b>Development_Team</b>" + System.lineSeparator()
107+
+ "*** <b>Product_Management</b>" + System.lineSeparator()
108+
+ "*** <b>Customer_Relationship_Manager</b>" + System.lineSeparator()
109+
+ "** <b>Delivery_Partners</b>" + System.lineSeparator()
110+
+ "*** <b>Route_Planners</b>" + System.lineSeparator()
111+
+ "*** <b>Drivers</b>" + System.lineSeparator()
112+
+ "** <b>Logistics_Team</b>" + System.lineSeparator()
113+
+ "*** <b>Logistics_Manager</b>" + System.lineSeparator()
114+
+ "*** <b>Warehouse_Staff</b>" + System.lineSeparator()
115+
+ "** <b>Customers_and_Shoppers</b>" + System.lineSeparator()
116+
+ "*** <b>Shoppers_in_Emergency_Situations</b>" + System.lineSeparator()
117+
+ "*** <b>Others</b>" + System.lineSeparator()
106118
+ System.lineSeparator()
107119
+ System.lineSeparator()
108120
+ "@endmindmap" + System.lineSeparator(), stakeholderDiagram);
@@ -118,29 +130,35 @@ public void canCreateStakeholderDiagramWithDefaultContext() throws IOException {
118130

119131
// then
120132
assertEquals("@startmindmap" + System.lineSeparator()
133+
+ System.lineSeparator()
134+
+ "<style>" + System.lineSeparator()
135+
+ "node {" + System.lineSeparator()
136+
+ " MaximumWidth 300" + System.lineSeparator()
137+
+ "}" + System.lineSeparator()
138+
+ "</style>" + System.lineSeparator()
121139
+ System.lineSeparator()
122140
+ "* System of Interest" + System.lineSeparator()
123-
+ "** Product_Suppliers" + System.lineSeparator()
124-
+ "*** Managers" + System.lineSeparator()
125-
+ "*** Logistics_Warehouse_Staff_of_Suppliers" + System.lineSeparator()
126-
+ "*** Delivery_Staff_of_Suppliers" + System.lineSeparator()
127-
+ "** Competing_Companies" + System.lineSeparator()
128-
+ "** Government" + System.lineSeparator()
141+
+ "** <b>Product_Suppliers</b>" + System.lineSeparator()
142+
+ "*** <b>Managers</b>" + System.lineSeparator()
143+
+ "*** <b>Logistics_Warehouse_Staff_of_Suppliers</b>" + System.lineSeparator()
144+
+ "*** <b>Delivery_Staff_of_Suppliers</b>" + System.lineSeparator()
145+
+ "** <b>Competing_Companies</b>" + System.lineSeparator()
146+
+ "** <b>Government</b>" + System.lineSeparator()
129147
+ System.lineSeparator()
130-
+ "left side" + System.lineSeparator()
131-
+ "** Online_Shopping_Company" + System.lineSeparator()
132-
+ "*** Development_Team" + System.lineSeparator()
133-
+ "*** Product_Management" + System.lineSeparator()
134-
+ "*** Customer_Relationship_Manager" + System.lineSeparator()
135-
+ "** Delivery_Partners" + System.lineSeparator()
136-
+ "*** Route_Planners" + System.lineSeparator()
137-
+ "*** Drivers" + System.lineSeparator()
138-
+ "** Logistics_Team" + System.lineSeparator()
139-
+ "*** Logistics_Manager" + System.lineSeparator()
140-
+ "*** Warehouse_Staff" + System.lineSeparator()
141-
+ "** Customers_and_Shoppers" + System.lineSeparator()
142-
+ "*** Shoppers_in_Emergency_Situations" + System.lineSeparator()
143-
+ "*** Others" + System.lineSeparator()
148+
+ "left side" + System.lineSeparator()
149+
+ "** <b>Online_Shopping_Company</b>" + System.lineSeparator()
150+
+ "*** <b>Development_Team</b>" + System.lineSeparator()
151+
+ "*** <b>Product_Management</b>" + System.lineSeparator()
152+
+ "*** <b>Customer_Relationship_Manager</b>" + System.lineSeparator()
153+
+ "** <b>Delivery_Partners</b>" + System.lineSeparator()
154+
+ "*** <b>Route_Planners</b>" + System.lineSeparator()
155+
+ "*** <b>Drivers</b>" + System.lineSeparator()
156+
+ "** <b>Logistics_Team</b>" + System.lineSeparator()
157+
+ "*** <b>Logistics_Manager</b>" + System.lineSeparator()
158+
+ "*** <b>Warehouse_Staff</b>" + System.lineSeparator()
159+
+ "** <b>Customers_and_Shoppers</b>" + System.lineSeparator()
160+
+ "*** <b>Shoppers_in_Emergency_Situations</b>" + System.lineSeparator()
161+
+ "*** <b>Others</b>" + System.lineSeparator()
144162
+ System.lineSeparator()
145163
+ System.lineSeparator()
146164
+ "@endmindmap" + System.lineSeparator(), stakeholderDiagram);

‎org.contextmapper.dsl.tests/src/org/contextmapper/dsl/generators/plantuml/PlantUMLUseCaseDiagramCreatorTest.java

+26-7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 The Context Mapper Project Team
2+
* Copyright 2023-2024 The Context Mapper Project Team
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -58,9 +58,15 @@ public void canCreateUseCaseDiagram() throws IOException {
5858
+ "Actor_1 -- Just_do_something" + System.lineSeparator()
5959
+ System.lineSeparator()
6060
+ "note bottom of (Get_paid_for_car_accident)" + System.lineSeparator()
61-
+ " //Benefit:// A claimant submits a claim and and gets paid from the insurance company." + System.lineSeparator()
62-
+ " //Level:// Summary" + System.lineSeparator()
6361
+ " //Scope:// Insurance company" + System.lineSeparator()
62+
+ " //Level:// Summary" + System.lineSeparator()
63+
+ " //Feature:// submit a Claim" + System.lineSeparator()
64+
+ " //Feature:// verifyExistanceOf Policy" + System.lineSeparator()
65+
+ " //Feature:// assign an Agent for a Claim" + System.lineSeparator()
66+
+ " //Feature:// verify Policy" + System.lineSeparator()
67+
+ " //Feature:// pay Claimant" + System.lineSeparator()
68+
+ " //Feature:// close Claim" + System.lineSeparator()
69+
+ " //Benefit:// A claimant submits a claim and and gets paid from the insurance company." + System.lineSeparator()
6470
+ "end note"
6571
+ System.lineSeparator()
6672
+ System.lineSeparator()
@@ -98,9 +104,15 @@ public void canCreateUseCaseDiagramWithSecondaryActors() throws IOException {
98104
+ "Get_paid_for_car_accident -- Actor_2" + System.lineSeparator()
99105
+ System.lineSeparator()
100106
+ "note bottom of (Get_paid_for_car_accident)" + System.lineSeparator()
101-
+ " //Benefit:// A claimant submits a claim and and gets paid from the insurance company." + System.lineSeparator()
102-
+ " //Level:// Summary" + System.lineSeparator()
103107
+ " //Scope:// Insurance company" + System.lineSeparator()
108+
+ " //Level:// Summary" + System.lineSeparator()
109+
+ " //Feature:// submit a Claim" + System.lineSeparator()
110+
+ " //Feature:// verifyExistanceOf Policy" + System.lineSeparator()
111+
+ " //Feature:// assign an Agent for a Claim" + System.lineSeparator()
112+
+ " //Feature:// verify Policy" + System.lineSeparator()
113+
+ " //Feature:// pay Claimant" + System.lineSeparator()
114+
+ " //Feature:// close Claim" + System.lineSeparator()
115+
+ " //Benefit:// A claimant submits a claim and and gets paid from the insurance company." + System.lineSeparator()
104116
+ "end note"
105117
+ System.lineSeparator()
106118
+ System.lineSeparator()
@@ -134,11 +146,18 @@ public void canCreateUseCaseDiagramForMixedUseCasesAndUserStories() throws IOExc
134146
+ "Actor_1 -- Just_do_something" + System.lineSeparator()
135147
+ System.lineSeparator()
136148
+ "note bottom of (Get_paid_for_car_accident)" + System.lineSeparator()
137-
+ " //Benefit:// A claimant submits a claim and and gets paid from the insurance company." + System.lineSeparator()
138-
+ " //Level:// Summary" + System.lineSeparator()
139149
+ " //Scope:// Insurance company" + System.lineSeparator()
150+
+ " //Level:// Summary" + System.lineSeparator()
151+
+ " //Feature:// submit a Claim" + System.lineSeparator()
152+
+ " //Feature:// verifyExistanceOf Policy" + System.lineSeparator()
153+
+ " //Feature:// assign an Agent for a Claim" + System.lineSeparator()
154+
+ " //Feature:// verify Policy" + System.lineSeparator()
155+
+ " //Feature:// pay Claimant" + System.lineSeparator()
156+
+ " //Feature:// close Claim" + System.lineSeparator()
157+
+ " //Benefit:// A claimant submits a claim and and gets paid from the insurance company." + System.lineSeparator()
140158
+ "end note" + System.lineSeparator()
141159
+ "note bottom of (Just_do_something)" + System.lineSeparator()
160+
+ " //Feature:// do Nothing" + System.lineSeparator()
142161
+ " //Benefit:// I earn my name" + System.lineSeparator()
143162
+ "end note"
144163
+ System.lineSeparator()

‎org.contextmapper.dsl.tests/src/org/contextmapper/dsl/generators/plantuml/PlantUMLValueImpactMapDiagramCreatorTest.java

+16-4
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ public void canCreateValueImpactMapDiagramDiagramWithoutBoundedContext() throws
5252
+ " .green {" + System.lineSeparator()
5353
+ " BackgroundColor lightgreen" + System.lineSeparator()
5454
+ " }" + System.lineSeparator()
55+
+ " .yellow {" + System.lineSeparator()
56+
+ " BackgroundColor gold" + System.lineSeparator()
57+
+ " }" + System.lineSeparator()
5558
+ " .red {" + System.lineSeparator()
5659
+ " BackgroundColor tomato" + System.lineSeparator()
5760
+ " }" + System.lineSeparator()
@@ -63,10 +66,7 @@ public void canCreateValueImpactMapDiagramDiagramWithoutBoundedContext() throws
6366
+ "<b>System of Interest (SOI)</b>;" + System.lineSeparator()
6467
+ "** <b>Drivers</b>" + System.lineSeparator()
6568
+ "***:<b>WorkLifeBalance</b>" + System.lineSeparator()
66-
+ "----" + System.lineSeparator()
67-
+ "Priority HIGH" + System.lineSeparator()
68-
+ "Impact HIGH" + System.lineSeparator()
69-
+ ";" + System.lineSeparator()
69+
+ "; <<yellow>>" + System.lineSeparator()
7070
+ "@endmindmap" + System.lineSeparator(), valueImpactMapDiagram);
7171
}
7272

@@ -90,6 +90,9 @@ public void canCreateSimpleValueImpactMapDiagram() throws IOException {
9090
+ " .green {" + System.lineSeparator()
9191
+ " BackgroundColor lightgreen" + System.lineSeparator()
9292
+ " }" + System.lineSeparator()
93+
+ " .yellow {" + System.lineSeparator()
94+
+ " BackgroundColor gold" + System.lineSeparator()
95+
+ " }" + System.lineSeparator()
9396
+ " .red {" + System.lineSeparator()
9497
+ " BackgroundColor tomato" + System.lineSeparator()
9598
+ " }" + System.lineSeparator()
@@ -133,6 +136,9 @@ public void canCreateSimpleValueImpactMapDiagram4ValueCluster() throws IOExcepti
133136
+ " .green {" + System.lineSeparator()
134137
+ " BackgroundColor lightgreen" + System.lineSeparator()
135138
+ " }" + System.lineSeparator()
139+
+ " .yellow {" + System.lineSeparator()
140+
+ " BackgroundColor gold" + System.lineSeparator()
141+
+ " }" + System.lineSeparator()
136142
+ " .red {" + System.lineSeparator()
137143
+ " BackgroundColor tomato" + System.lineSeparator()
138144
+ " }" + System.lineSeparator()
@@ -176,6 +182,9 @@ public void canRespectValuesInValueClusters() throws IOException {
176182
+ " .green {" + System.lineSeparator()
177183
+ " BackgroundColor lightgreen" + System.lineSeparator()
178184
+ " }" + System.lineSeparator()
185+
+ " .yellow {" + System.lineSeparator()
186+
+ " BackgroundColor gold" + System.lineSeparator()
187+
+ " }" + System.lineSeparator()
179188
+ " .red {" + System.lineSeparator()
180189
+ " BackgroundColor tomato" + System.lineSeparator()
181190
+ " }" + System.lineSeparator()
@@ -231,6 +240,9 @@ public void canHandleRecurringStakeholders() throws IOException {
231240
+ " .green {" + System.lineSeparator()
232241
+ " BackgroundColor lightgreen" + System.lineSeparator()
233242
+ " }" + System.lineSeparator()
243+
+ " .yellow {" + System.lineSeparator()
244+
+ " BackgroundColor gold" + System.lineSeparator()
245+
+ " }" + System.lineSeparator()
234246
+ " .red {" + System.lineSeparator()
235247
+ " BackgroundColor tomato" + System.lineSeparator()
236248
+ " }" + System.lineSeparator()

‎org.contextmapper.dsl.ui/samples/freemarker/csv-files/stakeholders.csv.ftl

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ Context,Stakeholder Group,Stakeholder,description,influence,interest
22
<#list stakeholders as stakeholderContainer>
33
<#assign stakeholderGroups = stakeholderContainer.stakeholders?filter(s -> instanceOf(s, StakeholderGroup))>
44
<#assign singleStakeholders = stakeholderContainer.stakeholders?filter(s -> instanceOf(s, Stakeholder))>
5-
<#if stakeholderContainer.contexts?has_content><#assign contextDescription = stakeholderContainer.contexts?map(c -> c.name)?join("; ")><#else><#assign contextDescription = ""></#if>
5+
<#if stakeholderContainer.contexts?has_content><#assign contextDescription = stakeholderContainer.contexts?map(c -> c.name)?join("; ")><#else><#assign contextDescription = "none"></#if>
66
<#list stakeholderGroups as sg>
77
<#list sg.stakeholders as stakeholder>
88
${contextDescription},${sg.name},${stakeholder.name},${stakeholder.description!""},${stakeholder.influence!""},${stakeholder.interest!""}
99
</#list>
1010
</#list>
1111
<#list singleStakeholders as stakeholder>
12-
${contextDescription},,${stakeholder.name},${stakeholder.description!""},${stakeholder.influence!""},${stakeholder.interest!""}
12+
${contextDescription},none,${stakeholder.name},${stakeholder.description!""},${stakeholder.influence!""},${stakeholder.interest!""}
1313
</#list>
1414
</#list>

0 commit comments

Comments
 (0)