Merge pull request quarkusio#44027 from AmitPr/nondet-config-properties

Fix flaky test due to nondeterministic serialization order
Ladicek · Oct 24, 2024 · fc18f96 · fc18f96
2 parents 8f7119e + 3b6f2fb
commit fc18f96
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/...arkus/devtools/codestarts/core/strategy/SmartConfigMergeCodestartFileStrategyHandler.java b/...arkus/devtools/codestarts/core/strategy/SmartConfigMergeCodestartFileStrategyHandler.java
@@ -7,6 +7,7 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.TreeMap;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.dataformat.yaml.YAMLFactory;
@@ -30,7 +31,8 @@ public String name() {
     }
 
     @Override
-    public void process(Path targetDirectory, String relativePath, List<TargetFile> codestartFiles, Map<String, Object> data)
+    public void process(Path targetDirectory, String relativePath, List<TargetFile> codestartFiles,
+            Map<String, Object> data)
             throws IOException {
         checkNotEmptyCodestartFiles(codestartFiles);
 
@@ -63,7 +65,8 @@ private void writeYamlConfig(Path targetPath, Map<String, Object> config) throws
 
     private void writePropertiesConfig(Path targetPath, Map<String, Object> config) throws IOException {
         final StringBuilder builder = new StringBuilder();
-        final HashMap<String, String> flat = new HashMap<>();
+        // Enforce properties are in consistent order.
+        final TreeMap<String, String> flat = new TreeMap<>();
         flatten("", flat, config);
         for (Map.Entry<String, String> entry : flat.entrySet()) {
             final String key = entry.getKey().replaceAll("\\.~$", "");

diff --git a/...__/ReactiveMessagingCodestartIT/testAMQPContent/src_main_resources_application.properties b/...__/ReactiveMessagingCodestartIT/testAMQPContent/src_main_resources_application.properties
@@ -1,2 +1,2 @@
-mp.messaging.outgoing.words-out.address=words
 mp.messaging.incoming.words-in.address=words
+mp.messaging.outgoing.words-out.address=words
diff --git a/..._/ReactiveMessagingCodestartIT/testKafkaContent/src_main_resources_application.properties b/..._/ReactiveMessagingCodestartIT/testKafkaContent/src_main_resources_application.properties
@@ -1,3 +1,3 @@
+mp.messaging.incoming.words-in.auto.offset.reset=earliest
 mp.messaging.incoming.words-in.topic=words
 mp.messaging.outgoing.words-out.topic=words
-mp.messaging.incoming.words-in.auto.offset.reset=earliest