Merge pull request #23261 from geoand/#19669-followup

Remove long deprecated for removal entries in RESTEasy Reactive
quarkusio · Jan 28, 2022 · 92f6ef8 · 92f6ef8
2 parents c5db541 + 866878b
commit 92f6ef8
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 18 deletions.
diff --git a/.../java/io/quarkus/resteasy/reactive/common/deployment/ResteasyReactiveCommonProcessor.java b/.../java/io/quarkus/resteasy/reactive/common/deployment/ResteasyReactiveCommonProcessor.java
@@ -79,7 +79,7 @@ void setUpDenyAllJaxRs(CombinedIndexBuildItem index,
         Optional<List<String>> defaultRolesAllowedConfig = config
                 .getOptionalValues("quarkus.security.jaxrs.default-roles-allowed", String.class);
 
-        if (rrConfig.denyJaxRs.orElse(denyUnannotatedEndpointsConfig.orElse(false)) && resteasyDeployment.isPresent()) {
+        if (denyUnannotatedEndpointsConfig.orElse(false) && resteasyDeployment.isPresent()) {
             final List<ClassInfo> classes = new ArrayList<>();
 
             Set<DotName> resourceClasses = resteasyDeployment.get().getResult().getScannedResourcePaths().keySet();

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,7 +1,5 @@
 package io.quarkus.resteasy.reactive.common.runtime;
 
-import java.util.Optional;
-
 import io.quarkus.runtime.annotations.ConfigItem;
 import io.quarkus.runtime.annotations.ConfigPhase;
 import io.quarkus.runtime.annotations.ConfigRoot;
@@ -53,15 +51,6 @@ public class ResteasyReactiveConfig {
     @ConfigItem(defaultValue = "true")
     public boolean buildTimeConditionAware;
 
-    /**
-     * If set to true, access to all JAX-RS resources will be denied by default
-     *
-     * Use quarkus.security.jaxrs.deny-unannotated-endpoints instead
-     */
-    @Deprecated(forRemoval = true)
-    @ConfigItem(name = "deny-unannotated-endpoints")
-    public Optional<Boolean> denyJaxRs;
-
     /**
      * Whether or not duplicate endpoints should trigger error at startup
      */

diff --git a/...c/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeDeploymentManager.java b/...c/main/java/org/jboss/resteasy/reactive/server/core/startup/RuntimeDeploymentManager.java
@@ -171,7 +171,8 @@ public BeanFactory.BeanInstance<?> apply(Class<?> aClass) {
         List<ServerRestHandler> preMatchHandlers = new ArrayList<>();
         for (int i = 0; i < info.getGlobalHandlerCustomizers().size(); i++) {
             preMatchHandlers
-                    .addAll(info.getGlobalHandlerCustomizers().get(i).handlers(HandlerChainCustomizer.Phase.BEFORE_PRE_MATCH));
+                    .addAll(info.getGlobalHandlerCustomizers().get(i).handlers(HandlerChainCustomizer.Phase.BEFORE_PRE_MATCH,
+                            null, null));
         }
         if (!interceptors.getContainerRequestFilters().getPreMatchInterceptors().isEmpty()) {
             preMatchHandlers = new ArrayList<>(interceptorDeployment.getPreMatchContainerRequestFilters().size());

diff --git a/...untime/src/main/java/org/jboss/resteasy/reactive/server/model/HandlerChainCustomizer.java b/...untime/src/main/java/org/jboss/resteasy/reactive/server/model/HandlerChainCustomizer.java
@@ -21,11 +21,6 @@ public interface HandlerChainCustomizer {
      * @param resourceMethod The method, will be null if this has not been matched yet
      */
     default List<ServerRestHandler> handlers(Phase phase, ResourceClass resourceClass, ServerResourceMethod resourceMethod) {
-        return handlers(phase);
-    }
-
-    @Deprecated(forRemoval = true)
-    default List<ServerRestHandler> handlers(Phase phase) {
         return Collections.emptyList();
     }