Apply suggestions from code review

Co-authored-by: Georgios Andrianakis <[email protected]>

Author: 2 people

Diff for: docs/src/main/asciidoc/liquibase-mongodb.adoc

@@ -82,7 +82,7 @@ quarkus.liquibase-mongodb.migrate-at-start=true
 ----
 NOTE: Liquibase needs a database either in the connection string or with the `quarkus.mongodb.database` property.
 
-NOTE: By default, Liquibase MongoDB is configured to use the default MongoDB client you can change the client with `quarkus.liquibase-mongodb.mongodb-client`.
+NOTE: By default, Liquibase MongoDB is configured to use the default MongoDB client Quarkus creates, but you can configure the extension to use a named client by setting `quarkus.liquibase-mongodb.mongo-client-name`.
 
 Add a changeLog file to the default folder following the Liquibase naming conventions: `{change-log}`
 YAML, JSON and XML formats are supported for the changeLog.

Diff for: extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/mongodb/LiquibaseMongodbFactory.java

@@ -89,11 +89,11 @@ private String parseChangeLog(String changeLog) {
 
     public Liquibase createLiquibase() {
         try (ResourceAccessor resourceAccessor = resolveResourceAccessor()) {
-            MongoClients clients = Arc.container().select(MongoClients.class).stream().findFirst().orElseThrow();
+            MongoClients mongoClients = Arc.container().instance(MongoClients.class).get();
             String mongoClientName;
             MongoClientConfig mongoClientConfig;
-            if (liquibaseMongodbConfig.mongodbClient().isPresent()) {
-                mongoClientName = liquibaseMongodbConfig.mongodbClient().get();
+            if (liquibaseMongodbConfig.mongoClientName().isPresent()) {
+                mongoClientName = liquibaseMongodbConfig.mongoClientName().get();
                 mongoClientConfig = mongodbConfig.mongoClientConfigs().get(mongoClientName);
                 if (mongoClientConfig == null) {
                     throw new IllegalArgumentException("Mongo client named '%s' not found".formatted(mongoClientName));
@@ -114,7 +114,7 @@ public Liquibase createLiquibase() {
                             "be defined when no database exist in the connection string");
                 }
             }
-            Database database = createDatabase(clients, mongoClientName, maybeDatabase.get());
+            Database database = createDatabase(mongoClients, mongoClientName, maybeDatabase.get());
             if (liquibaseMongodbConfig.liquibaseCatalogName().isPresent()) {
                 database.setLiquibaseCatalogName(liquibaseMongodbConfig.liquibaseCatalogName().get());
             }

Diff for: extensions/liquibase-mongodb/runtime/src/main/java/io/quarkus/liquibase/mongodb/runtime/LiquibaseMongodbConfig.java

@@ -26,7 +26,7 @@ public interface LiquibaseMongodbConfig {
     /**
      * Mongodb client name to use to connect to database, defaults to the default mongodb client.
      */
-    Optional<String> mongodbClient();
+    Optional<String> mongoClientName();
 
     /**
      * The migrate at start flag

Diff for: integration-tests/liquibase-mongodb/src/main/resources/application.properties

@@ -3,6 +3,6 @@ quarkus.mongodb.devservices.enabled=false
 
 quarkus.liquibase-mongodb.change-log=liquibase/changelog.xml
 quarkus.liquibase-mongodb.migrate-at-start=true
-quarkus.liquibase-mongodb.mongodb-client=fruit-client
+quarkus.liquibase-mongodb.mongo-client-name=fruit-client
 quarkus.mongodb.fruit-client.database=fruits
 quarkus.mongodb.fruit-client.hosts=localhost:27018