[camel] 16/30: CAMEL-17384: Developer Console SPI

[davsclaus]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch console
in repository https://gitbox.apache.org/repos/asf/camel.git

commit a80ca779a7ae2c06e5672be651344f5692a2914f
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Tue Dec 28 16:26:08 2021 +0100

    CAMEL-17384: Developer Console SPI
---
 .../org/apache/camel/impl/console/DefaultDevConsoleRegistry.java    | 6 ++++--
 .../impl/event/EventNotifierServiceStoppingFailedEventTest.java     | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/core/camel-console/src/main/java/org/apache/camel/impl/console/DefaultDevConsoleRegistry.java
 
b/core/camel-console/src/main/java/org/apache/camel/impl/console/DefaultDevConsoleRegistry.java
index 2fd5c91..6071798 100644
--- 
a/core/camel-console/src/main/java/org/apache/camel/impl/console/DefaultDevConsoleRegistry.java
+++ 
b/core/camel-console/src/main/java/org/apache/camel/impl/console/DefaultDevConsoleRegistry.java
@@ -17,8 +17,9 @@
 package org.apache.camel.impl.console;
 
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.Set;
-import java.util.concurrent.CopyOnWriteArraySet;
+import java.util.TreeSet;
 import java.util.stream.Stream;
 
 import org.apache.camel.CamelContext;
@@ -55,7 +56,8 @@ public class DefaultDevConsoleRegistry extends ServiceSupport 
implements DevCons
     }
 
     public DefaultDevConsoleRegistry(CamelContext camelContext) {
-        this.consoles = new CopyOnWriteArraySet<>();
+        // sort by id
+        this.consoles = new TreeSet<>(Comparator.comparing(DevConsole::getId));
         setCamelContext(camelContext);
     }
 
diff --git 
a/core/camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierServiceStoppingFailedEventTest.java
 
b/core/camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierServiceStoppingFailedEventTest.java
index b8db247..14948b5 100644
--- 
a/core/camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierServiceStoppingFailedEventTest.java
+++ 
b/core/camel-core/src/test/java/org/apache/camel/impl/event/EventNotifierServiceStoppingFailedEventTest.java
@@ -78,7 +78,7 @@ public class EventNotifierServiceStoppingFailedEventTest 
extends ContextTestSupp
         assertIsInstanceOf(CamelContextStoppedEvent.class, events.get(8));
 
         assertEquals("Fail B", event.getCause().getMessage());
-        assertEquals("Failure to stop service: B due to Fail B", 
event.toString());
+        assertEquals("Service stop failure: B due to Fail B", 
event.toString());
     }
 
     private static final class MyService implements Service {