Merge pull request #45 from djjlewis/c4plantuml-deployment-node-prope…

…rties Add C4-PlantUML Properties to Deployment_Nodes
structurizr · Feb 13, 2023 · 318cb85 · 318cb85
2 parents 0a16b47 + cd439ff
commit 318cb85
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 0 deletions.
diff --git a/src/main/java/com/structurizr/export/plantuml/C4PlantUMLExporter.java b/src/main/java/com/structurizr/export/plantuml/C4PlantUMLExporter.java
@@ -289,6 +289,10 @@ protected void startDeploymentNodeBoundary(DeploymentView view, DeploymentNode d
             url = "";
         }
 
+        if (Boolean.TRUE.toString().equalsIgnoreCase(view.getViewSet().getConfiguration().getProperties().getOrDefault(C4PLANTUML_ELEMENT_PROPERTIES_PROPERTY, Boolean.FALSE.toString()))) {
+            addProperties(view, writer, deploymentNode);
+        }
+
         if (StringUtils.isNullOrEmpty(deploymentNode.getTechnology())) {
             writer.writeLine(
                     format("Deployment_Node(%s, \"%s\", $tags=\"%s\")%s {",

diff --git a/src/test/java/com/structurizr/export/plantuml/C4PlantUMLDiagramExporterTests.java b/src/test/java/com/structurizr/export/plantuml/C4PlantUMLDiagramExporterTests.java
@@ -365,6 +365,26 @@ public void test_printProperties() throws Exception {
         assertEquals(expected, diagram.getDefinition());
     }
 
+    @Test
+    public void test_deploymentViewPrintProperties() throws Exception {
+        Workspace workspace = new Workspace("Name", "Description");
+
+        DeploymentNode deploymentNode = workspace.getModel().addDeploymentNode("Deployment node");
+        deploymentNode.addProperty("Prop1", "Value1");
+
+        InfrastructureNode infraNode = deploymentNode.addInfrastructureNode("Infrastructure node", "description", "technology");
+        infraNode.addProperty("Prop2", "Value2");
+
+        workspace.getViews().getConfiguration().addProperty(C4PlantUMLExporter.C4PLANTUML_ELEMENT_PROPERTIES_PROPERTY, Boolean.TRUE.toString());
+        DeploymentView deploymentView = workspace.getViews().createDeploymentView("deploymentView", "");
+        deploymentView.addDefaultElements();
+
+        Diagram diagram = new C4PlantUMLExporter().export(deploymentView);
+
+        String expected = readFile(new File("./src/test/java/com/structurizr/export/plantuml/c4plantuml/printProperties-deploymentView.puml"));
+        assertEquals(expected, diagram.getDefinition());
+    }
+
     @Test
     public void test_legendAndStereotypes() {
         Workspace workspace = new Workspace("Name", "Description");

diff --git a/src/test/java/com/structurizr/export/plantuml/c4plantuml/printProperties-deploymentView.puml b/src/test/java/com/structurizr/export/plantuml/c4plantuml/printProperties-deploymentView.puml
@@ -0,0 +1,20 @@
+@startuml
+title Deployment - Default
+
+top to bottom direction
+
+!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4.puml
+!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Context.puml
+!include https://raw.githubusercontent.com/plantuml-stdlib/C4-PlantUML/master/C4_Deployment.puml
+
+WithoutPropertyHeader()
+AddProperty("Prop1","Value1")
+Deployment_Node(Default.Deploymentnode, "Deployment node", $tags="") {
+  WithoutPropertyHeader()
+  AddProperty("Prop2","Value2")
+  Deployment_Node(Default.Deploymentnode.Infrastructurenode, "Infrastructure node", "technology", "description", $tags="")
+}
+
+
+SHOW_LEGEND(true)
+@enduml