This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 42901cc780 Bump structurizr-core from 1.6.2 to 1.16.1
42901cc780 is described below
commit 42901cc780291576d27736c28c625a6f61ff5b9b
Author: Andi Huber <[email protected]>
AuthorDate: Wed Nov 16 08:06:47 2022 +0100
Bump structurizr-core from 1.6.2 to 1.16.1
---
.../apache/causeway/tooling/c4/test/C4Test.java | 58 +++++++++++-----------
.../tooling/c4/test/baeldung-example-v2.puml | 10 ++--
tooling/pom.xml | 5 +-
3 files changed, 37 insertions(+), 36 deletions(-)
diff --git
a/tooling/c4modeling/src/test/java/org/apache/causeway/tooling/c4/test/C4Test.java
b/tooling/c4modeling/src/test/java/org/apache/causeway/tooling/c4/test/C4Test.java
index ac89df261b..fb9fbfbb2d 100644
---
a/tooling/c4modeling/src/test/java/org/apache/causeway/tooling/c4/test/C4Test.java
+++
b/tooling/c4modeling/src/test/java/org/apache/causeway/tooling/c4/test/C4Test.java
@@ -53,14 +53,14 @@ class C4Test {
*/
@Test
void testStructurizr_native() throws IOException {
-
+
// First, we need to create a Workspace and a Model:
-
+
val workspace = new Workspace("Payment Gateway", "Payment Gateway");
val model = workspace.getModel();
-
+
// We also define a user and two software systems within that model:
-
+
Person user = model.addPerson("Merchant", "Merchant");
SoftwareSystem paymentTerminal = model
.addSoftwareSystem("Payment Terminal", "Payment Terminal");
@@ -68,63 +68,63 @@ class C4Test {
SoftwareSystem fraudDetector = model
.addSoftwareSystem("Fraud Detector", "Fraud Detector");
paymentTerminal.uses(fraudDetector, "Obtains fraud score");
-
+
// Now that our system is defined, we can create a view
- // Here we created a view that includes all software systems and
persons.
-
+ // Here we created a view that includes all software systems and
persons.
+
val viewSet = workspace.getViews();
-
+
SystemContextView contextView = viewSet
.createSystemContextView(paymentTerminal, "context", "Payment
Gateway Diagram");
contextView.addAllSoftwareSystems();
contextView.addAllPeople();
-
+
// Now the view needs to be rendered.
-
+
val stringWriter = new StringWriter();
val plantUMLWriter = new BasicPlantUMLWriter();
plantUMLWriter.write(workspace, stringWriter);
-
+
_Text.assertTextEquals(
- _Text.readLinesFromResource(this.getClass(),
"baeldung-example-v1.puml", StandardCharsets.UTF_8),
+ _Text.readLinesFromResource(this.getClass(),
"baeldung-example-v1.puml", StandardCharsets.UTF_8),
stringWriter.toString());
}
-
+
/**
* see https://www.baeldung.com/structurizr
*/
@Test
void testStructurizr_usingFactory() throws IOException {
-
+
val c4 = C4.of("Payment Gateway", "Payment Gateway");
-
+
// We also define a user and two software systems within that model:
-
+
Person user = c4.person("Merchant", "Merchant");
SoftwareSystem paymentTerminal = c4.softwareSystem("Payment Terminal",
"Payment Terminal");
SoftwareSystem fraudDetector = c4.softwareSystem("Fraud Detector",
"Fraud Detector");
-
- user.uses(paymentTerminal, "Makes payment");
+
+ user.uses(paymentTerminal, "Makes payment");
paymentTerminal.uses(fraudDetector, "Obtains fraud score");
-
+
// Now that our system is defined, we can create a view
- // Here we created a view that includes all software systems and
persons.
-
+ // Here we created a view that includes all software systems and
persons.
+
SystemContextView contextView = c4.systemContextView(paymentTerminal,
"context", "Payment Gateway Diagram");
contextView.addAllSoftwareSystems();
contextView.addAllPeople();
-
+
// Now the view needs to be rendered.
-
+
val plantUmlSource = c4.toPlantUML(contextView);
-
- // System.out.println(plantUmlSource); //debug
-
+
+ System.out.println(plantUmlSource); //debug
+
_Text.assertTextEquals(
- _Text.readLinesFromResource(this.getClass(),
"baeldung-example-v2.puml", StandardCharsets.UTF_8),
+ _Text.readLinesFromResource(this.getClass(),
"baeldung-example-v2.puml", StandardCharsets.UTF_8),
plantUmlSource);
-
+
}
-
+
}
diff --git
a/tooling/c4modeling/src/test/resources/org/apache/causeway/tooling/c4/test/baeldung-example-v2.puml
b/tooling/c4modeling/src/test/resources/org/apache/causeway/tooling/c4/test/baeldung-example-v2.puml
index 33fdad1cd5..4e5563f83d 100644
---
a/tooling/c4modeling/src/test/resources/org/apache/causeway/tooling/c4/test/baeldung-example-v2.puml
+++
b/tooling/c4modeling/src/test/resources/org/apache/causeway/tooling/c4/test/baeldung-example-v2.puml
@@ -13,21 +13,21 @@ hide stereotype
skinparam rectangle<<1>> {
BackgroundColor #08427b
FontColor #ffffff
- BorderColor #052E56
+ BorderColor #052e56
}
skinparam rectangle<<2>> {
BackgroundColor #dddddd
FontColor #fffffe
- BorderColor #9A9A9A
+ BorderColor #9a9a9a
}
skinparam rectangle<<3>> {
BackgroundColor #dddddd
FontColor #fffffe
- BorderColor #9A9A9A
+ BorderColor #9a9a9a
}
rectangle "==Merchant\n<size:10>[Person]</size>\n\nMerchant" <<1>> as 1
rectangle "==Fraud Detector\n<size:10>[Software System]</size>\n\nFraud
Detector" <<3>> as 3
rectangle "==Payment Terminal\n<size:10>[Software System]</size>\n\nPayment
Terminal" <<2>> as 2
-1 .[#707070].> 2 : "Makes payment"
-2 .[#707070].> 3 : "Obtains fraud score"
+1 .[#707070,thickness=2].> 2 : "Makes payment"
+2 .[#707070,thickness=2].> 3 : "Obtains fraud score"
@enduml
\ No newline at end of file
diff --git a/tooling/pom.xml b/tooling/pom.xml
index b225240518..a15ee2fbbc 100644
--- a/tooling/pom.xml
+++ b/tooling/pom.xml
@@ -42,7 +42,8 @@
<gradle-tooling.version>7.1.1</gradle-tooling.version>
<maven-model-builder.version>3.8.6</maven-model-builder.version>
<picocli.version>4.7.0</picocli.version>
- <structurizr.version>1.6.2</structurizr.version>
+ <structurizr.version>1.16.1</structurizr.version>
+
<structurizr-plantuml.version>1.6.3</structurizr-plantuml.version>
</properties>
@@ -244,7 +245,7 @@
<dependency>
<groupId>com.structurizr</groupId>
<artifactId>structurizr-plantuml</artifactId>
- <version>${structurizr.version}</version>
+
<version>${structurizr-plantuml.version}</version>
</dependency>
</dependencies>
