Squashable commit; invokes fallbackConfigSupplier per request

Signed-off-by: Laird Nelson <laird.nelson@oracle.com>
helidon-io · Sep 12, 2023 · f56c827 · f56c827
1 parent ad85ca5
commit f56c827
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/integrations/oci/sdk/cdi/pom.xml b/integrations/oci/sdk/cdi/pom.xml
@@ -61,6 +61,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+          <groupId>io.helidon.config</groupId>
+          <artifactId>helidon-config-mp</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.helidon.integrations.oci.sdk</groupId>
             <artifactId>helidon-integrations-oci-sdk-runtime</artifactId>

diff --git a/integrations/oci/sdk/cdi/src/main/java/io/helidon/integrations/oci/sdk/cdi/OciExtension.java b/integrations/oci/sdk/cdi/src/main/java/io/helidon/integrations/oci/sdk/cdi/OciExtension.java
@@ -63,6 +63,8 @@
 import org.eclipse.microprofile.config.Config;
 import org.eclipse.microprofile.config.ConfigProvider;
 
+import static io.helidon.config.mp.MpConfig.toHelidonConfig;
+import static io.helidon.integrations.oci.sdk.runtime.OciExtension.fallbackConfigSupplier;
 import static io.helidon.integrations.oci.sdk.runtime.OciExtension.ociAuthenticationProvider;
 import static java.lang.invoke.MethodType.methodType;
 
@@ -663,14 +665,17 @@ private void processInjectionPoint(@Observes ProcessInjectionPoint<?, ?> event)
     }
 
     private void afterBeanDiscovery(@Observes AfterBeanDiscovery event, BeanManager bm) {
-        for (ServiceTaqs serviceTaqs : this.serviceTaqs) {
-            if (serviceTaqs.isEmpty()) {
-                installAdps(event, bm, serviceTaqs.qualifiers());
-            } else {
-                TypeAndQualifiers serviceClientBuilder = serviceTaqs.serviceClientBuilder();
-                TypeAndQualifiers serviceClient = serviceTaqs.serviceClient();
-                installServiceClientBuilder(event, bm, serviceClientBuilder, serviceClient, this.lenientClassloading);
-                installServiceClient(event, bm, serviceClient, serviceTaqs.serviceInterface(), serviceClientBuilder);
+        if (!this.serviceTaqs.isEmpty()) {
+            fallbackConfigSupplier(() -> toHelidonConfig(ConfigProvider.getConfig()));
+            for (ServiceTaqs serviceTaqs : this.serviceTaqs) {
+                if (serviceTaqs.isEmpty()) {
+                    installAdps(event, bm, serviceTaqs.qualifiers());
+                } else {
+                    TypeAndQualifiers serviceClientBuilder = serviceTaqs.serviceClientBuilder();
+                    TypeAndQualifiers serviceClient = serviceTaqs.serviceClient();
+                    installServiceClientBuilder(event, bm, serviceClientBuilder, serviceClient, this.lenientClassloading);
+                    installServiceClient(event, bm, serviceClient, serviceTaqs.serviceInterface(), serviceClientBuilder);
+                }
             }
         }
     }

diff --git a/integrations/oci/sdk/cdi/src/main/java/module-info.java b/integrations/oci/sdk/cdi/src/main/java/module-info.java
@@ -30,6 +30,7 @@
     requires transitive jakarta.cdi;
     requires jakarta.inject;
     requires jakarta.ws.rs;
+    requires io.helidon.config.mp;
     requires io.helidon.integrations.oci.sdk.runtime;
     requires microprofile.config.api;
     requires oci.java.sdk.common;