Merge pull request quarkusio#38214 from geoand/keycloak-#26203

Introduce a way to ignore mixing REST stacks errors
loicmathieu · Jan 17, 2024 · 7187ca9 · 7187ca9
2 parents 351bca5 + dd81346
commit 7187ca9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/.../java/io/quarkus/resteasy/reactive/common/deployment/ResteasyReactiveCommonProcessor.java b/.../java/io/quarkus/resteasy/reactive/common/deployment/ResteasyReactiveCommonProcessor.java
@@ -69,6 +69,7 @@
 import io.quarkus.resteasy.reactive.spi.ContainerRequestFilterBuildItem;
 import io.quarkus.resteasy.reactive.spi.ContainerResponseFilterBuildItem;
 import io.quarkus.resteasy.reactive.spi.GeneratedJaxRsResourceBuildItem;
+import io.quarkus.resteasy.reactive.spi.IgnoreStackMixingBuildItem;
 import io.quarkus.resteasy.reactive.spi.MessageBodyReaderBuildItem;
 import io.quarkus.resteasy.reactive.spi.MessageBodyReaderOverrideBuildItem;
 import io.quarkus.resteasy.reactive.spi.MessageBodyWriterBuildItem;
@@ -93,7 +94,11 @@ public class ResteasyReactiveCommonProcessor {
 
     @Produce(ServiceStartBuildItem.class)
     @BuildStep
-    void checkMixingStacks(Capabilities capabilities, CurateOutcomeBuildItem curateOutcomeBuildItem) {
+    void checkMixingStacks(Capabilities capabilities, CurateOutcomeBuildItem curateOutcomeBuildItem,
+            List<IgnoreStackMixingBuildItem> ignoreStackMixingItems) {
+        if (!ignoreStackMixingItems.isEmpty()) {
+            return;
+        }
         List<ResolvedDependency> resteasyClassicDeps = curateOutcomeBuildItem.getApplicationModel().getDependencies().stream()
                 .filter(d -> d.getGroupId().equals("org.jboss.resteasy")).collect(Collectors.toList());
         boolean hasResteasyCoreDep = resteasyClassicDeps.stream()

diff --git a/...deployment/src/main/java/io/quarkus/resteasy/reactive/spi/IgnoreStackMixingBuildItem.java b/...deployment/src/main/java/io/quarkus/resteasy/reactive/spi/IgnoreStackMixingBuildItem.java
@@ -0,0 +1,11 @@
+package io.quarkus.resteasy.reactive.spi;
+
+import io.quarkus.builder.item.MultiBuildItem;
+
+/**
+ * Marker build item that can be used by advanced extensions that can make
+ * sure that mixing RESTEasy Classic and RESTEasy Reactive dependencies
+ * will not cause problems
+ */
+public final class IgnoreStackMixingBuildItem extends MultiBuildItem {
+}