Fixes #362.

structurizr · Dec 10, 2024 · 1d6cda2 · 1d6cda2
1 parent 0ef815a
commit 1d6cda2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 3.2.1 (10th December 2024)
+
+- structurizr-core: Fixes https://github.com/structurizr/java/issues/362 (Ordering of replicated relationships in deployment environment is non-deterministic).
+
 ## 3.2.0 (6th December 2024)
 
 - structurizr-dsl: Adds support for `element!=` expressions.

diff --git a/gradle.properties b/gradle.properties
@@ -5,4 +5,4 @@ signing.secretKeyRingFile=/some/path
 ossrhUsername=username
 ossrhPassword=password
 
-version=3.2.0
+version=3.2.1
diff --git a/structurizr-core/src/main/java/com/structurizr/model/Model.java b/structurizr-core/src/main/java/com/structurizr/model/Model.java
@@ -902,12 +902,11 @@ private void replicateElementRelationships(StaticStructureElementInstance elemen
         StaticStructureElement element = elementInstance.getElement();
 
         // find all StaticStructureElementInstance objects in the same deployment environment and deployment group
-        Set<StaticStructureElementInstance> elementInstances = getElements().stream()
+        TreeSet<StaticStructureElementInstance> elementInstances = getElements().stream()
                 .filter(e -> e instanceof StaticStructureElementInstance)
-                .map(e -> (StaticStructureElementInstance)e)
+                .map(e -> (StaticStructureElementInstance) e)
                 .filter(ssei -> ssei.getEnvironment().equals(elementInstance.getEnvironment()))
-                .filter(ssei -> ssei.inSameDeploymentGroup(elementInstance))
-                .collect(Collectors.toSet());
+                .filter(ssei -> ssei.inSameDeploymentGroup(elementInstance)).collect(Collectors.toCollection(TreeSet::new));
 
         // and replicate the relationships to/from the element instance
         for (StaticStructureElementInstance ssei : elementInstances) {