Don't create empty deployment views.

structurizr · Jun 21, 2020 · 327c462 · 327c462
1 parent eaacf26
commit 327c462
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/structurizr-core/src/com/structurizr/view/ViewSet.java b/structurizr-core/src/com/structurizr/view/ViewSet.java
@@ -732,10 +732,12 @@ public void createDefaultViews() {
         for (String deploymentEnvironment : deploymentEnvironments) {
             List<SoftwareSystem> softwareSystems = new ArrayList<>();
             for (DeploymentNode deploymentNode : model.getDeploymentNodes()) {
-                for (ContainerInstance containerInstance : deploymentNode.getContainerInstances()) {
-                    SoftwareSystem softwareSystem = containerInstance.getContainer().getSoftwareSystem();
-                    if (!softwareSystems.contains(softwareSystem)) {
-                        softwareSystems.add(softwareSystem);
+                if (deploymentNode.getEnvironment().equals(deploymentEnvironment)) {
+                    for (ContainerInstance containerInstance : deploymentNode.getContainerInstances()) {
+                        SoftwareSystem softwareSystem = containerInstance.getContainer().getSoftwareSystem();
+                        if (!softwareSystems.contains(softwareSystem)) {
+                            softwareSystems.add(softwareSystem);
+                        }
                     }
                 }
             }

diff --git a/structurizr-core/test/unit/com/structurizr/view/ViewSetTests.java b/structurizr-core/test/unit/com/structurizr/view/ViewSetTests.java
@@ -1007,17 +1007,14 @@ public void test_createDefaultViews() {
         views.clear();
 
         dev.add(c1);
-        dev.add(c2);
         live.add(c1);
         live.add(c2);
 
         views.createDefaultViews();
 
-        assertEquals(4, views.getDeploymentViews().size());
+        assertEquals(3, views.getDeploymentViews().size());
         assertSame(ss1, views.getDeploymentViews().stream().filter(v -> v.getKey().equals("SoftwareSystem1-Development-Deployment")).findFirst().get().getSoftwareSystem());
         assertSame("Development", views.getDeploymentViews().stream().filter(v -> v.getKey().equals("SoftwareSystem1-Development-Deployment")).findFirst().get().getEnvironment());
-        assertSame(ss2, views.getDeploymentViews().stream().filter(v -> v.getKey().equals("SoftwareSystem2-Development-Deployment")).findFirst().get().getSoftwareSystem());
-        assertSame("Development", views.getDeploymentViews().stream().filter(v -> v.getKey().equals("SoftwareSystem2-Development-Deployment")).findFirst().get().getEnvironment());
         assertSame(ss1, views.getDeploymentViews().stream().filter(v -> v.getKey().equals("SoftwareSystem1-Live-Deployment")).findFirst().get().getSoftwareSystem());
         assertSame("Live", views.getDeploymentViews().stream().filter(v -> v.getKey().equals("SoftwareSystem1-Live-Deployment")).findFirst().get().getEnvironment());
         assertSame(ss2, views.getDeploymentViews().stream().filter(v -> v.getKey().equals("SoftwareSystem2-Live-Deployment")).findFirst().get().getSoftwareSystem());