Fixes an issue where containers could be rendered outside of their software system boundary on container scoped dynamic views (collaboration style).

simonbrowndotje · simonbrowndotje · commit 9fd9660dc61c · 2025-09-26T14:48:33.000+01:00
diff --git a/structurizr-export/src/main/java/com/structurizr/export/AbstractDiagramExporter.java b/structurizr-export/src/main/java/com/structurizr/export/AbstractDiagramExporter.java
@@ -308,7 +308,6 @@ public Diagram export(ComponentView view, Integer animationStep) {
         }
 
         List<Container> boundaryContainers = getBoundaryContainers(view);
-        List<Container> containers = getContainers(view);
         Set<SoftwareSystem> boundarySoftwareSystems = boundaryContainers.stream().map(Container::getSoftwareSystem).collect(Collectors.toCollection(LinkedHashSet::new));
         for (SoftwareSystem softwareSystem : boundarySoftwareSystems) {
 
@@ -325,7 +324,7 @@ public Diagram export(ComponentView view, Integer animationStep) {
                 }
             }
 
-            for (Container container : containers) {
+            for (Container container : getContainers(view)) {
                 if (container.getSoftwareSystem() == softwareSystem) {
                     writeElement(view, container, writer);
                 }
@@ -418,18 +417,37 @@ public Diagram export(DynamicView view, String order) {
                 }
             } else if (element instanceof Container) {
                 // dynamic view with container scope
-                boolean includeSoftwareSystemBoundaries = "true".equals(view.getProperties().getOrDefault("structurizr.softwareSystemBoundaries", "false"));
+                List<CustomElement> customElements = getCustomElements(view);
+                for (CustomElement customElement : customElements) {
+                    writeElement(view, customElement, writer);
+                }
+                if (!customElements.isEmpty()) {
+                    writer.writeLine();
+                }
+
+                List<Person> people = getPeople(view);
+                for (Person person : people) {
+                    writeElement(view, person, writer);
+                }
+                if (!people.isEmpty()) {
+                    writer.writeLine();
+                }
 
-                List<Container> containers = getBoundaryContainers(view);
-                Set<SoftwareSystem> softwareSystems = containers.stream().map(Container::getSoftwareSystem).collect(Collectors.toCollection(LinkedHashSet::new));
+                List<SoftwareSystem> softwareSystems = getSoftwareSystems(view);
                 for (SoftwareSystem softwareSystem : softwareSystems) {
+                    writeElement(view, softwareSystem, writer);
+                }
+                if (!softwareSystems.isEmpty()) {
+                    writer.writeLine();
+                }
 
-                    if (includeSoftwareSystemBoundaries) {
-                        startSoftwareSystemBoundary(view, softwareSystem, writer);
-                        writer.indent();
-                    }
+                List<Container> boundaryContainers = getBoundaryContainers(view);
+                Set<SoftwareSystem> boundarySoftwareSystems = boundaryContainers.stream().map(Container::getSoftwareSystem).collect(Collectors.toCollection(LinkedHashSet::new));
+                for (SoftwareSystem softwareSystem : boundarySoftwareSystems) {
+
+                    startSoftwareSystemBoundary(view, softwareSystem, writer);
 
-                    for (Container container : containers) {
+                    for (Container container : boundaryContainers) {
                         if (container.getSoftwareSystem() == softwareSystem) {
                             startContainerBoundary(view, container, writer);
 
@@ -440,10 +458,13 @@ public Diagram export(DynamicView view, String order) {
                         }
                     }
 
-                    if (includeSoftwareSystemBoundaries) {
-                        endSoftwareSystemBoundary(view, writer);
-                        writer.outdent();
+                    for (Container container : getContainers(view)) {
+                        if (container.getSoftwareSystem() == softwareSystem) {
+                            writeElement(view, container, writer);
+                        }
                     }
+
+                    endSoftwareSystemBoundary(view, writer);
                 }
 
                 for (ElementView elementView : view.getElements()) {
diff --git a/structurizr-export/src/test/java/com/structurizr/export/dot/DOTDiagramExporterTests.java b/structurizr-export/src/test/java/com/structurizr/export/dot/DOTDiagramExporterTests.java
@@ -203,16 +203,28 @@ public void test_BigBankPlcExample() throws Exception {
                   edge [fontname="Arial"]
                   label=<<br /><font point-size="34">Dynamic View: Internet Banking System - API Application</font><br /><font point-size="24">Summarises how the sign in feature works in the single-page application.</font>>
                 
-                  subgraph cluster_11 {
+                  subgraph cluster_7 {
                     margin=25
-                    label=<<font point-size="24"><br />API Application</font><br /><font point-size="19">[Container: Java and Spring MVC]</font>>
+                    label=<<font point-size="24"><br />Internet Banking System</font><br /><font point-size="19">[Software System]</font>>
                     labelloc=b
-                    color="#444444"
-                    fontcolor="#444444"
-                    fillcolor="#444444"
+                    color="#cccccc"
+                    fontcolor="#cccccc"
+                    fillcolor="#cccccc"
+                
+                    subgraph cluster_11 {
+                      margin=25
+                      label=<<font point-size="24"><br />API Application</font><br /><font point-size="19">[Container: Java and Spring MVC]</font>>
+                      labelloc=b
+                      color="#444444"
+                      fontcolor="#444444"
+                      fillcolor="#444444"
                 
-                    12 [id=12,shape=rect, label=<<font point-size="34">Sign In Controller</font><br /><font point-size="19">[Component: Spring MVC Rest Controller]</font><br /><br /><font point-size="24">Allows users to sign in to the<br />Internet Banking System.</font>>, style=filled, color="#5d82a8", fillcolor="#85bbf0", fontcolor="#000000"]
-                    15 [id=15,shape=rect, label=<<font point-size="34">Security Component</font><br /><font point-size="19">[Component: Spring Bean]</font><br /><br /><font point-size="24">Provides functionality related<br />to signing in, changing<br />passwords, etc.</font>>, style=filled, color="#5d82a8", fillcolor="#85bbf0", fontcolor="#000000"]
+                      12 [id=12,shape=rect, label=<<font point-size="34">Sign In Controller</font><br /><font point-size="19">[Component: Spring MVC Rest Controller]</font><br /><br /><font point-size="24">Allows users to sign in to the<br />Internet Banking System.</font>>, style=filled, color="#5d82a8", fillcolor="#85bbf0", fontcolor="#000000"]
+                      15 [id=15,shape=rect, label=<<font point-size="34">Security Component</font><br /><font point-size="19">[Component: Spring Bean]</font><br /><br /><font point-size="24">Provides functionality related<br />to signing in, changing<br />passwords, etc.</font>>, style=filled, color="#5d82a8", fillcolor="#85bbf0", fontcolor="#000000"]
+                    }
+                
+                    18 [id=18,shape=cylinder, label=<<font point-size="34">Database</font><br /><font point-size="19">[Container: Oracle Database Schema]</font><br /><br /><font point-size="24">Stores user registration<br />information, hashed<br />authentication credentials,<br />access logs, etc.</font>>, style=filled, color="#2e6295", fillcolor="#438dd5", fontcolor="#ffffff"]
+                    8 [id=8,shape=rect, label=<<font point-size="34">Single-Page<br />Application</font><br /><font point-size="19">[Container: JavaScript and Angular]</font><br /><br /><font point-size="24">Provides all of the Internet<br />banking functionality to<br />customers via their web<br />browser.</font>>, style=filled, color="#2e6295", fillcolor="#438dd5", fontcolor="#ffffff"]
                   }
                 
                   8 [id=8,shape=rect, label=<<font point-size="34">Single-Page<br />Application</font><br /><font point-size="19">[Container: JavaScript and Angular]</font><br /><br /><font point-size="24">Provides all of the Internet<br />banking functionality to<br />customers via their web<br />browser.</font>>, style=filled, color="#2e6295", fillcolor="#438dd5", fontcolor="#ffffff"]
diff --git a/structurizr-export/src/test/java/com/structurizr/export/plantuml/C4PlantUMLDiagramExporterTests.java b/structurizr-export/src/test/java/com/structurizr/export/plantuml/C4PlantUMLDiagramExporterTests.java
@@ -270,9 +270,14 @@ public void test_BigBankPlcExample() throws Exception {
                 
                 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="")
-                  Component(InternetBankingSystem.APIApplication.SecurityComponent, "Security Component", $techn="Spring Bean", $descr="Provides functionality related to signing in, changing passwords, etc.", $tags="Component", $link="")
+                System_Boundary("InternetBankingSystem_boundary", "Internet Banking System", $tags="Software System") {
+                  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="")
+                    Component(InternetBankingSystem.APIApplication.SecurityComponent, "Security Component", $techn="Spring Bean", $descr="Provides functionality related to signing in, changing passwords, etc.", $tags="Component", $link="")
+                  }
+                
+                  ContainerDb(InternetBankingSystem.Database, "Database", $techn="Oracle Database Schema", $descr="Stores user registration information, hashed authentication credentials, access logs, etc.", $tags="Container,Database", $link="")
+                  Container(InternetBankingSystem.SinglePageApplication, "Single-Page Application", $techn="JavaScript and Angular", $descr="Provides all of the Internet banking functionality to customers via their web browser.", $tags="Container,Web Browser", $link="")
                 }
                 
                 Container(InternetBankingSystem.SinglePageApplication, "Single-Page Application", $techn="JavaScript and Angular", $descr="Provides all of the Internet banking functionality to customers via their web browser.", $tags="Container,Web Browser", $link="")
diff --git a/structurizr-export/src/test/java/com/structurizr/export/plantuml/StructurizrPlantUMLDiagramExporterTests.java b/structurizr-export/src/test/java/com/structurizr/export/plantuml/StructurizrPlantUMLDiagramExporterTests.java
@@ -1555,107 +1555,16 @@ public void dynamicView_ExternalComponents() {
         SoftwareSystem softwareSystem2 = workspace.getModel().addSoftwareSystem("Software System 2");
         Container container2 = softwareSystem2.addContainer("Container 2");
         Component component3 = container2.addComponent("Component 3");
+        Container container4 = softwareSystem2.addContainer("Container 4");
 
         component1.uses(component2, "Uses");
         component2.uses(component3, "Uses");
+        component3.uses(container4, "Uses");
 
         DynamicView dynamicView = workspace.getViews().createDynamicView(container1, "Dynamic", "");
         dynamicView.add(component1, component2);
         dynamicView.add(component2, component3);
-
-        Diagram diagram = new StructurizrPlantUMLExporter().export(dynamicView);
-        assertEquals("""
-                @startuml
-                title <size:24>Dynamic View: Software System 1 - Container 1</size>
-                
-                set separator none
-                top to bottom direction
-                hide stereotype
-                
-                <style>
-                  root {
-                    BackgroundColor: #ffffff;
-                    FontColor: #444444;
-                  }
-                  // Element
-                  .Element-RWxlbWVudA== {
-                    BackgroundColor: #ffffff;
-                    LineColor: #444444;
-                    LineStyle: 0;
-                    LineThickness: 2;
-                    FontColor: #444444;
-                    FontSize: 24;
-                    HorizontalAlignment: center;
-                    Shadowing: 0;
-                    MaximumWidth: 450;
-                  }
-                  // Relationship
-                  .Relationship-UmVsYXRpb25zaGlw {
-                    LineThickness: 2;
-                    LineStyle: 10-10;
-                    LineColor: #444444;
-                    FontColor: #444444;
-                    FontSize: 24;
-                  }
-                  // Container 1
-                  .Boundary-Q29udGFpbmVyIDE= {
-                    BackgroundColor: #ffffff;
-                    LineColor: #444444;
-                    LineStyle: 0;
-                    LineThickness: 2;
-                    FontColor: #444444;
-                    FontSize: 24;
-                    HorizontalAlignment: center;
-                    Shadowing: 0;
-                  }
-                  // Container 2
-                  .Boundary-Q29udGFpbmVyIDI= {
-                    BackgroundColor: #ffffff;
-                    LineColor: #444444;
-                    LineStyle: 0;
-                    LineThickness: 2;
-                    FontColor: #444444;
-                    FontSize: 24;
-                    HorizontalAlignment: center;
-                    Shadowing: 0;
-                  }
-                </style>
-                
-                rectangle "Container 1\\n<size:16>[Container]</size>" <<Boundary-Q29udGFpbmVyIDE=>> {
-                  rectangle "==Component 1\\n<size:16>[Component]</size>" <<Element-RWxlbWVudA==>> as SoftwareSystem1.Container1.Component1
-                  rectangle "==Component 2\\n<size:16>[Component]</size>" <<Element-RWxlbWVudA==>> as SoftwareSystem1.Container1.Component2
-                }
-                
-                rectangle "Container 2\\n<size:16>[Container]</size>" <<Boundary-Q29udGFpbmVyIDI=>> {
-                  rectangle "==Component 3\\n<size:16>[Component]</size>" <<Element-RWxlbWVudA==>> as SoftwareSystem2.Container2.Component3
-                }
-                
-                SoftwareSystem1.Container1.Component1 --> SoftwareSystem1.Container1.Component2 <<Relationship-UmVsYXRpb25zaGlw>> : "1: Uses"
-                SoftwareSystem1.Container1.Component2 --> SoftwareSystem2.Container2.Component3 <<Relationship-UmVsYXRpb25zaGlw>> : "2: Uses"
-                
-                @enduml""", diagram.getDefinition());
-    }
-
-    @Test
-    public void dynamicView_ExternalComponentsAndSoftwareSystemBoundariesIncluded() {
-        Workspace workspace = new Workspace("Name");
-
-        SoftwareSystem softwareSystem1 = workspace.getModel().addSoftwareSystem("Software System 1");
-        Container container1 = softwareSystem1.addContainer("Container 1");
-        Component component1 = container1.addComponent("Component 1");
-        Component component2 = container1.addComponent("Component 2");
-
-        SoftwareSystem softwareSystem2 = workspace.getModel().addSoftwareSystem("Software System 2");
-        Container container2 = softwareSystem2.addContainer("Container 2");
-        Component component3 = container2.addComponent("Component 3");
-
-        component1.uses(component2, "Uses");
-        component2.uses(component3, "Uses");
-
-        DynamicView dynamicView = workspace.getViews().createDynamicView(container1, "Dynamic", "");
-        dynamicView.add(component1, component2);
-        dynamicView.add(component2, component3);
-        dynamicView.addProperty("structurizr.softwareSystemBoundaries", "true");
+        dynamicView.add(component3, container4);
 
         Diagram diagram = new StructurizrPlantUMLExporter().export(dynamicView);
         assertEquals("""
@@ -1738,22 +1647,26 @@ public void dynamicView_ExternalComponentsAndSoftwareSystemBoundariesIncluded()
                 </style>
                 
                 rectangle "Software System 1\\n<size:16>[Software System]</size>" <<Boundary-U29mdHdhcmUgU3lzdGVtIDE=>> {
-                    rectangle "Container 1\\n<size:16>[Container]</size>" <<Boundary-Q29udGFpbmVyIDE=>> {
-                      rectangle "==Component 1\\n<size:16>[Component]</size>" <<Element-RWxlbWVudA==>> as SoftwareSystem1.Container1.Component1
-                      rectangle "==Component 2\\n<size:16>[Component]</size>" <<Element-RWxlbWVudA==>> as SoftwareSystem1.Container1.Component2
-                    }
-                
+                  rectangle "Container 1\\n<size:16>[Container]</size>" <<Boundary-Q29udGFpbmVyIDE=>> {
+                    rectangle "==Component 1\\n<size:16>[Component]</size>" <<Element-RWxlbWVudA==>> as SoftwareSystem1.Container1.Component1
+                    rectangle "==Component 2\\n<size:16>[Component]</size>" <<Element-RWxlbWVudA==>> as SoftwareSystem1.Container1.Component2
                   }
                 
-                rectangle "Software System 2\\n<size:16>[Software System]</size>" <<Boundary-U29mdHdhcmUgU3lzdGVtIDI=>> {
-                    rectangle "Container 2\\n<size:16>[Container]</size>" <<Boundary-Q29udGFpbmVyIDI=>> {
-                      rectangle "==Component 3\\n<size:16>[Component]</size>" <<Element-RWxlbWVudA==>> as SoftwareSystem2.Container2.Component3
-                    }
+                }
                 
+                rectangle "Software System 2\\n<size:16>[Software System]</size>" <<Boundary-U29mdHdhcmUgU3lzdGVtIDI=>> {
+                  rectangle "Container 2\\n<size:16>[Container]</size>" <<Boundary-Q29udGFpbmVyIDI=>> {
+                    rectangle "==Component 3\\n<size:16>[Component]</size>" <<Element-RWxlbWVudA==>> as SoftwareSystem2.Container2.Component3
                   }
                 
+                  rectangle "==Container 4\\n<size:16>[Container]</size>" <<Element-RWxlbWVudA==>> as SoftwareSystem2.Container4
+                }
+                
+                rectangle "==Container 4\\n<size:16>[Container]</size>" <<Element-RWxlbWVudA==>> as SoftwareSystem2.Container4
+                
                 SoftwareSystem1.Container1.Component1 --> SoftwareSystem1.Container1.Component2 <<Relationship-UmVsYXRpb25zaGlw>> : "1: Uses"
                 SoftwareSystem1.Container1.Component2 --> SoftwareSystem2.Container2.Component3 <<Relationship-UmVsYXRpb25zaGlw>> : "2: Uses"
+                SoftwareSystem2.Container2.Component3 --> SoftwareSystem2.Container4 <<Relationship-UmVsYXRpb25zaGlw>> : "3: Uses"
                 
                 @enduml""", diagram.getDefinition());
     }
@@ -2261,16 +2174,22 @@ public void dynamicView_ContainerScopedWithGroups() {
                   }
                 </style>
                 
-                rectangle "A\\n<size:16>[Container]</size>" <<Boundary-QQ==>> {
-                  rectangle "Group 1" <<Group-R3JvdXAgMQ==>> as groupR3JvdXAgMQ== {
-                    rectangle "==A\\n<size:16>[Component]</size>" <<Element-RWxlbWVudA==>> as A.A.A
+                rectangle "A\\n<size:16>[Software System]</size>" <<Boundary-QQ==>> {
+                  rectangle "A\\n<size:16>[Container]</size>" <<Boundary-QQ==>> {
+                    rectangle "Group 1" <<Group-R3JvdXAgMQ==>> as groupR3JvdXAgMQ== {
+                      rectangle "==A\\n<size:16>[Component]</size>" <<Element-RWxlbWVudA==>> as A.A.A
+                    }
+                
                   }
                 
                 }
                 
-                rectangle "B\\n<size:16>[Container]</size>" <<Boundary-Qg==>> {
-                  rectangle "Group 2" <<Group-R3JvdXAgMg==>> as groupR3JvdXAgMg== {
-                    rectangle "==B\\n<size:16>[Component]</size>" <<Element-RWxlbWVudA==>> as B.B.B
+                rectangle "B\\n<size:16>[Software System]</size>" <<Boundary-Qg==>> {
+                  rectangle "B\\n<size:16>[Container]</size>" <<Boundary-Qg==>> {
+                    rectangle "Group 2" <<Group-R3JvdXAgMg==>> as groupR3JvdXAgMg== {
+                      rectangle "==B\\n<size:16>[Component]</size>" <<Element-RWxlbWVudA==>> as B.B.B
+                    }
+                
                   }
                 
                 }
