Use MP config instead of Config.create() in MP components.

integrations/micrometer/cdi/src/main/java/io/helidon/integrations/micrometer/cdi/MeterRegistryProducer.java

@@ -21,10 +21,12 @@
 
 import io.helidon.common.LazyValue;
 import io.helidon.config.Config;
+import io.helidon.config.mp.MpConfig;
 import io.helidon.integrations.micrometer.MeterRegistryFactory;
 import io.helidon.integrations.micrometer.MicrometerSupport;
 
 import io.micrometer.core.instrument.MeterRegistry;
+import org.eclipse.microprofile.config.ConfigProvider;
 
 @ApplicationScoped
 class MeterRegistryProducer {
@@ -55,7 +57,7 @@ static void clear() {
     }
 
     private static MicrometerSupport createMicrometerSupport() {
-        Config micrometerConfig = Config.create().get(CONFIG_KEY);
+        Config micrometerConfig = MpConfig.toHelidonConfig(ConfigProvider.getConfig()).get(CONFIG_KEY);
         MeterRegistryFactory factory = MeterRegistryFactory.getInstance(
                 MeterRegistryFactory.builder()
                     .config(micrometerConfig));

integrations/micrometer/cdi/src/main/java/module-info.java

@@ -35,6 +35,7 @@
     requires io.helidon.config;
     requires io.helidon.webserver.cors;
     requires io.helidon.integrations.micrometer;
+    requires io.helidon.config.mp;
 
     requires micrometer.core;
     requires micrometer.registry.prometheus;

integrations/micrometer/micrometer/src/main/java/io/helidon/integrations/micrometer/MeterRegistryFactory.java

@@ -341,45 +341,45 @@ private List<Enrollment> explicitAndBuiltInEnrollments() {
          * @param registriesConfig {@code Config} object for the 1 or more {@code builtin-registries} entries
          */
         private void enrollBuiltInRegistries(Config registriesConfig) {
-
-            if (registriesConfig.type() != Config.Type.LIST) {
-                throw new IllegalArgumentException("Expected Micrometer config " + BUILTIN_REGISTRIES_CONFIG_KEY + " as a LIST "
-                        + "but found " + registriesConfig.type().name());
-            }
-
+            // in case config is created from MP config, node type is OBJECT instead of LIST
+            // as MP config flattens everything
             Map<BuiltInRegistryType, MicrometerBuiltInRegistrySupport> candidateBuiltInRegistryTypes =
                     new HashMap<>();
             List<String> unrecognizedTypes = new ArrayList<>();
 
-            for (Config registryConfig : registriesConfig.asNodeList().get()) {
-                String registryType = registryConfig.get("type").asString().get();
-                try {
-                    BuiltInRegistryType type =
-                            BuiltInRegistryType.valueByName(registryType);
-
-                    MicrometerBuiltInRegistrySupport builtInRegistrySupport =
-                            MicrometerBuiltInRegistrySupport.create(type, registryConfig.asNode());
-                    if (builtInRegistrySupport != null) {
-                        candidateBuiltInRegistryTypes.put(type, builtInRegistrySupport);
-                    }
-                } catch (BuiltInRegistryType.UnrecognizedBuiltInRegistryTypeException e) {
-                    unrecognizedTypes.add(e.unrecognizedType());
-                    logRecords.add(new LogRecord(Level.WARNING,
-                            String.format("Ignoring unrecognized Micrometer built-in registry type %s", e.unrecognizedType())));
-                }
-            }
+            registriesConfig.asList(Config.class)
+                    .ifPresent(confList -> {
+                        for (Config registryConfig : confList) {
+                            String registryType = registryConfig.get("type").asString().get();
+                            try {
+                                BuiltInRegistryType type =
+                                        BuiltInRegistryType.valueByName(registryType);
+
+                                MicrometerBuiltInRegistrySupport builtInRegistrySupport =
+                                        MicrometerBuiltInRegistrySupport.create(type, registryConfig.asNode());
+
+                                candidateBuiltInRegistryTypes.put(type, builtInRegistrySupport);
+                            } catch (BuiltInRegistryType.UnrecognizedBuiltInRegistryTypeException e) {
+                                unrecognizedTypes.add(e.unrecognizedType());
+                                logRecords.add(new LogRecord(Level.WARNING,
+                                                             String.format(
+                                                                     "Ignoring unrecognized Micrometer built-in registry type %s",
+                                                                     e.unrecognizedType())));
+                            }
+                        }
+                    });
 
             if (!unrecognizedTypes.isEmpty()) {
                 LOGGER.log(Level.WARNING, String.format("Ignoring unrecognized Micrometer built-in registries: %s",
-                        unrecognizedTypes.toString()));
+                                                        unrecognizedTypes));
             }
 
             // Do not change previous settings if we did not find any valid new built-in registries selected.
             if (!candidateBuiltInRegistryTypes.isEmpty()) {
                 builtInRegistriesRequested.clear();
                 builtInRegistriesRequested.putAll(candidateBuiltInRegistryTypes);
                 LOGGER.log(Level.FINE,
-                        () -> "Selecting built-in Micrometer registries " + candidateBuiltInRegistryTypes.toString());
+                        () -> "Selecting built-in Micrometer registries " + candidateBuiltInRegistryTypes);
             }
         }
     }

microprofile/fault-tolerance/src/main/java/io/helidon/microprofile/faulttolerance/FaultToleranceExtension.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, 2020 Oracle and/or its affiliates.
+ * Copyright (c) 2018, 2021 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,6 +44,7 @@
 
 import io.helidon.common.configurable.ScheduledThreadPoolSupplier;
 import io.helidon.common.configurable.ThreadPoolSupplier;
+import io.helidon.config.mp.MpConfig;
 import io.helidon.faulttolerance.FaultTolerance;
 
 import org.eclipse.microprofile.config.Config;
@@ -270,7 +271,7 @@ void registerMetricsAndInitExecutors(@Observes AfterDeploymentValidation validat
         }
 
         // Initialize executors for MP FT - default size of 16
-        io.helidon.config.Config config = io.helidon.config.Config.create();
+        io.helidon.config.Config config = MpConfig.toHelidonConfig(ConfigProvider.getConfig());
         scheduledThreadPoolSupplier = ScheduledThreadPoolSupplier.builder()
                 .threadNamePrefix("ft-mp-schedule-")
                 .corePoolSize(16)

microprofile/fault-tolerance/src/main/java/module-info.java

@@ -29,6 +29,7 @@
     requires io.helidon.microprofile.config;
     requires io.helidon.microprofile.server;
     requires io.helidon.microprofile.metrics;
+    requires io.helidon.config.mp;
 
     requires jakarta.enterprise.cdi.api;
 

microprofile/grpc/server/src/main/java/io/helidon/microprofile/grpc/server/GrpcServerCdiExtension.java

@@ -39,6 +39,7 @@
 
 import io.helidon.common.serviceloader.HelidonServiceLoader;
 import io.helidon.config.Config;
+import io.helidon.config.mp.MpConfig;
 import io.helidon.grpc.server.GrpcRouting;
 import io.helidon.grpc.server.GrpcServer;
 import io.helidon.grpc.server.GrpcServerConfiguration;
@@ -51,6 +52,7 @@
 import io.grpc.BindableService;
 import io.grpc.Channel;
 import io.grpc.inprocess.InProcessChannelBuilder;
+import org.eclipse.microprofile.config.ConfigProvider;
 
 /**
  * A CDI extension that will start the {@link GrpcServer gRPC server}.
@@ -73,7 +75,7 @@ public class GrpcServerCdiExtension
     private void startServer(@Observes @Initialized(ApplicationScoped.class) Object event, BeanManager beanManager) {
         GrpcRouting.Builder routingBuilder = discoverGrpcRouting(beanManager);
 
-        Config config = resolveConfig(beanManager);
+        Config config = MpConfig.toHelidonConfig(ConfigProvider.getConfig());
         GrpcServerConfiguration.Builder serverConfiguration = GrpcServerConfiguration.builder(config.get("grpc"));
         CompletableFuture<GrpcServer> startedFuture = new CompletableFuture<>();
         CompletableFuture<GrpcServer> shutdownFuture = new CompletableFuture<>();
@@ -129,26 +131,6 @@ private void stopServer(@Observes BeforeShutdown event) {
         }
     }
 
-    /**
-     * Resolve the Helidon configuration to use.
-     * <p>
-     * The a bean of type {@link Config} is resolvable then that
-     * bean will be used for the configuration otherwise a new
-     * configuration will be created using {@link Config#create()}.
-     *
-     * @param beanManager  the {@link BeanManager} to use to resolve the config bean
-     *
-     * @return  the {@link Config} to use
-     */
-    private Config resolveConfig(BeanManager beanManager) {
-        Instance<Config> instance = beanManager.createInstance().select(Config.class);
-        if (instance.isResolvable()) {
-            return instance.get();
-        } else {
-            return Config.create();
-        }
-    }
-
     /**
      * Discover the services and interceptors to use to configure the
      * {@link GrpcRouting}.

microprofile/grpc/server/src/main/java/module-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2020 Oracle and/or its affiliates.
+ * Copyright (c) 2019, 2021 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
     requires transitive io.helidon.microprofile.grpc.core;
     requires io.helidon.common.serviceloader;
     requires io.helidon.microprofile.server;
+    requires io.helidon.config.mp;
 
     requires transitive io.grpc;
     requires grpc.protobuf.lite;