diff --git a/README.md b/README.md index dfcc5ee9..28c58ad0 100644 --- a/README.md +++ b/README.md @@ -89,8 +89,8 @@ package foo.bar; import reactor.core.publisher.Mono; import javax.inject.Inject; -import javax.ws.rs.GET; -import javax.ws.rs.Path; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import static reactor.core.publisher.Mono.just; diff --git a/api/pom.xml b/api/pom.xml index 96a7e758..9aca87c2 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -11,8 +11,8 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api diff --git a/api/src/main/java/se/fortnox/reactivewizard/CollectionOptions.java b/api/src/main/java/se/fortnox/reactivewizard/CollectionOptions.java index 60ea3070..ebdcb5a0 100644 --- a/api/src/main/java/se/fortnox/reactivewizard/CollectionOptions.java +++ b/api/src/main/java/se/fortnox/reactivewizard/CollectionOptions.java @@ -1,6 +1,6 @@ package se.fortnox.reactivewizard; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.QueryParam; public class CollectionOptions { public enum SortOrder { diff --git a/client/src/main/java/se/fortnox/reactivewizard/binding/scanners/JaxRsClassScanner.java b/client/src/main/java/se/fortnox/reactivewizard/binding/scanners/JaxRsClassScanner.java index e33a2285..42a1a748 100644 --- a/client/src/main/java/se/fortnox/reactivewizard/binding/scanners/JaxRsClassScanner.java +++ b/client/src/main/java/se/fortnox/reactivewizard/binding/scanners/JaxRsClassScanner.java @@ -1,8 +1,7 @@ package se.fortnox.reactivewizard.binding.scanners; import jakarta.inject.Singleton; - -import javax.ws.rs.Path; +import jakarta.ws.rs.Path; @Singleton public class JaxRsClassScanner extends AbstractClassScanner { diff --git a/client/src/main/java/se/fortnox/reactivewizard/client/HttpClient.java b/client/src/main/java/se/fortnox/reactivewizard/client/HttpClient.java index e3c23fc7..f4faccf4 100644 --- a/client/src/main/java/se/fortnox/reactivewizard/client/HttpClient.java +++ b/client/src/main/java/se/fortnox/reactivewizard/client/HttpClient.java @@ -13,6 +13,14 @@ import io.netty.handler.codec.http.HttpUtil; import io.netty.handler.timeout.ReadTimeoutException; import jakarta.inject.Inject; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.CookieParam; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.reactivestreams.Publisher; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,14 +39,6 @@ import se.fortnox.reactivewizard.util.ReactiveDecorator; import se.fortnox.reactivewizard.util.ReflectionUtil; -import javax.ws.rs.BeanParam; -import javax.ws.rs.Consumes; -import javax.ws.rs.CookieParam; -import javax.ws.rs.FormParam; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; import java.io.IOException; import java.lang.annotation.Annotation; import java.lang.reflect.Field; @@ -71,12 +71,12 @@ import static io.netty.handler.codec.http.HttpMethod.POST; import static io.netty.handler.codec.http.HttpResponseStatus.GATEWAY_TIMEOUT; import static io.netty.handler.codec.http.HttpResponseStatus.INTERNAL_SERVER_ERROR; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static java.lang.String.format; import static java.util.Arrays.asList; import static java.util.Collections.emptySet; import static java.util.Collections.singleton; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; import static reactor.core.Exceptions.isRetryExhausted; import static reactor.core.publisher.Mono.just; diff --git a/client/src/main/java/se/fortnox/reactivewizard/client/RequestBuilder.java b/client/src/main/java/se/fortnox/reactivewizard/client/RequestBuilder.java index a3a52f71..1b2aa626 100644 --- a/client/src/main/java/se/fortnox/reactivewizard/client/RequestBuilder.java +++ b/client/src/main/java/se/fortnox/reactivewizard/client/RequestBuilder.java @@ -9,7 +9,7 @@ import java.util.HashMap; import java.util.Map; -import static javax.ws.rs.core.HttpHeaders.CONTENT_LENGTH; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_LENGTH; /** * Represents both a client request and a server info (both host and url), which diff --git a/client/src/test/java/se/fortnox/reactivewizard/client/FluxClientTest.java b/client/src/test/java/se/fortnox/reactivewizard/client/FluxClientTest.java index 8b954a4b..9eb0996b 100644 --- a/client/src/test/java/se/fortnox/reactivewizard/client/FluxClientTest.java +++ b/client/src/test/java/se/fortnox/reactivewizard/client/FluxClientTest.java @@ -1,6 +1,10 @@ package se.fortnox.reactivewizard.client; import io.netty.handler.codec.http.HttpResponseStatus; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.apache.logging.log4j.Level; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -12,9 +16,7 @@ import reactor.netty.DisposableServer; import reactor.netty.http.server.HttpServer; import reactor.test.StepVerifier; -import rx.Observable; import se.fortnox.reactivewizard.ExceptionHandler; -import se.fortnox.reactivewizard.jaxrs.JaxRsRequest; import se.fortnox.reactivewizard.jaxrs.JaxRsRequestHandler; import se.fortnox.reactivewizard.jaxrs.JaxRsResourceFactory; import se.fortnox.reactivewizard.jaxrs.Stream; @@ -22,19 +24,15 @@ import se.fortnox.reactivewizard.test.LoggingVerifier; import se.fortnox.reactivewizard.test.LoggingVerifierExtension; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; import java.net.URISyntaxException; import java.time.temporal.ChronoUnit; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_TYPE; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.TEXT_HTML; import static java.util.Arrays.asList; -import static javax.ws.rs.core.HttpHeaders.CONTENT_TYPE; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.MediaType.TEXT_HTML; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; import static org.mockito.Mockito.verify; diff --git a/client/src/test/java/se/fortnox/reactivewizard/client/HttpClientStreamingTest.java b/client/src/test/java/se/fortnox/reactivewizard/client/HttpClientStreamingTest.java index 622f581a..51028386 100644 --- a/client/src/test/java/se/fortnox/reactivewizard/client/HttpClientStreamingTest.java +++ b/client/src/test/java/se/fortnox/reactivewizard/client/HttpClientStreamingTest.java @@ -5,6 +5,11 @@ import io.netty.buffer.ByteBuf; import io.netty.handler.codec.http.HttpMethod; import io.netty.handler.codec.http.HttpResponseStatus; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -14,11 +19,6 @@ import se.fortnox.reactivewizard.jaxrs.RequestLogger; import se.fortnox.reactivewizard.metrics.HealthRecorder; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; import java.net.URISyntaxException; import java.nio.charset.Charset; import java.time.Duration; diff --git a/client/src/test/java/se/fortnox/reactivewizard/client/HttpClientTest.java b/client/src/test/java/se/fortnox/reactivewizard/client/HttpClientTest.java index a36b24cb..ce54a11b 100644 --- a/client/src/test/java/se/fortnox/reactivewizard/client/HttpClientTest.java +++ b/client/src/test/java/se/fortnox/reactivewizard/client/HttpClientTest.java @@ -9,6 +9,19 @@ import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.handler.ssl.SslContextBuilder; import io.netty.handler.ssl.util.SelfSignedCertificate; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.CookieParam; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.apache.logging.log4j.Level; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; @@ -42,19 +55,6 @@ import se.fortnox.reactivewizard.test.publisher.PublisherAssertions; import javax.net.ssl.SSLHandshakeException; -import javax.ws.rs.BeanParam; -import javax.ws.rs.Consumes; -import javax.ws.rs.CookieParam; -import javax.ws.rs.DELETE; -import javax.ws.rs.FormParam; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; import java.io.ByteArrayOutputStream; import java.io.OutputStream; import java.io.PrintStream; diff --git a/client/src/test/java/se/fortnox/reactivewizard/client/RestClientFactoryTest.java b/client/src/test/java/se/fortnox/reactivewizard/client/RestClientFactoryTest.java index de6786dc..01b0c1ff 100644 --- a/client/src/test/java/se/fortnox/reactivewizard/client/RestClientFactoryTest.java +++ b/client/src/test/java/se/fortnox/reactivewizard/client/RestClientFactoryTest.java @@ -8,6 +8,8 @@ import com.google.inject.Module; import com.google.inject.name.Names; import com.google.inject.util.Modules; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.mockito.Mockito; @@ -23,8 +25,6 @@ import se.fortnox.reactivewizard.metrics.HealthRecorder; import se.fortnox.reactivewizard.server.ServerConfig; -import javax.ws.rs.GET; -import javax.ws.rs.Path; import java.net.URISyntaxException; import java.util.Collections; import java.util.Set; diff --git a/examples/hello-world/src/main/java/se/fortnox/reactivewizard/helloworld/HelloWorldResource.java b/examples/hello-world/src/main/java/se/fortnox/reactivewizard/helloworld/HelloWorldResource.java index 44d40cfc..65289f10 100644 --- a/examples/hello-world/src/main/java/se/fortnox/reactivewizard/helloworld/HelloWorldResource.java +++ b/examples/hello-world/src/main/java/se/fortnox/reactivewizard/helloworld/HelloWorldResource.java @@ -1,11 +1,10 @@ package se.fortnox.reactivewizard.helloworld; import jakarta.inject.Inject; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import reactor.core.publisher.Mono; -import javax.ws.rs.GET; -import javax.ws.rs.Path; - import static reactor.core.publisher.Mono.just; diff --git a/jaxrs-api/pom.xml b/jaxrs-api/pom.xml index 97b080f4..018182ef 100644 --- a/jaxrs-api/pom.xml +++ b/jaxrs-api/pom.xml @@ -13,8 +13,8 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api diff --git a/jaxrs-api/src/main/java/se/fortnox/reactivewizard/jaxrs/PATCH.java b/jaxrs-api/src/main/java/se/fortnox/reactivewizard/jaxrs/PATCH.java index 34ff0c6a..51302361 100644 --- a/jaxrs-api/src/main/java/se/fortnox/reactivewizard/jaxrs/PATCH.java +++ b/jaxrs-api/src/main/java/se/fortnox/reactivewizard/jaxrs/PATCH.java @@ -1,6 +1,7 @@ package se.fortnox.reactivewizard.jaxrs; -import javax.ws.rs.HttpMethod; +import jakarta.ws.rs.HttpMethod; + import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/jaxrs/src/main/java/se/fortnox/reactivewizard/ExceptionHandler.java b/jaxrs/src/main/java/se/fortnox/reactivewizard/ExceptionHandler.java index 7ecfc4b3..83e672b7 100644 --- a/jaxrs/src/main/java/se/fortnox/reactivewizard/ExceptionHandler.java +++ b/jaxrs/src/main/java/se/fortnox/reactivewizard/ExceptionHandler.java @@ -23,7 +23,7 @@ import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST; import static io.netty.handler.codec.http.HttpResponseStatus.INTERNAL_SERVER_ERROR; import static io.netty.handler.codec.http.HttpResponseStatus.NOT_FOUND; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; import static reactor.core.Exceptions.isMultiple; import static reactor.core.Exceptions.unwrap; import static reactor.core.Exceptions.unwrapMultiple; diff --git a/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/JaxRsMeta.java b/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/JaxRsMeta.java index cb1757ed..988b0e35 100644 --- a/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/JaxRsMeta.java +++ b/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/JaxRsMeta.java @@ -1,16 +1,16 @@ package se.fortnox.reactivewizard.jaxrs; import io.netty.handler.codec.http.HttpMethod; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.DELETE; +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 se.fortnox.reactivewizard.util.ReflectionUtil; -import javax.ws.rs.Consumes; -import javax.ws.rs.DELETE; -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 java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.util.Optional; diff --git a/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/JaxRsResource.java b/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/JaxRsResource.java index 9820802b..a1fdfd11 100644 --- a/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/JaxRsResource.java +++ b/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/JaxRsResource.java @@ -1,6 +1,8 @@ package se.fortnox.reactivewizard.jaxrs; import io.netty.handler.codec.http.HttpMethod; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Flux; @@ -15,8 +17,6 @@ import se.fortnox.reactivewizard.util.FluxRxConverter; import se.fortnox.reactivewizard.util.ReflectionUtil; -import javax.ws.rs.Consumes; -import javax.ws.rs.core.MediaType; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.List; diff --git a/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/JaxRsResourceFactory.java b/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/JaxRsResourceFactory.java index 2f0f95c5..c4d3b679 100644 --- a/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/JaxRsResourceFactory.java +++ b/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/JaxRsResourceFactory.java @@ -2,10 +2,10 @@ import jakarta.inject.Inject; import jakarta.inject.Singleton; +import jakarta.ws.rs.Path; import se.fortnox.reactivewizard.jaxrs.params.ParamResolverFactories; import se.fortnox.reactivewizard.jaxrs.response.JaxRsResultFactoryFactory; -import javax.ws.rs.Path; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collections; diff --git a/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/ParamResolverFactories.java b/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/ParamResolverFactories.java index b7d7f97f..0a79ff29 100644 --- a/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/ParamResolverFactories.java +++ b/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/ParamResolverFactories.java @@ -3,6 +3,7 @@ import com.fasterxml.jackson.core.type.TypeReference; import io.netty.handler.codec.http.HttpResponseStatus; import jakarta.inject.Inject; +import jakarta.ws.rs.DefaultValue; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; @@ -14,7 +15,6 @@ import se.fortnox.reactivewizard.jaxrs.params.deserializing.DeserializerFactory; import se.fortnox.reactivewizard.util.ReflectionUtil; -import javax.ws.rs.DefaultValue; import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.lang.reflect.Parameter; diff --git a/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/annotated/AnnotatedParamResolverFactories.java b/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/annotated/AnnotatedParamResolverFactories.java index de5c5fa9..0cfb1111 100644 --- a/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/annotated/AnnotatedParamResolverFactories.java +++ b/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/annotated/AnnotatedParamResolverFactories.java @@ -1,14 +1,14 @@ package se.fortnox.reactivewizard.jaxrs.params.annotated; import jakarta.inject.Inject; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.CookieParam; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; import se.fortnox.reactivewizard.jaxrs.params.deserializing.DeserializerFactory; -import javax.ws.rs.BeanParam; -import javax.ws.rs.CookieParam; -import javax.ws.rs.FormParam; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; import java.lang.annotation.Annotation; import java.util.HashMap; import java.util.Map; diff --git a/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/annotated/CookieParamResolver.java b/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/annotated/CookieParamResolver.java index 7781e1c6..81e14f12 100644 --- a/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/annotated/CookieParamResolver.java +++ b/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/annotated/CookieParamResolver.java @@ -1,12 +1,12 @@ package se.fortnox.reactivewizard.jaxrs.params.annotated; import com.fasterxml.jackson.core.type.TypeReference; +import jakarta.ws.rs.CookieParam; import se.fortnox.reactivewizard.jaxrs.JaxRsRequest; import se.fortnox.reactivewizard.jaxrs.params.ParamResolver; import se.fortnox.reactivewizard.jaxrs.params.deserializing.Deserializer; import se.fortnox.reactivewizard.jaxrs.params.deserializing.DeserializerFactory; -import javax.ws.rs.CookieParam; import java.lang.annotation.Annotation; /** diff --git a/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/annotated/FormParamResolver.java b/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/annotated/FormParamResolver.java index 03a31ef7..ffc92010 100644 --- a/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/annotated/FormParamResolver.java +++ b/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/annotated/FormParamResolver.java @@ -1,12 +1,12 @@ package se.fortnox.reactivewizard.jaxrs.params.annotated; import com.fasterxml.jackson.core.type.TypeReference; +import jakarta.ws.rs.FormParam; import se.fortnox.reactivewizard.jaxrs.JaxRsRequest; import se.fortnox.reactivewizard.jaxrs.params.ParamResolver; import se.fortnox.reactivewizard.jaxrs.params.deserializing.Deserializer; import se.fortnox.reactivewizard.jaxrs.params.deserializing.DeserializerFactory; -import javax.ws.rs.FormParam; import java.lang.annotation.Annotation; /** diff --git a/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/annotated/HeaderParamResolver.java b/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/annotated/HeaderParamResolver.java index 97c307b8..45e702f8 100644 --- a/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/annotated/HeaderParamResolver.java +++ b/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/annotated/HeaderParamResolver.java @@ -1,12 +1,12 @@ package se.fortnox.reactivewizard.jaxrs.params.annotated; import com.fasterxml.jackson.core.type.TypeReference; +import jakarta.ws.rs.HeaderParam; import se.fortnox.reactivewizard.jaxrs.JaxRsRequest; import se.fortnox.reactivewizard.jaxrs.params.ParamResolver; import se.fortnox.reactivewizard.jaxrs.params.deserializing.Deserializer; import se.fortnox.reactivewizard.jaxrs.params.deserializing.DeserializerFactory; -import javax.ws.rs.HeaderParam; import java.lang.annotation.Annotation; /** diff --git a/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/annotated/PathParamResolver.java b/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/annotated/PathParamResolver.java index 9a7eaeb8..1e5a52cd 100644 --- a/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/annotated/PathParamResolver.java +++ b/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/annotated/PathParamResolver.java @@ -1,12 +1,12 @@ package se.fortnox.reactivewizard.jaxrs.params.annotated; import com.fasterxml.jackson.core.type.TypeReference; +import jakarta.ws.rs.PathParam; import se.fortnox.reactivewizard.jaxrs.JaxRsRequest; import se.fortnox.reactivewizard.jaxrs.params.ParamResolver; import se.fortnox.reactivewizard.jaxrs.params.deserializing.Deserializer; import se.fortnox.reactivewizard.jaxrs.params.deserializing.DeserializerFactory; -import javax.ws.rs.PathParam; import java.lang.annotation.Annotation; /** diff --git a/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/annotated/QueryParamResolver.java b/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/annotated/QueryParamResolver.java index bb97802b..7e9ce193 100644 --- a/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/annotated/QueryParamResolver.java +++ b/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/annotated/QueryParamResolver.java @@ -1,12 +1,12 @@ package se.fortnox.reactivewizard.jaxrs.params.annotated; import com.fasterxml.jackson.core.type.TypeReference; +import jakarta.ws.rs.QueryParam; import se.fortnox.reactivewizard.jaxrs.JaxRsRequest; import se.fortnox.reactivewizard.jaxrs.params.ParamResolver; import se.fortnox.reactivewizard.jaxrs.params.deserializing.Deserializer; import se.fortnox.reactivewizard.jaxrs.params.deserializing.DeserializerFactory; -import javax.ws.rs.QueryParam; import java.lang.annotation.Annotation; /** diff --git a/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/deserializing/DeserializerFactory.java b/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/deserializing/DeserializerFactory.java index 41ee07e2..ca5fb5d1 100644 --- a/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/deserializing/DeserializerFactory.java +++ b/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/params/deserializing/DeserializerFactory.java @@ -4,11 +4,11 @@ import com.fasterxml.jackson.databind.util.StdDateFormat; import jakarta.inject.Inject; import jakarta.inject.Provider; +import jakarta.ws.rs.core.MediaType; import se.fortnox.reactivewizard.json.JsonDeserializerFactory; import se.fortnox.reactivewizard.util.ReflectionUtil; import javax.annotation.Nullable; -import javax.ws.rs.core.MediaType; import java.lang.reflect.ParameterizedType; import java.math.BigDecimal; import java.text.DateFormat; diff --git a/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/response/JaxRsResult.java b/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/response/JaxRsResult.java index c7325b5b..24351045 100644 --- a/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/response/JaxRsResult.java +++ b/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/response/JaxRsResult.java @@ -14,7 +14,7 @@ import java.util.function.Function; import java.util.function.UnaryOperator; -import static javax.ws.rs.core.HttpHeaders.CONTENT_LENGTH; +import static jakarta.ws.rs.core.HttpHeaders.CONTENT_LENGTH; /** * Represents a result of a call to a JaxRs resource. Contains the output but also some meta data about the call. diff --git a/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/response/JaxRsResultSerializerFactory.java b/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/response/JaxRsResultSerializerFactory.java index 5234e8f2..57fc6c2c 100644 --- a/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/response/JaxRsResultSerializerFactory.java +++ b/jaxrs/src/main/java/se/fortnox/reactivewizard/jaxrs/response/JaxRsResultSerializerFactory.java @@ -1,11 +1,11 @@ package se.fortnox.reactivewizard.jaxrs.response; import jakarta.inject.Inject; +import jakarta.ws.rs.core.MediaType; import reactor.core.publisher.Flux; import se.fortnox.reactivewizard.jaxrs.Stream; import se.fortnox.reactivewizard.json.JsonSerializerFactory; -import javax.ws.rs.core.MediaType; import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/FluxResourceTest.java b/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/FluxResourceTest.java index f5d8bc55..85b88e73 100644 --- a/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/FluxResourceTest.java +++ b/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/FluxResourceTest.java @@ -1,6 +1,10 @@ package se.fortnox.reactivewizard.jaxrs; import io.netty.handler.codec.http.HttpResponseStatus; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; @@ -11,15 +15,8 @@ import reactor.netty.http.server.HttpServer; import reactor.test.StepVerifier; import se.fortnox.reactivewizard.ExceptionHandler; -import se.fortnox.reactivewizard.jaxrs.response.JaxRsResultFactoryFactory; - -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; import java.util.function.Consumer; -import java.util.function.Supplier; import static io.netty.handler.codec.http.HttpResponseStatus.PAYMENT_REQUIRED; import static org.mockito.Mockito.mock; diff --git a/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/InheritedParamEntity.java b/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/InheritedParamEntity.java index 3850fc0d..4c09b160 100644 --- a/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/InheritedParamEntity.java +++ b/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/InheritedParamEntity.java @@ -1,6 +1,6 @@ package se.fortnox.reactivewizard.jaxrs; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.QueryParam; public class InheritedParamEntity extends ParamEntity { diff --git a/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/JaxRsMetaTest.java b/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/JaxRsMetaTest.java index 25e10435..310cc25e 100644 --- a/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/JaxRsMetaTest.java +++ b/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/JaxRsMetaTest.java @@ -1,5 +1,8 @@ package se.fortnox.reactivewizard.jaxrs; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -7,14 +10,11 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; import java.util.Optional; import java.util.stream.Stream; -import static javax.ws.rs.core.MediaType.APPLICATION_JSON; -import static javax.ws.rs.core.MediaType.TEXT_HTML; +import static jakarta.ws.rs.core.MediaType.APPLICATION_JSON; +import static jakarta.ws.rs.core.MediaType.TEXT_HTML; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.params.provider.Arguments.arguments; diff --git a/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/JaxRsResourceTest.java b/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/JaxRsResourceTest.java index 10628312..f7c675f9 100644 --- a/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/JaxRsResourceTest.java +++ b/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/JaxRsResourceTest.java @@ -3,17 +3,38 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.util.StdDateFormat; +import com.google.inject.AbstractModule; +import com.google.inject.Guice; +import com.google.inject.Injector; import com.google.inject.Module; -import com.google.inject.*; +import com.google.inject.TypeLiteral; import io.netty.handler.codec.http.HttpResponseStatus; import io.netty.handler.codec.http.cookie.DefaultCookie; +import jakarta.ws.rs.BeanParam; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.CookieParam; +import jakarta.ws.rs.DELETE; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.PUT; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import rx.Observable; -import se.fortnox.reactivewizard.jaxrs.params.*; +import se.fortnox.reactivewizard.jaxrs.params.ParamResolver; +import se.fortnox.reactivewizard.jaxrs.params.ParamResolverFactories; +import se.fortnox.reactivewizard.jaxrs.params.ParamResolverFactory; +import se.fortnox.reactivewizard.jaxrs.params.ParamResolvers; +import se.fortnox.reactivewizard.jaxrs.params.WrapSupportingParamTypeResolver; import se.fortnox.reactivewizard.jaxrs.params.annotated.AnnotatedParamResolverFactories; import se.fortnox.reactivewizard.jaxrs.params.deserializing.Deserializer; import se.fortnox.reactivewizard.jaxrs.params.deserializing.DeserializerFactory; @@ -26,15 +47,23 @@ import se.fortnox.reactivewizard.test.LoggingVerifierExtension; import se.fortnox.reactivewizard.utils.JaxRsTestUtil; -import javax.ws.rs.*; -import javax.ws.rs.core.MediaType; import java.lang.reflect.Proxy; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.LocalDate; import java.time.LocalTime; -import java.util.*; +import java.util.Arrays; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; +import java.util.TimeZone; +import java.util.UUID; import java.util.stream.Collectors; import static io.netty.handler.codec.http.HttpResponseStatus.BAD_REQUEST; @@ -47,7 +76,13 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static reactor.core.publisher.Mono.just; -import static se.fortnox.reactivewizard.utils.JaxRsTestUtil.*; +import static se.fortnox.reactivewizard.utils.JaxRsTestUtil.body; +import static se.fortnox.reactivewizard.utils.JaxRsTestUtil.delete; +import static se.fortnox.reactivewizard.utils.JaxRsTestUtil.get; +import static se.fortnox.reactivewizard.utils.JaxRsTestUtil.getWithHeaders; +import static se.fortnox.reactivewizard.utils.JaxRsTestUtil.patch; +import static se.fortnox.reactivewizard.utils.JaxRsTestUtil.post; +import static se.fortnox.reactivewizard.utils.JaxRsTestUtil.put; @ExtendWith(LoggingVerifierExtension.class) class JaxRsResourceTest { diff --git a/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/ParamEntity.java b/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/ParamEntity.java index a24b9f10..ea9e2a47 100644 --- a/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/ParamEntity.java +++ b/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/ParamEntity.java @@ -1,7 +1,8 @@ package se.fortnox.reactivewizard.jaxrs; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.QueryParam; + import java.util.List; public class ParamEntity { diff --git a/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/ParamEntityRecord.java b/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/ParamEntityRecord.java index c738bd9f..bdc1d26d 100644 --- a/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/ParamEntityRecord.java +++ b/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/ParamEntityRecord.java @@ -1,7 +1,8 @@ package se.fortnox.reactivewizard.jaxrs; -import javax.ws.rs.DefaultValue; -import javax.ws.rs.QueryParam; +import jakarta.ws.rs.DefaultValue; +import jakarta.ws.rs.QueryParam; + import java.util.List; public record ParamEntityRecord( diff --git a/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/ResponseDecoratorTest.java b/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/ResponseDecoratorTest.java index c3e260e0..99a3dbdb 100644 --- a/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/ResponseDecoratorTest.java +++ b/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/ResponseDecoratorTest.java @@ -1,6 +1,8 @@ package se.fortnox.reactivewizard.jaxrs; import io.netty.handler.codec.http.HttpResponseStatus; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import reactor.core.publisher.Mono; @@ -9,8 +11,6 @@ import se.fortnox.reactivewizard.util.ReactiveDecorator; import se.fortnox.reactivewizard.utils.JaxRsTestUtil; -import javax.ws.rs.GET; -import javax.ws.rs.Path; import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicReference; diff --git a/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/StatusTest.java b/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/StatusTest.java index fd6548d3..9e2aa995 100644 --- a/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/StatusTest.java +++ b/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/StatusTest.java @@ -2,6 +2,13 @@ import io.netty.handler.codec.http.HttpMethod; import io.netty.handler.codec.http.HttpResponseStatus; +import jakarta.ws.rs.DELETE; +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.QueryParam; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -13,14 +20,6 @@ import se.fortnox.reactivewizard.mocks.MockHttpServerRequest; import se.fortnox.reactivewizard.mocks.MockHttpServerResponse; - -import javax.ws.rs.DELETE; -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.QueryParam; import java.util.stream.Stream; import static org.assertj.core.api.Assertions.assertThat; diff --git a/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/StreamingDataTest.java b/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/StreamingDataTest.java index f29b8c96..94f037fa 100644 --- a/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/StreamingDataTest.java +++ b/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/StreamingDataTest.java @@ -1,5 +1,10 @@ package se.fortnox.reactivewizard.jaxrs; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.QueryParam; +import jakarta.ws.rs.core.MediaType; import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import reactor.netty.DisposableServer; @@ -9,11 +14,6 @@ import se.fortnox.reactivewizard.db.MockDb; import se.fortnox.reactivewizard.db.Query; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; -import javax.ws.rs.core.MediaType; import java.sql.SQLException; import java.util.HashMap; import java.util.List; diff --git a/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/WrappedParamTest.java b/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/WrappedParamTest.java index ef721ff5..0f82396c 100644 --- a/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/WrappedParamTest.java +++ b/jaxrs/src/test/java/se/fortnox/reactivewizard/jaxrs/WrappedParamTest.java @@ -1,6 +1,8 @@ package se.fortnox.reactivewizard.jaxrs; import io.netty.handler.codec.http.HttpMethod; +import jakarta.ws.rs.POST; +import jakarta.ws.rs.Path; import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -9,9 +11,6 @@ import se.fortnox.reactivewizard.mocks.MockHttpServerRequest; import se.fortnox.reactivewizard.mocks.MockHttpServerResponse; -import javax.ws.rs.POST; -import javax.ws.rs.Path; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail; diff --git a/pom.xml b/pom.xml index 9bf04c13..96ec7d19 100644 --- a/pom.xml +++ b/pom.xml @@ -117,7 +117,7 @@ 4.2.0 1.2.1 4.0.2 - 2.1.1 + 3.1.0 3.1.1 1.14.10 2.0.1 @@ -317,9 +317,9 @@ - javax.ws.rs - javax.ws.rs-api - ${javax.ws.rs-api.version} + jakarta.ws.rs + jakarta.ws.rs-api + ${jakarta.ws.rs-api.version} diff --git a/server/src/test/java/se/fortnox/reactivewizard/server/AbortedRequestHandlingTest.java b/server/src/test/java/se/fortnox/reactivewizard/server/AbortedRequestHandlingTest.java index 84ada20f..16b423ec 100644 --- a/server/src/test/java/se/fortnox/reactivewizard/server/AbortedRequestHandlingTest.java +++ b/server/src/test/java/se/fortnox/reactivewizard/server/AbortedRequestHandlingTest.java @@ -1,6 +1,8 @@ package se.fortnox.reactivewizard.server; import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.core.Appender; import org.junit.jupiter.api.Test; @@ -13,8 +15,6 @@ import se.fortnox.reactivewizard.jaxrs.RequestLogger; import se.fortnox.reactivewizard.test.LoggingMockUtil; -import javax.ws.rs.GET; -import javax.ws.rs.Path; import java.util.Collections; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; diff --git a/utils/pom.xml b/utils/pom.xml index caf8af96..1e637acb 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -63,8 +63,8 @@ - javax.ws.rs - javax.ws.rs-api + jakarta.ws.rs + jakarta.ws.rs-api test diff --git a/utils/src/test/java/se/fortnox/reactivewizard/util/ReflectionUtilTest.java b/utils/src/test/java/se/fortnox/reactivewizard/util/ReflectionUtilTest.java index ed5e1567..625398e1 100644 --- a/utils/src/test/java/se/fortnox/reactivewizard/util/ReflectionUtilTest.java +++ b/utils/src/test/java/se/fortnox/reactivewizard/util/ReflectionUtilTest.java @@ -5,6 +5,9 @@ import com.google.inject.Injector; import com.google.inject.matcher.Matchers; import jakarta.inject.Provider; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.QueryParam; import org.aopalliance.intercept.Joinpoint; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.MethodSource; @@ -12,9 +15,6 @@ import reactor.core.publisher.Mono; import rx.Observable; -import javax.ws.rs.GET; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.QueryParam; import java.lang.annotation.Annotation; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; diff --git a/validation/src/main/java/se/fortnox/reactivewizard/validation/JaxRsParameterNameResolver.java b/validation/src/main/java/se/fortnox/reactivewizard/validation/JaxRsParameterNameResolver.java index 6a27de42..59f38e5f 100644 --- a/validation/src/main/java/se/fortnox/reactivewizard/validation/JaxRsParameterNameResolver.java +++ b/validation/src/main/java/se/fortnox/reactivewizard/validation/JaxRsParameterNameResolver.java @@ -1,12 +1,12 @@ package se.fortnox.reactivewizard.validation; +import jakarta.validation.ParameterNameProvider; +import jakarta.ws.rs.FormParam; +import jakarta.ws.rs.HeaderParam; +import jakarta.ws.rs.PathParam; +import jakarta.ws.rs.QueryParam; import se.fortnox.reactivewizard.util.ReflectionUtil; -import jakarta.validation.ParameterNameProvider; -import javax.ws.rs.FormParam; -import javax.ws.rs.HeaderParam; -import javax.ws.rs.PathParam; -import javax.ws.rs.QueryParam; import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; import java.lang.reflect.Method; diff --git a/validation/src/test/java/se/fortnox/reactivewizard/validation/ResourceValidationTest.java b/validation/src/test/java/se/fortnox/reactivewizard/validation/ResourceValidationTest.java index 62b21c93..50e8ed31 100644 --- a/validation/src/test/java/se/fortnox/reactivewizard/validation/ResourceValidationTest.java +++ b/validation/src/test/java/se/fortnox/reactivewizard/validation/ResourceValidationTest.java @@ -3,6 +3,9 @@ import com.google.inject.Injector; import jakarta.inject.Inject; import jakarta.validation.constraints.Min; +import jakarta.ws.rs.GET; +import jakarta.ws.rs.Path; +import jakarta.ws.rs.QueryParam; import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; @@ -10,10 +13,6 @@ import se.fortnox.reactivewizard.config.TestInjector; import se.fortnox.reactivewizard.server.ServerConfig; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.QueryParam; - import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.fail;