Remove deprecated Mongo configuration and use mapping object

Author: radcortez

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

@@ -20,18 +20,6 @@
 public interface MongodbConfig {
     String CONFIG_NAME = "mongodb";
     String DEFAULT_CLIENT_NAME = "<default>";
-    @Deprecated
-    String NATIVE_DNS_LOG_ACTIVITY = "native.dns.log-activity";
-    String DNS_LOG_ACTIVITY = "dns.log-activity";
-    @Deprecated
-    String NATIVE_DNS_SERVER_HOST = "native.dns.server-host";
-    String DNS_SERVER_HOST = "dns.server-host";
-    @Deprecated
-    String NATIVE_DNS_SERVER_PORT = "native.dns.server-port";
-    String DNS_SERVER_PORT = "dns.server-port";
-    @Deprecated
-    String NATIVE_DNS_LOOKUP_TIMEOUT = "native.dns.lookup-timeout";
-    String DNS_LOOKUP_TIMEOUT = "dns.lookup-timeout";
 
     /**
      * Configures the Mongo clients.
@@ -92,75 +80,33 @@ public interface MongodbConfig {
     @WithDefault("false")
     boolean useVertxDnsResolverInNativeMode();
 
-    /**
-     * If {@code native.dns.use-vertx-dns-resolver} is set to {@code true}, this property configures the DNS server.
-     * If the server is not set, it tries to read the first {@code nameserver} from {@code /etc/resolv.conf} (if the
-     * file exists), otherwise fallback to the default.
-     *
-     * @deprecated this property has been deprecated in favor of {@link #dnsServer}
-     */
-    @Deprecated
-    @WithName(NATIVE_DNS_SERVER_HOST)
-    Optional<String> dnsServerInNativeMode();
-
     /**
      * This property configures the DNS server. If the server is not set, it tries to read the first {@code nameserver} from
      * {@code /etc /resolv.conf} (if the file exists), otherwise fallback to the default.
      */
-    @WithName(DNS_SERVER_HOST)
+    @WithName("dns.server-host")
     Optional<String> dnsServer();
 
-    /**
-     * If {@code native.dns.use-vertx-dns-resolver} is set to {@code true}, this property configures the DNS server port.
-     *
-     * @deprecated this property has been deprecated in favor of {@link #dnsServerPort}
-     */
-    @Deprecated
-    @WithName(NATIVE_DNS_SERVER_PORT)
-    OptionalInt dnsServerPortInNativeMode();
-
     /**
      * This property configures the DNS server port.
      */
-    @WithName(DNS_SERVER_PORT)
+    @WithName("dns.server-port")
     OptionalInt dnsServerPort();
 
-    /**
-     * If {@code native.dns.use-vertx-dns-resolver} is set to {@code true}, this property configures the DNS lookup timeout
-     * duration.
-     *
-     * @deprecated this property has been deprecated in favor of {@link #dnsLookupTimeout}
-     */
-    @Deprecated
-    @WithName(NATIVE_DNS_LOOKUP_TIMEOUT)
-    @WithDefault("5s")
-    Duration dnsLookupTimeoutInNativeMode();
-
     /**
      * If {@code native.dns.use-vertx-dns-resolver} is set to {@code true}, this property configures the DNS lookup timeout
      * duration.
      */
-    @WithName(DNS_LOOKUP_TIMEOUT)
+    @WithName("dns.lookup-timeout")
     @WithDefault("5s")
     Duration dnsLookupTimeout();
 
-    /**
-     * If {@code native.dns.use-vertx-dns-resolver} is set to {@code true}, this property enables the logging ot the
-     * DNS lookup. It can be useful to understand why the lookup fails.
-     *
-     * @deprecated this property has been deprecated in favor of {@link #dnsLookupLogActivity}
-     */
-    @Deprecated
-    @WithDefault("false")
-    @WithName(NATIVE_DNS_LOG_ACTIVITY)
-    Optional<Boolean> dnsLookupLogActivityInNativeMode();
-
     /**
      * This property enables the logging ot the DNS lookup. It can be useful to understand why the lookup fails.
      */
     @WithDefault("false")
-    @WithName(DNS_LOG_ACTIVITY)
-    Optional<Boolean> dnsLookupLogActivity();
+    @WithName("dns.log-activity")
+    boolean dnsLookupLogActivity();
 
     static boolean isDefaultClient(final String name) {
         return DEFAULT_CLIENT_NAME.equalsIgnoreCase(name);

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

@@ -1,6 +1,7 @@
 package io.quarkus.mongodb.runtime.dns;
 
 import static java.lang.String.format;
+import static org.eclipse.microprofile.config.ConfigProvider.getConfig;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -17,8 +18,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
-import org.eclipse.microprofile.config.Config;
-import org.eclipse.microprofile.config.ConfigProvider;
 import org.jboss.logging.Logger;
 
 import com.mongodb.MongoConfigurationException;
@@ -27,61 +26,47 @@
 
 import io.quarkus.mongodb.runtime.MongodbConfig;
 import io.quarkus.runtime.annotations.RegisterForReflection;
+import io.smallrye.config.SmallRyeConfig;
 import io.smallrye.mutiny.Uni;
 import io.vertx.core.dns.DnsClientOptions;
 import io.vertx.mutiny.core.Vertx;
 import io.vertx.mutiny.core.dns.SrvRecord;
 
 @RegisterForReflection
 public class MongoDnsClient implements DnsClient {
-    private static final String BASE_CONFIG_NAME = "quarkus." + MongodbConfig.CONFIG_NAME + ".";
-
-    public static final String DNS_LOOKUP_TIMEOUT = BASE_CONFIG_NAME + MongodbConfig.DNS_LOOKUP_TIMEOUT;
-    public static final String NATIVE_DNS_LOOKUP_TIMEOUT = BASE_CONFIG_NAME + MongodbConfig.NATIVE_DNS_LOOKUP_TIMEOUT;
-
-    public static final String DNS_LOG_ACTIVITY = BASE_CONFIG_NAME + MongodbConfig.DNS_LOG_ACTIVITY;
-    public static final String NATIVE_DNS_LOG_ACTIVITY = BASE_CONFIG_NAME + MongodbConfig.NATIVE_DNS_LOG_ACTIVITY;
-
-    public static final String DNS_SERVER = BASE_CONFIG_NAME + MongodbConfig.DNS_SERVER_HOST;
-    public static final String NATIVE_DNS_SERVER = BASE_CONFIG_NAME + MongodbConfig.NATIVE_DNS_SERVER_HOST;
-    public static final String DNS_SERVER_PORT = BASE_CONFIG_NAME + MongodbConfig.DNS_SERVER_PORT;
-    public static final String NATIVE_DNS_SERVER_PORT = BASE_CONFIG_NAME + MongodbConfig.NATIVE_DNS_SERVER_PORT;
-
-    private final Config config = ConfigProvider.getConfig();
-
-    private final io.vertx.mutiny.core.dns.DnsClient dnsClient;
+    private static final Logger log = Logger.getLogger(MongoDnsClient.class);
 
     // the static fields are used in order to hold DNS resolution result that has been performed on the main thread
     // at application startup
     // the reason we need this is to ensure that no blocking of event loop threads will occur due to DNS resolution
     private static final Map<String, List<SrvRecord>> SRV_CACHE = new ConcurrentHashMap<>();
     private static final Map<String, List<String>> TXT_CACHE = new ConcurrentHashMap<>();
 
-    private static final Logger log = Logger.getLogger(MongoDnsClient.class);
+    private final io.vertx.mutiny.core.dns.DnsClient dnsClient;
+    private final MongodbConfig mongoConfig;
 
     MongoDnsClient(io.vertx.core.Vertx vertx) {
+        this.mongoConfig = getConfig().unwrap(SmallRyeConfig.class).getConfigMapping(MongodbConfig.class);
         Vertx mutinyVertx = new io.vertx.mutiny.core.Vertx(vertx);
 
-        boolean activity = config.getOptionalValue(DNS_LOG_ACTIVITY, Boolean.class).orElse(false);
-
         // If the server is not set, we attempt to read the /etc/resolv.conf. If it does not exist, we use the default
         // configuration.
-        String server = config.getOptionalValue(DNS_SERVER, String.class).orElseGet(() -> {
+        String server = mongoConfig.dnsServer().orElseGet(() -> {
             List<String> list = nameServers();
             if (!list.isEmpty()) {
                 return list.get(0);
             }
             return null;
         });
         DnsClientOptions dnsClientOptions = new DnsClientOptions()
-                .setLogActivity(activity);
+                .setLogActivity(mongoConfig.dnsLookupLogActivity());
         if (server != null) {
             dnsClientOptions.setHost(server);
-            if (config.getOptionalValue(DNS_SERVER_PORT, Integer.class).isPresent()) {
-                dnsClientOptions.setPort(config.getOptionalValue(DNS_SERVER_PORT, Integer.class).orElseThrow());
+            if (mongoConfig.dnsServerPort().isPresent()) {
+                dnsClientOptions.setPort(mongoConfig.dnsServerPort().orElseThrow());
             }
         }
-        dnsClientOptions.setQueryTimeout(config.getValue(DNS_LOOKUP_TIMEOUT, Duration.class).toMillis());
+        dnsClientOptions.setQueryTimeout(mongoConfig.dnsLookupTimeout().toMillis());
 
         if (log.isDebugEnabled()) {
             log.debugf("DNS client options: %s", dnsClientOptions.toJson());
@@ -128,8 +113,7 @@ public List<String> getResourceRecordData(String name, String type) throws DnsEx
      */
     private List<String> resolveSrvRequest(final String srvHost) {
         List<String> hosts = new ArrayList<>();
-        Duration timeout = config.getOptionalValue(DNS_LOOKUP_TIMEOUT, Duration.class)
-                .orElse(Duration.ofSeconds(5));
+        Duration timeout = mongoConfig.dnsLookupTimeout();
 
         try {
             List<SrvRecord> srvRecords;
@@ -184,9 +168,7 @@ public List<String> resolveTxtRequest(final String host) {
             return TXT_CACHE.get(host);
         }
         try {
-            Duration timeout = config.getOptionalValue(DNS_LOOKUP_TIMEOUT, Duration.class)
-                    .orElse(Duration.ofSeconds(5));
-
+            Duration timeout = mongoConfig.dnsLookupTimeout();
             return Uni.createFrom().<List<String>> deferred(
                     new Supplier<>() {
                         @Override