diff --git a/extensions/resteasy-classic/resteasy-common/deployment/src/main/java/io/quarkus/resteasy/common/deployment/ResteasyCommonProcessor.java b/extensions/resteasy-classic/resteasy-common/deployment/src/main/java/io/quarkus/resteasy/common/deployment/ResteasyCommonProcessor.java index caca8b3060f5f..7e08734761b92 100644 --- a/extensions/resteasy-classic/resteasy-common/deployment/src/main/java/io/quarkus/resteasy/common/deployment/ResteasyCommonProcessor.java +++ b/extensions/resteasy-classic/resteasy-common/deployment/src/main/java/io/quarkus/resteasy/common/deployment/ResteasyCommonProcessor.java @@ -175,6 +175,7 @@ ResteasyInjectionReadyBuildItem setupResteasyInjection( JaxrsProvidersToRegisterBuildItem setupProviders(BuildProducer reflectiveClass, CombinedIndexBuildItem indexBuildItem, BeanArchiveIndexBuildItem beanArchiveIndexBuildItem, + BuildProducer unremovableBeans, List contributedProviderBuildItems, List restClients, ResteasyConfigBuildItem resteasyConfig, @@ -260,8 +261,14 @@ JaxrsProvidersToRegisterBuildItem setupProviders(BuildProducer result.getProviders().contains(b.getBeanClass().toString()))); + + return result; } private String mutinySupportNeeded(CombinedIndexBuildItem indexBuildItem) { diff --git a/extensions/resteasy-classic/resteasy-server-common/deployment/src/main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java b/extensions/resteasy-classic/resteasy-server-common/deployment/src/main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java index a0c30b11d81dd..f8cd5e3cc67c2 100755 --- a/extensions/resteasy-classic/resteasy-server-common/deployment/src/main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java +++ b/extensions/resteasy-classic/resteasy-server-common/deployment/src/main/java/io/quarkus/resteasy/server/common/deployment/ResteasyServerCommonProcessor.java @@ -648,10 +648,6 @@ private static void registerProviders(ResteasyDeployment deployment, ServletConfigSource.class, ServletContextConfigSource.class, FilterConfigSource.class)); - - // Providers that are also beans are unremovable - unremovableBeans.produce(new UnremovableBeanBuildItem( - b -> jaxrsProvidersToRegisterBuildItem.getProviders().contains(b.getBeanClass().toString()))); } private static void generateDefaultConstructors(BuildProducer transformers, diff --git a/integration-tests/smallrye-opentracing/pom.xml b/integration-tests/smallrye-opentracing/pom.xml index 9f305c8d7334a..3716088e5b37f 100644 --- a/integration-tests/smallrye-opentracing/pom.xml +++ b/integration-tests/smallrye-opentracing/pom.xml @@ -25,7 +25,7 @@ io.quarkus - quarkus-resteasy-jackson + quarkus-resteasy-reactive-jackson io.quarkus @@ -43,15 +43,11 @@ io.quarkus quarkus-agroal - - io.quarkus - quarkus-resteasy-mutiny - io.quarkus - quarkus-rest-client + quarkus-rest-client-mutiny @@ -121,20 +117,7 @@ io.quarkus - quarkus-resteasy-jackson-deployment - ${project.version} - pom - test - - - * - * - - - - - io.quarkus - quarkus-resteasy-mutiny-deployment + quarkus-resteasy-reactive-jackson-deployment ${project.version} pom test @@ -147,7 +130,7 @@ io.quarkus - quarkus-rest-client-deployment + quarkus-rest-client-mutiny-deployment ${project.version} pom test diff --git a/integration-tests/smallrye-opentracing/src/main/resources/application.properties b/integration-tests/smallrye-opentracing/src/main/resources/application.properties index 9bc3dbe080a7e..9a7a89dc2cb44 100644 --- a/integration-tests/smallrye-opentracing/src/main/resources/application.properties +++ b/integration-tests/smallrye-opentracing/src/main/resources/application.properties @@ -3,5 +3,6 @@ quarkus.datasource.jdbc.url=jdbc:tracing:postgresql://localhost:5432/mydatabase quarkus.datasource.jdbc.driver=io.opentracing.contrib.jdbc.TracingDriver quarkus.datasource.username=sa quarkus.datasource.password=sa +quarkus.rest.single-default-produces=false pingpong/mp-rest/url=${test.url}