Merge pull request #19496 from gsmet/fix-19480

Properly deprecate quarkus.resteasy.metrics.enabled
quarkusio · Aug 19, 2021 · d67f466 · d67f466
2 parents 4b76f8e + 6b70e67
commit d67f466
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/...main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java b/...main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java
@@ -147,11 +147,12 @@ static final class ResteasyConfig {
          * See <a href=
          * "https://github.com/eclipse/microprofile-metrics/blob/2.3.x/spec/src/main/asciidoc/required-metrics.adoc#optional-rest">MicroProfile
          * Metrics: Optional REST metrics</a>.
-         * <p>
-         * Deprecated. Use {@code quarkus.smallrye-metrics.jaxrs.enabled}.
+         *
+         * @deprecated Use {@code quarkus.smallrye-metrics.jaxrs.enabled} instead.
          */
-        @ConfigItem(name = "metrics.enabled", defaultValue = "false")
-        public boolean metricsEnabled;
+        @Deprecated(forRemoval = true)
+        @ConfigItem(name = "metrics.enabled")
+        public Optional<Boolean> metricsEnabled;
 
         /**
          * Ignore all explicit JAX-RS {@link Application} classes.

diff --git a/...eployment/src/main/java/io/quarkus/smallrye/metrics/deployment/JaxRsMetricsProcessor.java b/...eployment/src/main/java/io/quarkus/smallrye/metrics/deployment/JaxRsMetricsProcessor.java
@@ -32,7 +32,7 @@ static class RestMetricsEnabled implements BooleanSupplier {
         SmallRyeMetricsProcessor.SmallRyeMetricsConfig smConfig;
 
         public boolean getAsBoolean() {
-            boolean resteasyConfigEnabled = ConfigProvider.getConfig().getOptionalValue(RESTEASY_CONFIG_PROPERTY, boolean.class)
+            boolean resteasyConfigEnabled = ConfigProvider.getConfig().getOptionalValue(RESTEASY_CONFIG_PROPERTY, Boolean.class)
                     .orElse(false);
             return smConfig.extensionsEnabled && (smConfig.jaxrsEnabled || resteasyConfigEnabled);
         }
@@ -73,7 +73,7 @@ void enableMetrics(Optional<MetricsCapabilityBuildItem> metricsCapabilityBuildIt
     }
 
     private void warnIfDeprecatedResteasyPropertiesPresent() {
-        if (ConfigProvider.getConfig().getOptionalValue(RESTEASY_CONFIG_PROPERTY, boolean.class).isPresent()) {
+        if (ConfigProvider.getConfig().getOptionalValue(RESTEASY_CONFIG_PROPERTY, Boolean.class).isPresent()) {
             SmallRyeMetricsProcessor.LOGGER.warn(
                     "`quarkus.resteasy.metrics.enabled` is deprecated and will be removed in a future version. "
                             + "Use `quarkus.smallrye-metrics.jaxrs.enabled` to enable metrics for REST endpoints "