Merge pull request #45550 from mcruzdev/config-gcp-functions

Convert google-cloud-functions to use @ConfigMapping
quarkusio · Jan 13, 2025 · 18c4016 · 18c4016
2 parents 86ff381 + cb356f7
commit 18c4016
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/extensions/google-cloud-functions/deployment/pom.xml b/extensions/google-cloud-functions/deployment/pom.xml
@@ -43,9 +43,6 @@
                                     <version>${project.version}</version>
                                 </path>
                             </annotationProcessorPaths>
-                            <compilerArgs>
-                                <arg>-AlegacyConfigRoot=true</arg>
-                            </compilerArgs>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/extensions/google-cloud-functions/runtime/pom.xml b/extensions/google-cloud-functions/runtime/pom.xml
@@ -55,9 +55,6 @@
                                     <version>${project.version}</version>
                                 </path>
                             </annotationProcessorPaths>
-                            <compilerArgs>
-                                <arg>-AlegacyConfigRoot=true</arg>
-                            </compilerArgs>
                         </configuration>
                     </execution>
                 </executions>

diff --git a/...functions/runtime/src/main/java/io/quarkus/gcp/functions/GoogleCloudFunctionRecorder.java b/...functions/runtime/src/main/java/io/quarkus/gcp/functions/GoogleCloudFunctionRecorder.java
@@ -12,8 +12,8 @@ public class GoogleCloudFunctionRecorder {
     public void selectDelegate(GoogleCloudFunctionsConfig config, List<GoogleCloudFunctionInfo> cloudFunctions) {
         Map<GoogleCloudFunctionInfo.FunctionType, String> delegates = new HashMap<>();
         // if a function name is defined, check that it exists
-        if (config.function.isPresent()) {
-            String functionName = config.function.get();
+        if (config.function().isPresent()) {
+            String functionName = config.function().get();
             boolean found = false;
             for (GoogleCloudFunctionInfo info : cloudFunctions) {
                 if (functionName.equals(info.getBeanName())) {

diff --git a/...-functions/runtime/src/main/java/io/quarkus/gcp/functions/GoogleCloudFunctionsConfig.java b/...-functions/runtime/src/main/java/io/quarkus/gcp/functions/GoogleCloudFunctionsConfig.java
@@ -2,19 +2,19 @@
 
 import java.util.Optional;
 
-import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigPhase;
 import io.quarkus.runtime.annotations.ConfigRoot;
+import io.smallrye.config.ConfigMapping;
 
 @ConfigRoot(phase = ConfigPhase.RUN_TIME)
-public class GoogleCloudFunctionsConfig {
+@ConfigMapping(prefix = "quarkus.google-cloud-functions")
+public interface GoogleCloudFunctionsConfig {
     /**
      * The function name. Function names are specified on function classes using the {@link @jakarta.inject.Named} annotation.
      *
      * If this name is unspecified and there is exactly one unnamed function then this unnamed function will be used.
      * If there is only a single named function and the name is unspecified then the named function will be used.
      * These rules apply for each function implementation (HttpFunction, BackgroundFunction, RawBackgroundFunction).
      */
-    @ConfigItem
-    public Optional<String> function;
+    Optional<String> function();
 }