Fixes an issue where containers could be rendered outside of their software system boundary on component views.

Author: simonbrowndotje

structurizr-autolayout/src/test/java/com/structurizr/autolayout/graphviz/DOTExporterTests.java

@@ -499,19 +499,23 @@ public void test_writeComponentViewWithGroupedElements() {
                 
                   1 [width=1.500000,height=1.000000,fixedsize=true,id=1,label="1: Box"]
                 
-                  subgraph cluster_3 {
+                  subgraph cluster_2 {
                     margin=25
-                    subgraph "cluster_group_1" {
+                    subgraph cluster_3 {
                       margin=25
-                      5 [width=1.500000,height=1.000000,fixedsize=true,id=5,label="5: Component 2"]
-                    }
+                      subgraph "cluster_group_1" {
+                        margin=25
+                        5 [width=1.500000,height=1.000000,fixedsize=true,id=5,label="5: Component 2"]
+                      }
                 
-                    subgraph "cluster_group_2" {
-                      margin=25
-                      6 [width=1.500000,height=1.000000,fixedsize=true,id=6,label="6: Component 3"]
+                      subgraph "cluster_group_2" {
+                        margin=25
+                        6 [width=1.500000,height=1.000000,fixedsize=true,id=6,label="6: Component 3"]
+                      }
+                
+                      4 [width=1.500000,height=1.000000,fixedsize=true,id=4,label="4: Component 1"]
                     }
                 
-                    4 [width=1.500000,height=1.000000,fixedsize=true,id=4,label="4: Component 1"]
                   }
                 
                   4 -> 5 [id=7]

structurizr-export/src/main/java/com/structurizr/export/AbstractDiagramExporter.java

@@ -283,30 +283,38 @@ public Diagram export(ComponentView view, Integer animationStep) {
         IndentingWriter writer = new IndentingWriter();
         writeHeader(view, writer);
 
-        boolean elementsWritten = false;
-        for (ElementView elementView : view.getElements()) {
-            if (!(elementView.getElement() instanceof Component)) {
-                writeElement(view, elementView.getElement(), writer);
-                elementsWritten = true;
-            }
+        List<CustomElement> customElements = getCustomElements(view);
+        for (CustomElement customElement : customElements) {
+            writeElement(view, customElement, writer);
         }
-
-        if (elementsWritten) {
+        if (!customElements.isEmpty()) {
             writer.writeLine();
         }
 
-        boolean includeSoftwareSystemBoundaries = "true".equals(view.getProperties().getOrDefault("structurizr.softwareSystemBoundaries", "false"));
+        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);
+        List<Container> containers = getContainers(view);
+        Set<SoftwareSystem> boundarySoftwareSystems = boundaryContainers.stream().map(Container::getSoftwareSystem).collect(Collectors.toCollection(LinkedHashSet::new));
+        for (SoftwareSystem softwareSystem : boundarySoftwareSystems) {
 
-            for (Container container : containers) {
+            startSoftwareSystemBoundary(view, softwareSystem, writer);
+
+            for (Container container : boundaryContainers) {
                 if (container.getSoftwareSystem() == softwareSystem) {
                     startContainerBoundary(view, container, writer);
 
@@ -317,10 +325,13 @@ public Diagram export(ComponentView view, Integer animationStep) {
                 }
             }
 
-            if (includeSoftwareSystemBoundaries) {
-                endSoftwareSystemBoundary(view, writer);
-                writer.outdent();
+            for (Container container : containers) {
+                if (container.getSoftwareSystem() == softwareSystem) {
+                    writeElement(view, container, writer);
+                }
             }
+
+            endSoftwareSystemBoundary(view, writer);
         }
 
         writeRelationships(view, writer);
@@ -330,11 +341,24 @@ public Diagram export(ComponentView view, Integer animationStep) {
         return createDiagram(view, writer.toString());
     }
 
+    protected List<CustomElement> getCustomElements(ModelView view) {
+        return view.getElements().stream().map(ElementView::getElement).filter(e -> e instanceof CustomElement).map(c -> ((CustomElement) c)).distinct().sorted(Comparator.comparing(Element::getId)).collect(Collectors.toList());
+    }
+
+    protected List<Person> getPeople(ModelView view) {
+        return view.getElements().stream().map(ElementView::getElement).filter(e -> e instanceof Person).map(c -> ((Person) c)).distinct().sorted(Comparator.comparing(Element::getId)).collect(Collectors.toList());
+    }
+
+    protected List<SoftwareSystem> getSoftwareSystems(ModelView view) {
+        return view.getElements().stream().map(ElementView::getElement).filter(e -> e instanceof SoftwareSystem).map(c -> ((SoftwareSystem) c)).distinct().sorted(Comparator.comparing(Element::getId)).collect(Collectors.toList());
+    }
+
     protected List<Container> getBoundaryContainers(ModelView view) {
-        List<Container> containers = new ArrayList<>(view.getElements().stream().map(ElementView::getElement).filter(e -> e instanceof Component).map(c -> ((Component)c).getContainer()).collect(Collectors.toSet()));
-        containers.sort(Comparator.comparing(Element::getId));
+        return view.getElements().stream().map(ElementView::getElement).filter(e -> e instanceof Component).map(c -> ((Component) c).getContainer()).distinct().sorted(Comparator.comparing(Element::getId)).collect(Collectors.toList());
+    }
 
-        return containers;
+    protected List<Container> getContainers(ModelView view) {
+        return view.getElements().stream().map(ElementView::getElement).filter(e -> e instanceof Container).map(c -> ((Container) c)).distinct().sorted(Comparator.comparing(Element::getId)).collect(Collectors.toList());
     }
 
     public Diagram export(DynamicView view) {

structurizr-export/src/main/java/com/structurizr/export/plantuml/C4PlantUMLExporter.java

@@ -249,8 +249,6 @@ protected void writeHeader(ModelView view, IndentingWriter writer) {
             }
 
             if (!boundaryStyles.isEmpty()) {
-                writer.writeLine();
-
                 for (String tagList : boundaryStyles.keySet()) {
                     ElementStyle elementStyle = boundaryStyles.get(tagList);
                     tagList = tagList.replaceFirst("Element,", "");
@@ -273,6 +271,8 @@ protected void writeHeader(ModelView view, IndentingWriter writer) {
                     line = line.replace(", $borderThickness=\"1\")", ")");
                     writer.writeLine(line);
                 }
+
+                writer.writeLine();
             }
         }
     }