From 39bf3d0890afc4caa52cf3302269a12fc2a4236b Mon Sep 17 00:00:00 2001 From: Simon Brown Date: Sat, 23 Mar 2024 09:43:34 +0000 Subject: [PATCH] Suppresses $borderThickness="1" (#263). --- .../export/plantuml/C4PlantUMLExporter.java | 22 +++++++++++++------ .../plantuml/c4plantuml/36141-Components.puml | 12 +++++----- .../plantuml/c4plantuml/36141-Containers.puml | 14 ++++++------ .../36141-DevelopmentDeployment.puml | 10 ++++----- .../c4plantuml/36141-LiveDeployment.puml | 14 ++++++------ .../c4plantuml/36141-SignIn-sequence.puml | 6 ++--- .../plantuml/c4plantuml/36141-SignIn.puml | 8 +++---- .../c4plantuml/36141-SystemContext.puml | 8 +++---- .../c4plantuml/36141-SystemLandscape.puml | 10 ++++----- ...-AmazonWebServicesDeployment-WithTags.puml | 20 ++++++++--------- .../plantuml/c4plantuml/group-styles-1.puml | 6 ++--- .../plantuml/c4plantuml/group-styles-2.puml | 6 ++--- .../c4plantuml/groups-Components.puml | 2 +- .../c4plantuml/groups-Containers.puml | 2 +- .../c4plantuml/groups-SystemLandscape.puml | 6 ++--- .../nested-groups-with-dot-separator.puml | 6 ++--- .../plantuml/c4plantuml/nested-groups.puml | 10 ++++----- 17 files changed, 85 insertions(+), 77 deletions(-) diff --git a/structurizr-export/src/main/java/com/structurizr/export/plantuml/C4PlantUMLExporter.java b/structurizr-export/src/main/java/com/structurizr/export/plantuml/C4PlantUMLExporter.java index d35ea375..7566c7b3 100644 --- a/structurizr-export/src/main/java/com/structurizr/export/plantuml/C4PlantUMLExporter.java +++ b/structurizr-export/src/main/java/com/structurizr/export/plantuml/C4PlantUMLExporter.java @@ -187,7 +187,7 @@ protected void writeHeader(ModelView view, IndentingWriter writer) { borderThickness = elementStyle.getStrokeWidth(); } - writer.writeLine(String.format("AddElementTag(\"%s\", $bgColor=\"%s\", $borderColor=\"%s\", $fontColor=\"%s\", $sprite=\"%s\", $shadowing=\"%s\", $borderStyle=\"%s\", $borderThickness=\"%s\")", + String line = String.format("AddElementTag(\"%s\", $bgColor=\"%s\", $borderColor=\"%s\", $fontColor=\"%s\", $sprite=\"%s\", $shadowing=\"%s\", $borderStyle=\"%s\", $borderThickness=\"%s\")", tagList, elementStyle.getBackground(), elementStyle.getStroke(), @@ -196,7 +196,10 @@ protected void writeHeader(ModelView view, IndentingWriter writer) { elementStyle.getProperties().getOrDefault(C4PLANTUML_SHADOW, ""), elementStyle.getBorder().toString().toLowerCase(), borderThickness - )); + ); + + line = line.replace(", $borderThickness=\"1\")", ")"); + writer.writeLine(line); } } @@ -235,7 +238,7 @@ protected void writeHeader(ModelView view, IndentingWriter writer) { borderThickness = elementStyle.getStrokeWidth(); } - writer.writeLine(String.format("AddBoundaryTag(\"%s\", $bgColor=\"%s\", $borderColor=\"%s\", $fontColor=\"%s\", $shadowing=\"%s\", $borderStyle=\"%s\", $borderThickness=\"%s\")", + String line = String.format("AddBoundaryTag(\"%s\", $bgColor=\"%s\", $borderColor=\"%s\", $fontColor=\"%s\", $shadowing=\"%s\", $borderStyle=\"%s\", $borderThickness=\"%s\")", tagList, "#ffffff", elementStyle.getStroke(), @@ -243,7 +246,10 @@ protected void writeHeader(ModelView view, IndentingWriter writer) { elementStyle.getProperties().getOrDefault(C4PLANTUML_SHADOW, ""), elementStyle.getBorder().toString().toLowerCase(), borderThickness - )); + ); + + line = line.replace(", $borderThickness=\"1\")", ")"); + writer.writeLine(line); } } } @@ -325,13 +331,15 @@ protected void startGroupBoundary(ModelView view, String group, IndentingWriter // icon = "\\n\\n"; // } - writer.writeLine(String.format("AddBoundaryTag(\"%s\", $borderColor=\"%s\", $fontColor=\"%s\", $borderStyle=\"%s\", $borderThickness=\"%s\")", + String line = String.format("AddBoundaryTag(\"%s\", $borderColor=\"%s\", $fontColor=\"%s\", $borderStyle=\"%s\", $borderThickness=\"%s\")", group, color, color, Border.Dashed.toString().toLowerCase(), - borderThickness) - ); + borderThickness); + + line = line.replace(", $borderThickness=\"1\")", ")"); + writer.writeLine(line); writer.writeLine(String.format("Boundary(group_%s, \"%s\", $tags=\"%s\") {", groupId, groupName, group)); writer.indent(); diff --git a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-Components.puml b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-Components.puml index 90f8f4f7..7bce7a63 100644 --- a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-Components.puml +++ b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-Components.puml @@ -9,15 +9,15 @@ top to bottom direction !include !include -AddElementTag("Software System,Existing System", $bgColor="#999999", $borderColor="#6b6b6b", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Component", $bgColor="#85bbf0", $borderColor="#5d82a8", $fontColor="#000000", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Container,Mobile App", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Container,Database", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Container,Web Browser", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") +AddElementTag("Software System,Existing System", $bgColor="#999999", $borderColor="#6b6b6b", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Component", $bgColor="#85bbf0", $borderColor="#5d82a8", $fontColor="#000000", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Container,Mobile App", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Container,Database", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Container,Web Browser", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") AddRelTag("Relationship", $textColor="#707070", $lineColor="#707070", $lineStyle = "") -AddBoundaryTag("Container", $bgColor="#ffffff", $borderColor="#2e6295", $fontColor="#2e6295", $shadowing="", $borderStyle="solid", $borderThickness="1") +AddBoundaryTag("Container", $bgColor="#ffffff", $borderColor="#2e6295", $fontColor="#2e6295", $shadowing="", $borderStyle="solid") System(MainframeBankingSystem, "Mainframe Banking System", $descr="Stores all of the core banking information about customers, accounts, transactions, etc.", $tags="Software System,Existing System", $link="") System(EmailSystem, "E-mail System", $descr="The internal Microsoft Exchange e-mail system.", $tags="Software System,Existing System", $link="") diff --git a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-Containers.puml b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-Containers.puml index 2107ee2a..789bfdee 100644 --- a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-Containers.puml +++ b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-Containers.puml @@ -8,16 +8,16 @@ top to bottom direction !include !include -AddElementTag("Software System,Existing System", $bgColor="#999999", $borderColor="#6b6b6b", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Container,Mobile App", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Container,Database", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Container,Web Browser", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Container", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Person,Customer", $bgColor="#08427b", $borderColor="#052e56", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") +AddElementTag("Software System,Existing System", $bgColor="#999999", $borderColor="#6b6b6b", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Container,Mobile App", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Container,Database", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Container,Web Browser", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Container", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Person,Customer", $bgColor="#08427b", $borderColor="#052e56", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") AddRelTag("Relationship", $textColor="#707070", $lineColor="#707070", $lineStyle = "") -AddBoundaryTag("Software System", $bgColor="#ffffff", $borderColor="#0b4884", $fontColor="#0b4884", $shadowing="", $borderStyle="solid", $borderThickness="1") +AddBoundaryTag("Software System", $bgColor="#ffffff", $borderColor="#0b4884", $fontColor="#0b4884", $shadowing="", $borderStyle="solid") Person(PersonalBankingCustomer, "Personal Banking Customer", $descr="A customer of the bank, with personal bank accounts.", $tags="Person,Customer", $link="") System(MainframeBankingSystem, "Mainframe Banking System", $descr="Stores all of the core banking information about customers, accounts, transactions, etc.", $tags="Software System,Existing System", $link="") diff --git a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-DevelopmentDeployment.puml b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-DevelopmentDeployment.puml index 556bd25a..0158ada2 100644 --- a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-DevelopmentDeployment.puml +++ b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-DevelopmentDeployment.puml @@ -9,11 +9,11 @@ top to bottom direction !include !include -AddElementTag("Software System,Existing System", $bgColor="#999999", $borderColor="#6b6b6b", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Element", $bgColor="#ffffff", $borderColor="#888888", $fontColor="#000000", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Container,Database", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Container,Web Browser", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Container", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") +AddElementTag("Software System,Existing System", $bgColor="#999999", $borderColor="#6b6b6b", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Element", $bgColor="#ffffff", $borderColor="#888888", $fontColor="#000000", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Container,Database", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Container,Web Browser", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Container", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") AddRelTag("Relationship", $textColor="#707070", $lineColor="#707070", $lineStyle = "") diff --git a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-LiveDeployment.puml b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-LiveDeployment.puml index f5a085b4..177f2597 100644 --- a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-LiveDeployment.puml +++ b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-LiveDeployment.puml @@ -9,13 +9,13 @@ top to bottom direction !include !include -AddElementTag("Failover", $bgColor="#ffffff", $borderColor="#888888", $fontColor="#000000", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Software System,Existing System", $bgColor="#999999", $borderColor="#6b6b6b", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Element", $bgColor="#ffffff", $borderColor="#888888", $fontColor="#000000", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Container,Mobile App", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Container,Database", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Container,Web Browser", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Container", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") +AddElementTag("Failover", $bgColor="#ffffff", $borderColor="#888888", $fontColor="#000000", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Software System,Existing System", $bgColor="#999999", $borderColor="#6b6b6b", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Element", $bgColor="#ffffff", $borderColor="#888888", $fontColor="#000000", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Container,Mobile App", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Container,Database", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Container,Web Browser", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Container", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") AddRelTag("Relationship", $textColor="#707070", $lineColor="#707070", $lineStyle = "") diff --git a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-SignIn-sequence.puml b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-SignIn-sequence.puml index 77915aea..306185a4 100644 --- a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-SignIn-sequence.puml +++ b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-SignIn-sequence.puml @@ -4,9 +4,9 @@ title API Application - Dynamic !include -AddElementTag("Component", $bgColor="#85bbf0", $borderColor="#5d82a8", $fontColor="#000000", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Container,Database", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Container,Web Browser", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") +AddElementTag("Component", $bgColor="#85bbf0", $borderColor="#5d82a8", $fontColor="#000000", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Container,Database", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Container,Web Browser", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") AddRelTag("Relationship", $textColor="#707070", $lineColor="#707070", $lineStyle = "") diff --git a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-SignIn.puml b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-SignIn.puml index c06a5ce7..2ed68bac 100644 --- a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-SignIn.puml +++ b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-SignIn.puml @@ -9,13 +9,13 @@ top to bottom direction !include !include -AddElementTag("Component", $bgColor="#85bbf0", $borderColor="#5d82a8", $fontColor="#000000", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Container,Database", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Container,Web Browser", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") +AddElementTag("Component", $bgColor="#85bbf0", $borderColor="#5d82a8", $fontColor="#000000", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Container,Database", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Container,Web Browser", $bgColor="#438dd5", $borderColor="#2e6295", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") AddRelTag("Relationship", $textColor="#707070", $lineColor="#707070", $lineStyle = "") -AddBoundaryTag("Container", $bgColor="#ffffff", $borderColor="#2e6295", $fontColor="#2e6295", $shadowing="", $borderStyle="solid", $borderThickness="1") +AddBoundaryTag("Container", $bgColor="#ffffff", $borderColor="#2e6295", $fontColor="#2e6295", $shadowing="", $borderStyle="solid") Container_Boundary("InternetBankingSystem.APIApplication_boundary", "API Application", $tags="Container") { Component(InternetBankingSystem.APIApplication.SignInController, "Sign In Controller", $techn="Spring MVC Rest Controller", $descr="Allows users to sign in to the Internet Banking System.", $tags="Component", $link="") diff --git a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-SystemContext.puml b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-SystemContext.puml index 94b45a62..5151c41d 100644 --- a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-SystemContext.puml +++ b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-SystemContext.puml @@ -7,13 +7,13 @@ top to bottom direction !include !include -AddElementTag("Software System", $bgColor="#1168bd", $borderColor="#0b4884", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Software System,Existing System", $bgColor="#999999", $borderColor="#6b6b6b", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Person,Customer", $bgColor="#08427b", $borderColor="#052e56", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") +AddElementTag("Software System", $bgColor="#1168bd", $borderColor="#0b4884", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Software System,Existing System", $bgColor="#999999", $borderColor="#6b6b6b", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Person,Customer", $bgColor="#08427b", $borderColor="#052e56", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") AddRelTag("Relationship", $textColor="#707070", $lineColor="#707070", $lineStyle = "") -AddBoundaryTag("Big Bank plc", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed", $borderThickness="1") +AddBoundaryTag("Big Bank plc", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed") Boundary(group_1, "Big Bank plc", $tags="Big Bank plc") { System(MainframeBankingSystem, "Mainframe Banking System", $descr="Stores all of the core banking information about customers, accounts, transactions, etc.", $tags="Software System,Existing System", $link="") System(EmailSystem, "E-mail System", $descr="The internal Microsoft Exchange e-mail system.", $tags="Software System,Existing System", $link="") diff --git a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-SystemLandscape.puml b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-SystemLandscape.puml index 60fa50db..c49923d4 100644 --- a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-SystemLandscape.puml +++ b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/36141-SystemLandscape.puml @@ -7,14 +7,14 @@ top to bottom direction !include !include -AddElementTag("Software System", $bgColor="#1168bd", $borderColor="#0b4884", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Person,Bank Staff", $bgColor="#999999", $borderColor="#6b6b6b", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Software System,Existing System", $bgColor="#999999", $borderColor="#6b6b6b", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Person,Customer", $bgColor="#08427b", $borderColor="#052e56", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") +AddElementTag("Software System", $bgColor="#1168bd", $borderColor="#0b4884", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Person,Bank Staff", $bgColor="#999999", $borderColor="#6b6b6b", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Software System,Existing System", $bgColor="#999999", $borderColor="#6b6b6b", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Person,Customer", $bgColor="#08427b", $borderColor="#052e56", $fontColor="#ffffff", $sprite="", $shadowing="", $borderStyle="solid") AddRelTag("Relationship", $textColor="#707070", $lineColor="#707070", $lineStyle = "") -AddBoundaryTag("Big Bank plc", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed", $borderThickness="1") +AddBoundaryTag("Big Bank plc", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed") Boundary(group_1, "Big Bank plc", $tags="Big Bank plc") { Person(CustomerServiceStaff, "Customer Service Staff", $descr="Customer service staff within the bank.", $tags="Person,Bank Staff", $link="") Person(BackOfficeStaff, "Back Office Staff", $descr="Administration and support staff within the bank.", $tags="Person,Bank Staff", $link="") diff --git a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/54915-AmazonWebServicesDeployment-WithTags.puml b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/54915-AmazonWebServicesDeployment-WithTags.puml index 32852ce3..42093172 100644 --- a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/54915-AmazonWebServicesDeployment-WithTags.puml +++ b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/54915-AmazonWebServicesDeployment-WithTags.puml @@ -9,16 +9,16 @@ left to right direction !include !include -AddElementTag("Container,Application", $bgColor="#ffffff", $borderColor="#b2b2b2", $fontColor="#000000", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Amazon Web Services - RDS", $bgColor="#ffffff", $borderColor="#3b48cc", $fontColor="#3b48cc", $sprite="img:https://static.structurizr.com/themes/amazon-web-services-2020.04.30/Amazon-RDS_light-bg@4x.png{scale=0.1}", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Amazon Web Services - Auto Scaling", $bgColor="#ffffff", $borderColor="#cc2264", $fontColor="#cc2264", $sprite="img:https://static.structurizr.com/themes/amazon-web-services-2020.04.30/AWS-Auto-Scaling_light-bg@4x.png{scale=0.1}", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Amazon Web Services - Route 53", $bgColor="#ffffff", $borderColor="#693cc5", $fontColor="#693cc5", $sprite="img:https://static.structurizr.com/themes/amazon-web-services-2020.04.30/Amazon-Route-53_light-bg@4x.png{scale=0.1}", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Amazon Web Services - EC2", $bgColor="#ffffff", $borderColor="#d86613", $fontColor="#d86613", $sprite="img:https://static.structurizr.com/themes/amazon-web-services-2020.04.30/Amazon-EC2_light-bg@4x.png{scale=0.1}", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Amazon Web Services - Region", $bgColor="#ffffff", $borderColor="#147eba", $fontColor="#147eba", $sprite="img:https://static.structurizr.com/themes/amazon-web-services-2020.04.30/Region_light-bg@4x.png{scale=0.21428571428571427}", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Amazon Web Services - Elastic Load Balancing", $bgColor="#ffffff", $borderColor="#693cc5", $fontColor="#693cc5", $sprite="img:https://static.structurizr.com/themes/amazon-web-services-2020.04.30/Elastic-Load-Balancing_light-bg@4x.png{scale=0.1}", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Amazon Web Services - RDS MySQL instance", $bgColor="#ffffff", $borderColor="#3b48cc", $fontColor="#3b48cc", $sprite="img:https://static.structurizr.com/themes/amazon-web-services-2020.04.30/Amazon-RDS_MySQL_instance_light-bg@4x.png{scale=0.15}", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Container,Database", $bgColor="#ffffff", $borderColor="#b2b2b2", $fontColor="#000000", $sprite="", $shadowing="", $borderStyle="solid", $borderThickness="1") -AddElementTag("Amazon Web Services - Cloud", $bgColor="#ffffff", $borderColor="#232f3e", $fontColor="#232f3e", $sprite="img:https://static.structurizr.com/themes/amazon-web-services-2020.04.30/AWS-Cloud_light-bg@4x.png{scale=0.21428571428571427}", $shadowing="", $borderStyle="solid", $borderThickness="1") +AddElementTag("Container,Application", $bgColor="#ffffff", $borderColor="#b2b2b2", $fontColor="#000000", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Amazon Web Services - RDS", $bgColor="#ffffff", $borderColor="#3b48cc", $fontColor="#3b48cc", $sprite="img:https://static.structurizr.com/themes/amazon-web-services-2020.04.30/Amazon-RDS_light-bg@4x.png{scale=0.1}", $shadowing="", $borderStyle="solid") +AddElementTag("Amazon Web Services - Auto Scaling", $bgColor="#ffffff", $borderColor="#cc2264", $fontColor="#cc2264", $sprite="img:https://static.structurizr.com/themes/amazon-web-services-2020.04.30/AWS-Auto-Scaling_light-bg@4x.png{scale=0.1}", $shadowing="", $borderStyle="solid") +AddElementTag("Amazon Web Services - Route 53", $bgColor="#ffffff", $borderColor="#693cc5", $fontColor="#693cc5", $sprite="img:https://static.structurizr.com/themes/amazon-web-services-2020.04.30/Amazon-Route-53_light-bg@4x.png{scale=0.1}", $shadowing="", $borderStyle="solid") +AddElementTag("Amazon Web Services - EC2", $bgColor="#ffffff", $borderColor="#d86613", $fontColor="#d86613", $sprite="img:https://static.structurizr.com/themes/amazon-web-services-2020.04.30/Amazon-EC2_light-bg@4x.png{scale=0.1}", $shadowing="", $borderStyle="solid") +AddElementTag("Amazon Web Services - Region", $bgColor="#ffffff", $borderColor="#147eba", $fontColor="#147eba", $sprite="img:https://static.structurizr.com/themes/amazon-web-services-2020.04.30/Region_light-bg@4x.png{scale=0.21428571428571427}", $shadowing="", $borderStyle="solid") +AddElementTag("Amazon Web Services - Elastic Load Balancing", $bgColor="#ffffff", $borderColor="#693cc5", $fontColor="#693cc5", $sprite="img:https://static.structurizr.com/themes/amazon-web-services-2020.04.30/Elastic-Load-Balancing_light-bg@4x.png{scale=0.1}", $shadowing="", $borderStyle="solid") +AddElementTag("Amazon Web Services - RDS MySQL instance", $bgColor="#ffffff", $borderColor="#3b48cc", $fontColor="#3b48cc", $sprite="img:https://static.structurizr.com/themes/amazon-web-services-2020.04.30/Amazon-RDS_MySQL_instance_light-bg@4x.png{scale=0.15}", $shadowing="", $borderStyle="solid") +AddElementTag("Container,Database", $bgColor="#ffffff", $borderColor="#b2b2b2", $fontColor="#000000", $sprite="", $shadowing="", $borderStyle="solid") +AddElementTag("Amazon Web Services - Cloud", $bgColor="#ffffff", $borderColor="#232f3e", $fontColor="#232f3e", $sprite="img:https://static.structurizr.com/themes/amazon-web-services-2020.04.30/AWS-Cloud_light-bg@4x.png{scale=0.21428571428571427}", $shadowing="", $borderStyle="solid") AddRelTag("Relationship", $textColor="#707070", $lineColor="#707070", $lineStyle = "") diff --git a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/group-styles-1.puml b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/group-styles-1.puml index 05d0c97e..180f8c3a 100644 --- a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/group-styles-1.puml +++ b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/group-styles-1.puml @@ -7,17 +7,17 @@ top to bottom direction !include !include -AddBoundaryTag("Group 1", $borderColor="#111111", $fontColor="#111111", $borderStyle="dashed", $borderThickness="1") +AddBoundaryTag("Group 1", $borderColor="#111111", $fontColor="#111111", $borderStyle="dashed") Boundary(group_1, "Group 1", $tags="Group 1") { Person(User1, "User 1", $descr="", $tags="", $link="") } -AddBoundaryTag("Group 2", $borderColor="#222222", $fontColor="#222222", $borderStyle="dashed", $borderThickness="1") +AddBoundaryTag("Group 2", $borderColor="#222222", $fontColor="#222222", $borderStyle="dashed") Boundary(group_2, "Group 2", $tags="Group 2") { Person(User2, "User 2", $descr="", $tags="", $link="") } -AddBoundaryTag("Group 3", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed", $borderThickness="1") +AddBoundaryTag("Group 3", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed") Boundary(group_3, "Group 3", $tags="Group 3") { Person(User3, "User 3", $descr="", $tags="", $link="") } diff --git a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/group-styles-2.puml b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/group-styles-2.puml index 94d7e5c8..ff23c0a7 100644 --- a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/group-styles-2.puml +++ b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/group-styles-2.puml @@ -7,17 +7,17 @@ top to bottom direction !include !include -AddBoundaryTag("Group 1", $borderColor="#111111", $fontColor="#111111", $borderStyle="dashed", $borderThickness="1") +AddBoundaryTag("Group 1", $borderColor="#111111", $fontColor="#111111", $borderStyle="dashed") Boundary(group_1, "Group 1", $tags="Group 1") { Person(User1, "User 1", $descr="", $tags="", $link="") } -AddBoundaryTag("Group 2", $borderColor="#222222", $fontColor="#222222", $borderStyle="dashed", $borderThickness="1") +AddBoundaryTag("Group 2", $borderColor="#222222", $fontColor="#222222", $borderStyle="dashed") Boundary(group_2, "Group 2", $tags="Group 2") { Person(User2, "User 2", $descr="", $tags="", $link="") } -AddBoundaryTag("Group 3", $borderColor="#aabbcc", $fontColor="#aabbcc", $borderStyle="dashed", $borderThickness="1") +AddBoundaryTag("Group 3", $borderColor="#aabbcc", $fontColor="#aabbcc", $borderStyle="dashed") Boundary(group_3, "Group 3", $tags="Group 3") { Person(User3, "User 3", $descr="", $tags="", $link="") } diff --git a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/groups-Components.puml b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/groups-Components.puml index 4cb63cac..ff496fc5 100644 --- a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/groups-Components.puml +++ b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/groups-Components.puml @@ -11,7 +11,7 @@ top to bottom direction System(C, "C", $descr="", $tags="", $link="") Container_Boundary("D.F_boundary", "F", $tags="") { - AddBoundaryTag("Group 5", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed", $borderThickness="1") + AddBoundaryTag("Group 5", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed") Boundary(group_1, "Group 5", $tags="Group 5") { Component(D.F.H, "H", $techn="", $descr="", $tags="", $link="") } diff --git a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/groups-Containers.puml b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/groups-Containers.puml index 76539e19..2f92cc66 100644 --- a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/groups-Containers.puml +++ b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/groups-Containers.puml @@ -11,7 +11,7 @@ top to bottom direction System(C, "C", $descr="", $tags="", $link="") System_Boundary("D_boundary", "D", $tags="") { - AddBoundaryTag("Group 4", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed", $borderThickness="1") + AddBoundaryTag("Group 4", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed") Boundary(group_1, "Group 4", $tags="Group 4") { Container(D.F, "F", $techn="", $descr="", $tags="", $link="") } diff --git a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/groups-SystemLandscape.puml b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/groups-SystemLandscape.puml index 3aee39e2..0e045ac3 100644 --- a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/groups-SystemLandscape.puml +++ b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/groups-SystemLandscape.puml @@ -7,15 +7,15 @@ top to bottom direction !include !include -AddBoundaryTag("Group 1", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed", $borderThickness="1") +AddBoundaryTag("Group 1", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed") Boundary(group_1, "Group 1", $tags="Group 1") { System(B, "B", $descr="", $tags="", $link="") } -AddBoundaryTag("Group 2", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed", $borderThickness="1") +AddBoundaryTag("Group 2", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed") Boundary(group_2, "Group 2", $tags="Group 2") { System(C, "C", $descr="", $tags="", $link="") - AddBoundaryTag("Group 2/Group 3", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed", $borderThickness="1") + AddBoundaryTag("Group 2/Group 3", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed") Boundary(group_3, "Group 3", $tags="Group 2/Group 3") { System(D, "D", $descr="", $tags="", $link="") } diff --git a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/nested-groups-with-dot-separator.puml b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/nested-groups-with-dot-separator.puml index a22d44fe..25c92424 100644 --- a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/nested-groups-with-dot-separator.puml +++ b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/nested-groups-with-dot-separator.puml @@ -7,11 +7,11 @@ top to bottom direction !include !include -AddBoundaryTag("Organisation 1", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed", $borderThickness="1") +AddBoundaryTag("Organisation 1", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed") Boundary(group_1, "Organisation 1", $tags="Organisation 1") { - AddBoundaryTag("Organisation 1.Department 1", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed", $borderThickness="1") + AddBoundaryTag("Organisation 1.Department 1", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed") Boundary(group_2, "Department 1", $tags="Organisation 1.Department 1") { - AddBoundaryTag("Organisation 1.Department 1.Team 1", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed", $borderThickness="1") + AddBoundaryTag("Organisation 1.Department 1.Team 1", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed") Boundary(group_3, "Team 1", $tags="Organisation 1.Department 1.Team 1") { System(Team1, "Team 1", $descr="", $tags="", $link="") } diff --git a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/nested-groups.puml b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/nested-groups.puml index 7ad912df..17b40ad7 100644 --- a/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/nested-groups.puml +++ b/structurizr-export/src/test/java/com/structurizr/export/plantuml/c4plantuml/nested-groups.puml @@ -7,18 +7,18 @@ top to bottom direction !include !include -AddBoundaryTag("Organisation 1", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed", $borderThickness="1") +AddBoundaryTag("Organisation 1", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed") Boundary(group_1, "Organisation 1", $tags="Organisation 1") { System(Organisation1, "Organisation 1", $descr="", $tags="", $link="") - AddBoundaryTag("Organisation 1/Department 1", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed", $borderThickness="1") + AddBoundaryTag("Organisation 1/Department 1", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed") Boundary(group_2, "Department 1", $tags="Organisation 1/Department 1") { System(Department1, "Department 1", $descr="", $tags="", $link="") - AddBoundaryTag("Organisation 1/Department 1/Team 1", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed", $borderThickness="1") + AddBoundaryTag("Organisation 1/Department 1/Team 1", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed") Boundary(group_3, "Team 1", $tags="Organisation 1/Department 1/Team 1") { System(Team1, "Team 1", $descr="", $tags="", $link="") } - AddBoundaryTag("Organisation 1/Department 1/Team 2", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed", $borderThickness="1") + AddBoundaryTag("Organisation 1/Department 1/Team 2", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed") Boundary(group_4, "Team 2", $tags="Organisation 1/Department 1/Team 2") { System(Team2, "Team 2", $descr="", $tags="", $link="") } @@ -27,7 +27,7 @@ Boundary(group_1, "Organisation 1", $tags="Organisation 1") { } -AddBoundaryTag("Organisation 2", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed", $borderThickness="1") +AddBoundaryTag("Organisation 2", $borderColor="#cccccc", $fontColor="#cccccc", $borderStyle="dashed") Boundary(group_5, "Organisation 2", $tags="Organisation 2") { System(Organisation2, "Organisation 2", $descr="", $tags="", $link="") }