Move assertions to test class and minor changes.

extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MockCommandListener.java

@@ -1,26 +1,18 @@
 package io.quarkus.mongodb;
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.anyOf;
-import static org.hamcrest.Matchers.equalTo;
-import static org.hamcrest.Matchers.notNullValue;
+import java.util.ArrayList;
+import java.util.List;
 
 import com.mongodb.event.CommandListener;
 import com.mongodb.event.CommandStartedEvent;
 
 public class MockCommandListener implements CommandListener {
 
-    private CommandStartedEvent commandStartedEvent;
+    public static final List<String> events = new ArrayList<>();
 
     @Override
     public void commandStarted(CommandStartedEvent startedEvent) {
-        this.commandStartedEvent = startedEvent;
-        assertThat(startedEvent, notNullValue());
-        assertThat(startedEvent.getCommandName(), anyOf(equalTo("listDatabases"), equalTo("endSessions")));
-    }
-
-    public CommandStartedEvent getCommandStartedEvent() {
-        return commandStartedEvent;
+        events.add(startedEvent.getCommandName());
     }
 
 }

extensions/mongodb-client/deployment/src/test/java/io/quarkus/mongodb/MongoCommandListenerTest.java

@@ -1,6 +1,10 @@
 package io.quarkus.mongodb;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.hasItems;
+import static org.hamcrest.Matchers.hasSize;
 
 import javax.inject.Inject;
 
@@ -35,6 +39,8 @@ void cleanup() {
     @Test
     void testClientInitialization() {
         assertThat(client.listDatabaseNames().first()).isNotEmpty();
+        assertThat(MockCommandListener.events, hasSize(1));
+        assertThat(MockCommandListener.events, hasItems(equalTo("listDatabases")));
     }
 
 }

extensions/mongodb-client/runtime/src/main/java/io/quarkus/mongodb/runtime/MongoClients.java

@@ -250,11 +250,7 @@ private MongoClientSettings createMongoConfiguration(MongoClientConfig config) {
                 CodecRegistries.fromProviders(providers));
         settings.codecRegistry(registry);
 
-        List<CommandListener> listeners = new ArrayList<>();
-        if (!mongoClientSupport.getCommandListeners().isEmpty()) {
-            listeners.addAll(getCommandListeners(mongoClientSupport.getCommandListeners()));
-        }
-        settings.commandListenerList(listeners);
+        settings.commandListenerList(getCommandListeners(mongoClientSupport.getCommandListeners()));
 
         config.applicationName.ifPresent(settings::applicationName);