Merge pull request #32224 from geoand/rr-config-mapping

Apply some housekeeping to RESTEasy Reactive
quarkusio · Mar 29, 2023 · 097e557 · 097e557
2 parents ed40a15 + aefad79
commit 097e557
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 48 deletions.
diff --git a/...c/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java b/...c/main/java/io/quarkus/jaxrs/client/reactive/deployment/JaxrsClientReactiveProcessor.java
@@ -645,10 +645,10 @@ private org.jboss.resteasy.reactive.common.ResteasyReactiveConfig createRestReac
         Config mpConfig = ConfigProvider.getConfig();
 
         return new org.jboss.resteasy.reactive.common.ResteasyReactiveConfig(
-                getEffectivePropertyValue("input-buffer-size", config.inputBufferSize.asLongValue(), Long.class, mpConfig),
-                getEffectivePropertyValue("output-buffer-size", config.outputBufferSize, Integer.class, mpConfig),
-                getEffectivePropertyValue("single-default-produces", config.singleDefaultProduces, Boolean.class, mpConfig),
-                getEffectivePropertyValue("default-produces", config.defaultProduces, Boolean.class, mpConfig));
+                getEffectivePropertyValue("input-buffer-size", config.inputBufferSize().asLongValue(), Long.class, mpConfig),
+                getEffectivePropertyValue("output-buffer-size", config.outputBufferSize(), Integer.class, mpConfig),
+                getEffectivePropertyValue("single-default-produces", config.singleDefaultProduces(), Boolean.class, mpConfig),
+                getEffectivePropertyValue("default-produces", config.defaultProduces(), Boolean.class, mpConfig));
     }
 
     private <T> T getEffectivePropertyValue(String legacyPropertyName, T newPropertyValue, Class<T> propertyType,

diff --git a/.../java/io/quarkus/resteasy/reactive/common/deployment/ResteasyReactiveCommonProcessor.java b/.../java/io/quarkus/resteasy/reactive/common/deployment/ResteasyReactiveCommonProcessor.java
@@ -121,7 +121,7 @@ ApplicationResultBuildItem handleApplication(CombinedIndexBuildItem combinedInde
             ResteasyReactiveConfig config) {
         ApplicationScanningResult result = ResteasyReactiveScanner
                 .scanForApplicationClass(combinedIndexBuildItem.getComputingIndex(),
-                        config.buildTimeConditionAware ? getExcludedClasses(buildTimeConditions) : Collections.emptySet());
+                        config.buildTimeConditionAware() ? getExcludedClasses(buildTimeConditions) : Collections.emptySet());
         if (result.getSelectedAppClass() != null) {
             reflectiveClass.produce(ReflectiveClassBuildItem.builder(result.getSelectedAppClass().name().toString())
                     .build());

diff --git a/...ime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ResteasyReactiveConfig.java b/...ime/src/main/java/io/quarkus/resteasy/reactive/common/runtime/ResteasyReactiveConfig.java
@@ -1,59 +1,61 @@
 package io.quarkus.resteasy.reactive.common.runtime;
 
-import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigPhase;
 import io.quarkus.runtime.annotations.ConfigRoot;
 import io.quarkus.runtime.configuration.MemorySize;
 import io.smallrye.common.annotation.Experimental;
+import io.smallrye.config.ConfigMapping;
+import io.smallrye.config.WithDefault;
 
-@ConfigRoot(phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED, name = "resteasy-reactive")
-public class ResteasyReactiveConfig {
+@ConfigMapping(prefix = "quarkus.resteasy-reactive")
+@ConfigRoot(phase = ConfigPhase.BUILD_AND_RUN_TIME_FIXED)
+public interface ResteasyReactiveConfig {
 
     /**
      * The amount of memory that can be used to buffer input before switching to
      * blocking IO.
      */
-    @ConfigItem(defaultValue = "10k")
-    public MemorySize inputBufferSize;
+    @WithDefault("10k")
+    MemorySize inputBufferSize();
 
     /**
      * The size of the output stream response buffer. If a response is larger than this and no content-length
      * is provided then the request will be chunked.
      *
      * Larger values may give slight performance increases for large responses, at the expense of more memory usage.
      */
-    @ConfigItem(defaultValue = "8191")
-    public int outputBufferSize;
+    @WithDefault("8191")
+    int outputBufferSize();
 
     /**
      * By default, we assume a default produced media type of "text/plain"
      * for String endpoint return types. If this is disabled, the default
      * produced media type will be "[text/plain, *&sol;*]" which is more
      * expensive due to negotiation.
      */
-    @ConfigItem(defaultValue = "true")
-    public boolean singleDefaultProduces;
+    @WithDefault("true")
+    boolean singleDefaultProduces();
 
     /**
      * When one of the quarkus-resteasy-reactive-jackson or quarkus-resteasy-reactive-jsonb extension are active
      * and the result type of an endpoint is an application class or one of {@code Collection}, {@code List}, {@code Set} or
      * {@code Map},
      * we assume the default return type is "application/json" if this configuration is enabled.
      */
-    @ConfigItem(defaultValue = "true")
+    @WithDefault("true")
     @Experimental("This flag has a high probability of going away in the future")
-    public boolean defaultProduces;
+    boolean defaultProduces();
 
     /**
      * Whether annotations such `@IfBuildTimeProfile`, `@IfBuildTimeProperty` and friends will be taken
      * into account when used on JAX-RS classes.
      */
-    @ConfigItem(defaultValue = "true")
-    public boolean buildTimeConditionAware;
+    @WithDefault("true")
+    boolean buildTimeConditionAware();
 
     /**
      * Whether duplicate endpoints should trigger error at startup
      */
-    @ConfigItem(defaultValue = "true")
-    public boolean failOnDuplicate;
+    @WithDefault("true")
+    boolean failOnDuplicate();
 }
diff --git a/...c/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java b/...c/main/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveProcessor.java
@@ -120,7 +120,6 @@
 import io.quarkus.arc.deployment.GeneratedBeanBuildItem;
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
 import io.quarkus.arc.runtime.BeanContainer;
-import io.quarkus.arc.runtime.ClientProxyUnwrapper;
 import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.Capability;
 import io.quarkus.deployment.Feature;
@@ -1177,7 +1176,7 @@ public void setupDeployment(BeanContainerBuildItem beanContainerBuildItem,
         BeanFactory<ResteasyReactiveInitialiser> initClassFactory = recorder.factory(QUARKUS_INIT_CLASS,
                 beanContainerBuildItem.getValue());
 
-        String applicationPath = determineApplicationPath(appResult, getAppPath(serverConfig.path));
+        String applicationPath = determineApplicationPath(appResult, getAppPath(serverConfig.path()));
         // spec allows the path contain encoded characters
         if ((applicationPath != null) && applicationPath.contains("%")) {
             applicationPath = Encode.decodePath(applicationPath);
@@ -1194,7 +1193,7 @@ public void setupDeployment(BeanContainerBuildItem beanContainerBuildItem,
                 .setExceptionMapping(exceptionMapping)
                 .setCtxResolvers(contextResolvers)
                 .setFeatures(feats)
-                .setClientProxyUnwrapper(new ClientProxyUnwrapper())
+                .setClientProxyUnwrapper(recorder.clientProxyUnwrapper())
                 .setApplicationSupplier(recorder.handleApplication(applicationClass, singletonClasses.isEmpty()))
                 .setFactoryCreator(recorder.factoryCreator(beanContainerBuildItem.getValue()))
                 .setDynamicFeatures(dynamicFeats)
@@ -1302,7 +1301,7 @@ private void checkForDuplicateEndpoint(ResteasyReactiveConfig config, Map<String
                 .filter(Objects::nonNull)
                 .collect(Collectors.joining());
         if (message.length() > 0) {
-            if (config.failOnDuplicate) {
+            if (config.failOnDuplicate()) {
                 throw new ConfigurationError(message);
             }
             log.warn(message);
@@ -1369,10 +1368,10 @@ private org.jboss.resteasy.reactive.common.ResteasyReactiveConfig createRestReac
         Config mpConfig = ConfigProvider.getConfig();
 
         return new org.jboss.resteasy.reactive.common.ResteasyReactiveConfig(
-                getEffectivePropertyValue("input-buffer-size", config.inputBufferSize.asLongValue(), Long.class, mpConfig),
-                getEffectivePropertyValue("output-buffer-size", config.outputBufferSize, Integer.class, mpConfig),
-                getEffectivePropertyValue("single-default-produces", config.singleDefaultProduces, Boolean.class, mpConfig),
-                getEffectivePropertyValue("default-produces", config.defaultProduces, Boolean.class, mpConfig));
+                getEffectivePropertyValue("input-buffer-size", config.inputBufferSize().asLongValue(), Long.class, mpConfig),
+                getEffectivePropertyValue("output-buffer-size", config.outputBufferSize(), Integer.class, mpConfig),
+                getEffectivePropertyValue("single-default-produces", config.singleDefaultProduces(), Boolean.class, mpConfig),
+                getEffectivePropertyValue("default-produces", config.defaultProduces(), Boolean.class, mpConfig));
     }
 
     private <T> T getEffectivePropertyValue(String legacyPropertyName, T newPropertyValue, Class<T> propertyType,

diff --git a/...ain/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveServerConfig.java b/...ain/java/io/quarkus/resteasy/reactive/server/deployment/ResteasyReactiveServerConfig.java
@@ -2,11 +2,13 @@
 
 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(name = "resteasy-reactive")
-public class ResteasyReactiveServerConfig {
+@ConfigMapping(prefix = "quarkus.resteasy-reactive")
+@ConfigRoot(phase = ConfigPhase.BUILD_TIME)
+public interface ResteasyReactiveServerConfig {
 
     /**
      * Set this to define the application path that serves as the base URI for all
@@ -15,6 +17,5 @@ public class ResteasyReactiveServerConfig {
      * <p>
      * This value is always resolved relative to {@code quarkus.http.root-path}.
      */
-    @ConfigItem
-    Optional<String> path;
+    Optional<String> path();
 }
diff --git a/...e/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveRecorder.java b/...e/src/main/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveRecorder.java
@@ -42,6 +42,7 @@
 import org.jboss.resteasy.reactive.spi.ThreadSetupAction;
 
 import io.quarkus.arc.Arc;
+import io.quarkus.arc.ClientProxy;
 import io.quarkus.arc.runtime.BeanContainer;
 import io.quarkus.resteasy.reactive.common.runtime.ArcBeanFactory;
 import io.quarkus.resteasy.reactive.common.runtime.ArcThreadSetupAction;
@@ -346,6 +347,10 @@ public BeanFactory<?> apply(Class<?> aClass) {
         };
     }
 
+    public Function<Object, Object> clientProxyUnwrapper() {
+        return ClientProxy::unwrap;
+    }
+
     public Supplier<Boolean> disableIfPropertyMatches(String propertyName, String propertyValue, boolean disableIfMissing) {
         return new Supplier<>() {
             @Override

diff --git a/...ain/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveRuntimeRecorder.java b/...ain/java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveRuntimeRecorder.java
@@ -36,7 +36,7 @@ public Supplier<RuntimeConfiguration> runtimeConfiguration(RuntimeValue<Deployme
         RuntimeConfiguration runtimeConfiguration = new DefaultRuntimeConfiguration(httpConf.readTimeout,
                 httpConf.body.deleteUploadedFilesOnEnd, httpConf.body.uploadsDirectory,
                 httpConf.body.multipart.fileContentTypes.orElse(null),
-                runtimeConf.multipart.inputPart.defaultCharset, maxBodySize,
+                runtimeConf.multipart().inputPart().defaultCharset(), maxBodySize,
                 httpConf.limits.maxFormAttributeSize.asLongValue());
 
         deployment.getValue().setRuntimeConfiguration(runtimeConfiguration);

diff --git a/...java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveServerRuntimeConfig.java b/...java/io/quarkus/resteasy/reactive/server/runtime/ResteasyReactiveServerRuntimeConfig.java
@@ -2,37 +2,34 @@
 
 import java.nio.charset.Charset;
 
-import io.quarkus.runtime.annotations.ConfigGroup;
-import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigPhase;
 import io.quarkus.runtime.annotations.ConfigRoot;
+import io.smallrye.config.ConfigMapping;
+import io.smallrye.config.WithDefault;
 
-@ConfigRoot(name = "resteasy-reactive", phase = ConfigPhase.RUN_TIME)
-public class ResteasyReactiveServerRuntimeConfig {
+@ConfigMapping(prefix = "quarkus.resteasy-reactive")
+@ConfigRoot(phase = ConfigPhase.RUN_TIME)
+public interface ResteasyReactiveServerRuntimeConfig {
 
     /**
      * Input part configuration.
      */
-    @ConfigItem
-    public MultipartConfigGroup multipart;
+    MultipartConfigGroup multipart();
 
-    @ConfigGroup
-    public static class MultipartConfigGroup {
+    interface MultipartConfigGroup {
 
         /**
          * Input part configuration.
          */
-        @ConfigItem
-        public InputPartConfigGroup inputPart;
+        InputPartConfigGroup inputPart();
     }
 
-    @ConfigGroup
-    public static class InputPartConfigGroup {
+    interface InputPartConfigGroup {
 
         /**
          * Default charset.
          */
-        @ConfigItem(defaultValue = "UTF-8")
-        public Charset defaultCharset;
+        @WithDefault("UTF-8")
+        Charset defaultCharset();
     }
 }