diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 694ab17..eca1606 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -17,7 +17,7 @@ jobs: strategy: fail-fast: false matrix: - java: [ 8, 11 ] + java: [ 11, 17 ] steps: - uses: actions/checkout@v2 diff --git a/pom.xml b/pom.xml index 626919c..81d979e 100644 --- a/pom.xml +++ b/pom.xml @@ -41,10 +41,10 @@ 8 UTF-8 UTF-8 - 2.4.2.Final - quarkus-universe-bom - io.quarkus - 2.4.2.Final + 3.0.1.Final + quarkus-bom + io.quarkus.platform + 3.0.1.Final 2.22.1 1.6.8 1.6 @@ -147,8 +147,8 @@ ${project.version} - io.quarkus - quarkus-universe-bom + ${quarkus.platform.group-id} + ${quarkus.platform.artifact-id} ${quarkus.platform.version} pom import diff --git a/quarkus/extension/deployment/src/main/java/io/quarkus/qson/deployment/QsonBuildStep.java b/quarkus/extension/deployment/src/main/java/io/quarkus/qson/deployment/QsonBuildStep.java index f800e08..3a71637 100644 --- a/quarkus/extension/deployment/src/main/java/io/quarkus/qson/deployment/QsonBuildStep.java +++ b/quarkus/extension/deployment/src/main/java/io/quarkus/qson/deployment/QsonBuildStep.java @@ -21,6 +21,7 @@ import io.quarkus.qson.runtime.QuarkusQsonMapper; import io.quarkus.qson.runtime.QuarkusQsonRegistry; import io.quarkus.qson.util.Types; +import java.util.Objects; import org.jboss.jandex.AnnotationInstance; import org.jboss.jandex.AnnotationTarget; import org.jboss.jandex.AnnotationValue; @@ -46,6 +47,7 @@ public class QsonBuildStep { public static final DotName QSON_TRANSFORMER = DotName.createSimple(QsonTransformer.class.getName()); public static final DotName QSON_CUSTOM_WRITER = DotName.createSimple(QsonCustomWriter.class.getName()); public static final DotName QUARKUS_QSON_INITIALIZER = DotName.createSimple(QuarkusQsonInitializer.class.getName()); + public static final DotName QUARKUS_QSON_GENERATOR = DotName.createSimple(QuarkusQsonGenerator.class.getName()); public static final DotName QSON_PROPERTY = DotName.createSimple(QsonProperty.class.getName()); public static final DotName QSON_IGNORE = DotName.createSimple(QsonIgnore.class.getName()); @@ -171,7 +173,7 @@ public GeneratedQsonClassesBuildItem generate(BuildProducer io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${quarkus.platform.version} + compile extension-descriptor - compile ${project.groupId}:${project.artifactId}-deployment:${project.version} diff --git a/quarkus/extension/runtime/src/main/java/io/quarkus/qson/runtime/QuarkusQsonMapper.java b/quarkus/extension/runtime/src/main/java/io/quarkus/qson/runtime/QuarkusQsonMapper.java index 0cd229e..99da092 100644 --- a/quarkus/extension/runtime/src/main/java/io/quarkus/qson/runtime/QuarkusQsonMapper.java +++ b/quarkus/extension/runtime/src/main/java/io/quarkus/qson/runtime/QuarkusQsonMapper.java @@ -3,7 +3,7 @@ import io.quarkus.qson.parser.QsonParser; import io.quarkus.qson.writer.QsonObjectWriter; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; import java.lang.reflect.Type; /** diff --git a/quarkus/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/GreetingFunctions.java b/quarkus/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/GreetingFunctions.java index c94fad6..0a6ea15 100644 --- a/quarkus/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/GreetingFunctions.java +++ b/quarkus/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/GreetingFunctions.java @@ -3,7 +3,7 @@ import io.quarkus.funqy.Funq; import io.smallrye.mutiny.Uni; -import javax.inject.Inject; +import jakarta.inject.Inject; public class GreetingFunctions { @Inject diff --git a/quarkus/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/GreetingService.java b/quarkus/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/GreetingService.java index 5f20bdb..3ad7c6d 100644 --- a/quarkus/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/GreetingService.java +++ b/quarkus/funqy-http/deployment/src/test/java/io/quarkus/funqy/test/GreetingService.java @@ -1,6 +1,6 @@ package io.quarkus.funqy.test; -import javax.enterprise.context.ApplicationScoped; +import jakarta.enterprise.context.ApplicationScoped; @ApplicationScoped public class GreetingService { diff --git a/quarkus/funqy-http/runtime/pom.xml b/quarkus/funqy-http/runtime/pom.xml index f98c4cb..06ff540 100644 --- a/quarkus/funqy-http/runtime/pom.xml +++ b/quarkus/funqy-http/runtime/pom.xml @@ -31,14 +31,14 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${quarkus.platform.version} + compile extension-descriptor - compile ${project.groupId}:${project.artifactId}-deployment:${project.version} diff --git a/quarkus/funqy-http/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/http/VertxRequestHandler.java b/quarkus/funqy-http/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/http/VertxRequestHandler.java index 29fd4a8..045d8a6 100644 --- a/quarkus/funqy-http/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/http/VertxRequestHandler.java +++ b/quarkus/funqy-http/runtime/src/main/java/io/quarkus/funqy/runtime/bindings/http/VertxRequestHandler.java @@ -22,8 +22,8 @@ import io.vertx.ext.web.RoutingContext; import org.jboss.logging.Logger; -import javax.enterprise.inject.Instance; -import javax.enterprise.inject.spi.CDI; +import jakarta.enterprise.inject.Instance; +import jakarta.enterprise.inject.spi.CDI; import java.util.concurrent.Executor; import java.util.function.Consumer; diff --git a/quarkus/resteasy-qson-common/deployment/pom.xml b/quarkus/resteasy-qson-common/deployment/pom.xml index 3e18ca9..9b00c63 100644 --- a/quarkus/resteasy-qson-common/deployment/pom.xml +++ b/quarkus/resteasy-qson-common/deployment/pom.xml @@ -25,8 +25,8 @@ quarkus-arc-deployment - org.jboss.spec.javax.ws.rs - jboss-jaxrs-api_2.1_spec + jakarta.ws.rs + jakarta.ws.rs-api io.quarkus diff --git a/quarkus/resteasy-qson-common/deployment/src/main/java/io/quarkus/qson/resteasy/deployment/CommonQsonJaxrsBuildStep.java b/quarkus/resteasy-qson-common/deployment/src/main/java/io/quarkus/qson/resteasy/deployment/CommonQsonJaxrsBuildStep.java index 8bbae7c..f2416ed 100644 --- a/quarkus/resteasy-qson-common/deployment/src/main/java/io/quarkus/qson/resteasy/deployment/CommonQsonJaxrsBuildStep.java +++ b/quarkus/resteasy-qson-common/deployment/src/main/java/io/quarkus/qson/resteasy/deployment/CommonQsonJaxrsBuildStep.java @@ -12,11 +12,12 @@ import org.jboss.jandex.ClassInfo; import org.jboss.jandex.IndexView; import org.jboss.jandex.MethodInfo; +import org.jboss.jandex.MethodParameterInfo; import org.jboss.jandex.Type; -import javax.ws.rs.core.Context; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; +import jakarta.ws.rs.core.Context; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.Response; import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.util.Arrays; @@ -144,7 +145,7 @@ private Method findMethod(MethodInfo method) throws Exception { return declaring.getDeclaredMethod(method.name()); } List params = new LinkedList<>(); - for (Type type : method.parameters()) { + for (Type type : method.parameterTypes()) { params.add(tcl.loadClass(type.name().toString())); } return declaring.getDeclaredMethod(method.name(), params.toArray(new Class[params.size()])); diff --git a/quarkus/resteasy-qson-common/deployment/src/main/java/io/quarkus/qson/resteasy/deployment/DotNames.java b/quarkus/resteasy-qson-common/deployment/src/main/java/io/quarkus/qson/resteasy/deployment/DotNames.java index ec1cd07..4ae7f2d 100644 --- a/quarkus/resteasy-qson-common/deployment/src/main/java/io/quarkus/qson/resteasy/deployment/DotNames.java +++ b/quarkus/resteasy-qson-common/deployment/src/main/java/io/quarkus/qson/resteasy/deployment/DotNames.java @@ -7,11 +7,11 @@ public final class DotNames { private DotNames() { } - static final DotName CONSUMES = DotName.createSimple("javax.ws.rs.Consumes"); - static final DotName PRODUCES = DotName.createSimple("javax.ws.rs.Produces"); - static final DotName GET = DotName.createSimple("javax.ws.rs.GET"); - static final DotName DELETE = DotName.createSimple("javax.ws.rs.DELETE"); - static final DotName PATCH = DotName.createSimple("javax.ws.rs.PATCH"); - static final DotName POST = DotName.createSimple("javax.ws.rs.POST"); - static final DotName PUT = DotName.createSimple("javax.ws.rs.PUT"); + static final DotName CONSUMES = DotName.createSimple("jakarta.ws.rs.Consumes"); + static final DotName PRODUCES = DotName.createSimple("jakarta.ws.rs.Produces"); + static final DotName GET = DotName.createSimple("jakarta.ws.rs.GET"); + static final DotName DELETE = DotName.createSimple("jakarta.ws.rs.DELETE"); + static final DotName PATCH = DotName.createSimple("jakarta.ws.rs.PATCH"); + static final DotName POST = DotName.createSimple("jakarta.ws.rs.POST"); + static final DotName PUT = DotName.createSimple("jakarta.ws.rs.PUT"); } diff --git a/quarkus/resteasy-qson-common/runtime/pom.xml b/quarkus/resteasy-qson-common/runtime/pom.xml index 6f188a8..68a3551 100644 --- a/quarkus/resteasy-qson-common/runtime/pom.xml +++ b/quarkus/resteasy-qson-common/runtime/pom.xml @@ -23,14 +23,14 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${quarkus.platform.version} + compile extension-descriptor - compile ${project.groupId}:${project.artifactId}-deployment:${project.version} diff --git a/quarkus/resteasy-qson/deployment/src/test/java/io/quarkus/qson/resteasy/AbstractResource.java b/quarkus/resteasy-qson/deployment/src/test/java/io/quarkus/qson/resteasy/AbstractResource.java index a023035..f05cd95 100644 --- a/quarkus/resteasy-qson/deployment/src/test/java/io/quarkus/qson/resteasy/AbstractResource.java +++ b/quarkus/resteasy-qson/deployment/src/test/java/io/quarkus/qson/resteasy/AbstractResource.java @@ -1,8 +1,8 @@ package io.quarkus.qson.resteasy; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Produces; public abstract class AbstractResource { diff --git a/quarkus/resteasy-qson/deployment/src/test/java/io/quarkus/qson/resteasy/AddressResource.java b/quarkus/resteasy-qson/deployment/src/test/java/io/quarkus/qson/resteasy/AddressResource.java index 37d6406..57f471e 100644 --- a/quarkus/resteasy-qson/deployment/src/test/java/io/quarkus/qson/resteasy/AddressResource.java +++ b/quarkus/resteasy-qson/deployment/src/test/java/io/quarkus/qson/resteasy/AddressResource.java @@ -1,6 +1,6 @@ package io.quarkus.qson.resteasy; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; @Path("/address") public class AddressResource extends AbstractResource
{ diff --git a/quarkus/resteasy-qson/deployment/src/test/java/io/quarkus/qson/resteasy/CustomerResource.java b/quarkus/resteasy-qson/deployment/src/test/java/io/quarkus/qson/resteasy/CustomerResource.java index 51487aa..e6d5511 100644 --- a/quarkus/resteasy-qson/deployment/src/test/java/io/quarkus/qson/resteasy/CustomerResource.java +++ b/quarkus/resteasy-qson/deployment/src/test/java/io/quarkus/qson/resteasy/CustomerResource.java @@ -3,14 +3,14 @@ import io.quarkus.qson.runtime.QuarkusQsonMapper; import org.junit.jupiter.api.Assertions; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import java.util.ArrayList; import java.util.List; diff --git a/quarkus/resteasy-qson/deployment/src/test/java/io/quarkus/qson/resteasy/OnClassResource.java b/quarkus/resteasy-qson/deployment/src/test/java/io/quarkus/qson/resteasy/OnClassResource.java index 7e6cace..64dd5b3 100644 --- a/quarkus/resteasy-qson/deployment/src/test/java/io/quarkus/qson/resteasy/OnClassResource.java +++ b/quarkus/resteasy-qson/deployment/src/test/java/io/quarkus/qson/resteasy/OnClassResource.java @@ -1,9 +1,9 @@ package io.quarkus.qson.resteasy; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; @Path("/onclass") @Produces("application/json") diff --git a/quarkus/resteasy-qson/runtime/pom.xml b/quarkus/resteasy-qson/runtime/pom.xml index 11bf2f2..becd5d6 100644 --- a/quarkus/resteasy-qson/runtime/pom.xml +++ b/quarkus/resteasy-qson/runtime/pom.xml @@ -27,17 +27,16 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${quarkus.platform.version} + compile extension-descriptor - compile - ${project.groupId}:${project.artifactId}-deployment:${project.version} - + ${project.groupId}:${project.artifactId}-deployment:${project.version} diff --git a/quarkus/resteasy-qson/runtime/src/main/java/io/quarkus/qson/resteasy/QuarkusQsonProvider.java b/quarkus/resteasy-qson/runtime/src/main/java/io/quarkus/qson/resteasy/QuarkusQsonProvider.java index 06949af..210d1d1 100644 --- a/quarkus/resteasy-qson/runtime/src/main/java/io/quarkus/qson/resteasy/QuarkusQsonProvider.java +++ b/quarkus/resteasy-qson/runtime/src/main/java/io/quarkus/qson/resteasy/QuarkusQsonProvider.java @@ -1,13 +1,13 @@ package io.quarkus.qson.resteasy; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; diff --git a/quarkus/resteasy-qson/runtime/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers b/quarkus/resteasy-qson/runtime/src/main/resources/META-INF/services/jakarta.ws.rs.ext.Providers similarity index 100% rename from quarkus/resteasy-qson/runtime/src/main/resources/META-INF/services/javax.ws.rs.ext.Providers rename to quarkus/resteasy-qson/runtime/src/main/resources/META-INF/services/jakarta.ws.rs.ext.Providers diff --git a/quarkus/resteasy-reactive-qson/deployment/src/main/java/io/quarkus/qson/resteasy/reactive/deployment/QsonResteasyReactiveBuildStep.java b/quarkus/resteasy-reactive-qson/deployment/src/main/java/io/quarkus/qson/resteasy/reactive/deployment/QsonResteasyReactiveBuildStep.java index cd3150e..b2a72c6 100644 --- a/quarkus/resteasy-reactive-qson/deployment/src/main/java/io/quarkus/qson/resteasy/reactive/deployment/QsonResteasyReactiveBuildStep.java +++ b/quarkus/resteasy-reactive-qson/deployment/src/main/java/io/quarkus/qson/resteasy/reactive/deployment/QsonResteasyReactiveBuildStep.java @@ -9,7 +9,7 @@ import io.quarkus.resteasy.reactive.spi.MessageBodyReaderBuildItem; import io.quarkus.resteasy.reactive.spi.MessageBodyWriterBuildItem; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MediaType; import java.util.Collections; public class QsonResteasyReactiveBuildStep { diff --git a/quarkus/resteasy-reactive-qson/deployment/src/test/java/io/quarkus/qson/resteasy/reactive/AbstractResource.java b/quarkus/resteasy-reactive-qson/deployment/src/test/java/io/quarkus/qson/resteasy/reactive/AbstractResource.java index 07e51a2..7d2c3a1 100644 --- a/quarkus/resteasy-reactive-qson/deployment/src/test/java/io/quarkus/qson/resteasy/reactive/AbstractResource.java +++ b/quarkus/resteasy-reactive-qson/deployment/src/test/java/io/quarkus/qson/resteasy/reactive/AbstractResource.java @@ -1,8 +1,8 @@ package io.quarkus.qson.resteasy.reactive; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Produces; public abstract class AbstractResource { diff --git a/quarkus/resteasy-reactive-qson/deployment/src/test/java/io/quarkus/qson/resteasy/reactive/AddressResource.java b/quarkus/resteasy-reactive-qson/deployment/src/test/java/io/quarkus/qson/resteasy/reactive/AddressResource.java index bfee487..1cac553 100644 --- a/quarkus/resteasy-reactive-qson/deployment/src/test/java/io/quarkus/qson/resteasy/reactive/AddressResource.java +++ b/quarkus/resteasy-reactive-qson/deployment/src/test/java/io/quarkus/qson/resteasy/reactive/AddressResource.java @@ -1,6 +1,6 @@ package io.quarkus.qson.resteasy.reactive; -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; @Path("/address") public class AddressResource extends AbstractResource
{ diff --git a/quarkus/resteasy-reactive-qson/deployment/src/test/java/io/quarkus/qson/resteasy/reactive/CustomerResource.java b/quarkus/resteasy-reactive-qson/deployment/src/test/java/io/quarkus/qson/resteasy/reactive/CustomerResource.java index e4e0169..9bbbc15 100644 --- a/quarkus/resteasy-reactive-qson/deployment/src/test/java/io/quarkus/qson/resteasy/reactive/CustomerResource.java +++ b/quarkus/resteasy-reactive-qson/deployment/src/test/java/io/quarkus/qson/resteasy/reactive/CustomerResource.java @@ -3,14 +3,14 @@ import io.quarkus.qson.runtime.QuarkusQsonMapper; import org.junit.jupiter.api.Assertions; -import javax.inject.Inject; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; +import jakarta.inject.Inject; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import java.util.ArrayList; import java.util.List; diff --git a/quarkus/resteasy-reactive-qson/deployment/src/test/java/io/quarkus/qson/resteasy/reactive/OnClassResource.java b/quarkus/resteasy-reactive-qson/deployment/src/test/java/io/quarkus/qson/resteasy/reactive/OnClassResource.java index afc3b27..29597f6 100644 --- a/quarkus/resteasy-reactive-qson/deployment/src/test/java/io/quarkus/qson/resteasy/reactive/OnClassResource.java +++ b/quarkus/resteasy-reactive-qson/deployment/src/test/java/io/quarkus/qson/resteasy/reactive/OnClassResource.java @@ -1,9 +1,9 @@ package io.quarkus.qson.resteasy.reactive; -import javax.ws.rs.Consumes; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; @Path("/onclass") @Produces("application/json") diff --git a/quarkus/resteasy-reactive-qson/runtime/pom.xml b/quarkus/resteasy-reactive-qson/runtime/pom.xml index b57857a..343988f 100644 --- a/quarkus/resteasy-reactive-qson/runtime/pom.xml +++ b/quarkus/resteasy-reactive-qson/runtime/pom.xml @@ -27,14 +27,14 @@ io.quarkus - quarkus-bootstrap-maven-plugin + quarkus-extension-maven-plugin ${quarkus.platform.version} + compile extension-descriptor - compile ${project.groupId}:${project.artifactId}-deployment:${project.version} diff --git a/quarkus/resteasy-reactive-qson/runtime/src/main/java/io/quarkus/qson/resteasy/QuarkusQsonProvider.java b/quarkus/resteasy-reactive-qson/runtime/src/main/java/io/quarkus/qson/resteasy/QuarkusQsonProvider.java index 06949af..210d1d1 100644 --- a/quarkus/resteasy-reactive-qson/runtime/src/main/java/io/quarkus/qson/resteasy/QuarkusQsonProvider.java +++ b/quarkus/resteasy-reactive-qson/runtime/src/main/java/io/quarkus/qson/resteasy/QuarkusQsonProvider.java @@ -1,13 +1,13 @@ package io.quarkus.qson.resteasy; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.ext.MessageBodyReader; -import javax.ws.rs.ext.MessageBodyWriter; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.ext.MessageBodyReader; +import jakarta.ws.rs.ext.MessageBodyWriter; +import jakarta.ws.rs.ext.Provider; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; diff --git a/quarkus/resteasy-reactive-qson/runtime/src/main/java/io/quarkus/qson/resteasy/reactive/QsonMessageBodyReader.java b/quarkus/resteasy-reactive-qson/runtime/src/main/java/io/quarkus/qson/resteasy/reactive/QsonMessageBodyReader.java index dcf465f..fffda1e 100644 --- a/quarkus/resteasy-reactive-qson/runtime/src/main/java/io/quarkus/qson/resteasy/reactive/QsonMessageBodyReader.java +++ b/quarkus/resteasy-reactive-qson/runtime/src/main/java/io/quarkus/qson/resteasy/reactive/QsonMessageBodyReader.java @@ -2,12 +2,10 @@ import io.quarkus.qson.resteasy.QsonResteasyUtil; import org.jboss.resteasy.reactive.common.providers.serialisers.AbstractJsonMessageBodyReader; -import org.jboss.resteasy.reactive.server.spi.ResteasyReactiveResourceInfo; -import org.jboss.resteasy.reactive.server.spi.ServerRequestContext; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; import java.io.IOException; import java.io.InputStream; import java.lang.annotation.Annotation; diff --git a/quarkus/resteasy-reactive-qson/runtime/src/main/java/io/quarkus/qson/resteasy/reactive/QsonMessageBodyWriter.java b/quarkus/resteasy-reactive-qson/runtime/src/main/java/io/quarkus/qson/resteasy/reactive/QsonMessageBodyWriter.java index fec1dbd..24f11ea 100644 --- a/quarkus/resteasy-reactive-qson/runtime/src/main/java/io/quarkus/qson/resteasy/reactive/QsonMessageBodyWriter.java +++ b/quarkus/resteasy-reactive-qson/runtime/src/main/java/io/quarkus/qson/resteasy/reactive/QsonMessageBodyWriter.java @@ -8,9 +8,9 @@ import org.jboss.resteasy.reactive.server.spi.ServerMessageBodyWriter; import org.jboss.resteasy.reactive.server.spi.ServerRequestContext; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.core.MultivaluedMap; import java.io.IOException; import java.io.OutputStream; import java.lang.annotation.Annotation;