improvement: List<MessageSource> already ordered

context/build.gradle

@@ -22,7 +22,10 @@ dependencies {
     testImplementation project(":core-reactive")
     testImplementation project(":inject-java-test")
     testImplementation libs.logback.classic
-
+    testImplementation(libs.micronaut.test.junit5) {
+        exclude group: 'io.micronaut'
+    }
+    testImplementation(libs.junit.jupiter.api)
 }
 
 spotless {

context/src/main/java/io/micronaut/runtime/context/CompositeMessageSource.java

@@ -20,12 +20,10 @@
 import io.micronaut.context.annotation.Primary;
 import io.micronaut.core.annotation.NonNull;
 import io.micronaut.core.annotation.Nullable;
-import io.micronaut.core.order.OrderUtil;
 import io.micronaut.core.util.ArgumentUtils;
+import jakarta.inject.Inject;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Optional;
+import java.util.*;
 
 /**
  * Composite message source that is the primary message source.
@@ -36,19 +34,27 @@
 @Primary
 public final class CompositeMessageSource extends AbstractMessageSource {
 
-    private final Collection<MessageSource> messageSources;
+    private final List<MessageSource> messageSources;
 
     /**
      * The other messages sources.
      *
      * @param messageSources The message sources.
+     * @deprecated Use {@link CompositeMessageSource(List)} instead.
      */
+    @Deprecated
     public CompositeMessageSource(@Nullable Collection<MessageSource> messageSources) {
-        if (messageSources != null) {
-            this.messageSources = OrderUtil.sortOrderedCollection(messageSources);
-        } else {
-            this.messageSources = Collections.emptyList();
-        }
+        this(messageSources == null ? Collections.emptyList() : new ArrayList<>(messageSources));
+    }
+
+    /**
+     * The other messages sources.
+     *
+     * @param messageSources The message sources.
+     */
+    @Inject
+    public CompositeMessageSource(@Nullable List<MessageSource> messageSources) {
+        this.messageSources = messageSources != null ? messageSources : Collections.emptyList();
     }
 
     @NonNull

context/src/test/java/io/micronaut/runtime/context/CompositeMessageSourceTest.java

@@ -0,0 +1,63 @@
+package io.micronaut.runtime.context;
+
+import io.micronaut.context.MessageSource;
+import io.micronaut.context.StaticMessageSource;
+import io.micronaut.context.annotation.Factory;
+import io.micronaut.context.annotation.Property;
+import io.micronaut.context.annotation.Requires;
+import io.micronaut.context.i18n.ResourceBundleMessageSource;
+import io.micronaut.core.annotation.NonNull;
+import io.micronaut.test.extensions.junit5.annotation.MicronautTest;
+import jakarta.inject.Singleton;
+import org.junit.jupiter.api.Test;
+
+import java.util.Locale;
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+@Property(name = "spec.name", value = "CompositeMessageSourceTest")
+@MicronautTest(startApplication = false)
+class CompositeMessageSourceTest {
+
+    @Test
+    void messageSourcesAreSorted(MessageSource messageSource) {
+        String code = "jakarta.validation.constraints.Positive.message";
+        assertEquals("Must be positive", messageSource.getMessage(code, Locale.ENGLISH).get());
+    }
+
+    @Requires(property = "spec.name", value = "CompositeMessageSourceTest")
+    @Factory
+    static class MessageSourceFactory {
+
+        @Singleton
+        MessageSource createMessageSource() {
+            return new MessageSource() {
+                private final MessageSource delegate = new ResourceBundleMessageSource("i18n.messages");
+
+                @Override
+                public @NonNull Optional<String> getRawMessage(@NonNull String code, @NonNull MessageContext context) {
+                    return delegate.getRawMessage(code, context);
+                }
+
+                @Override
+                public @NonNull String interpolate(@NonNull String template, @NonNull MessageContext context) {
+                    return delegate.interpolate(template, context);
+                }
+
+                @Override
+                public int getOrder() {
+                    return HIGHEST_PRECEDENCE;
+                }
+            };
+        }
+    }
+
+    @Requires(property = "spec.name", value = "CompositeMessageSourceTest")
+    @Singleton
+    static class DefaultMessages extends StaticMessageSource {
+        DefaultMessages() {
+            addMessage("jakarta.validation.constraints.Positive.message", "must be greater than 0");
+        }
+    }
+}

context/src/test/resources/i18n/messages.properties

@@ -0,0 +1 @@
+jakarta.validation.constraints.Positive.message=Must be positive