Merge pull request #500 from scireum/feature/sbi/SIRI-891

Sorts component conf files in the correct order
scireum · Oct 16, 2023 · d7b3d94 · d7b3d94
2 parents a37a119 + 619cb73
commit d7b3d94
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/main/java/sirius/kernel/Sirius.java b/src/main/java/sirius/kernel/Sirius.java
@@ -31,6 +31,7 @@
 import java.time.Duration;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -346,7 +347,7 @@ private static void setupApplicationAndSystemConfig() {
             // Load test configurations (will override component configs)
             classpath.find(Pattern.compile("component-test-([^.]*?)\\.conf"))
                      .map(Matcher::group)
-                     .sorted()
+                     .sorted(Comparator.reverseOrder())
                      .forEach(configPath -> {
                          try {
                              LOG.INFO("Loading test config: %s", configPath);
@@ -361,7 +362,7 @@ private static void setupApplicationAndSystemConfig() {
         classpath.find(Pattern.compile("component-([^\\-]*?)([^.]*?)\\.conf"))
                  .map(Matcher::group)
                  .filter(configPath -> !"test".equals(configPath))
-                 .sorted()
+                 .sorted(Comparator.reverseOrder())
                  .forEach(configPath -> {
                      try {
                          LOG.INFO("Loading config: %s", configPath);