Switch from deprecated javax.ws to jakarta.ws

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;
 

api/pom.xml

@@ -11,8 +11,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
         </dependency>
 
         <dependency>

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 {

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 {

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;
 

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

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,29 +16,23 @@
 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;
 import se.fortnox.reactivewizard.jaxrs.WebException;
 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;

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;

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;

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;

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;
 
 

jaxrs-api/pom.xml

@@ -13,8 +13,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.ws.rs</groupId>
-            <artifactId>javax.ws.rs-api</artifactId>
+            <groupId>jakarta.ws.rs</groupId>
+            <artifactId>jakarta.ws.rs-api</artifactId>
         </dependency>
 
         <dependency>

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;

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;

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;

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;

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;

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;

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;

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;
 
 /**

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;
 
 /**

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;
 
 /**