diff --git a/pom.xml b/pom.xml index 2e93bf8..f7248fd 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.inteligr8 common-rest-client - 2.0.10-cxf + 3.0.0-cxf jar ReST API Client for Java @@ -40,16 +40,21 @@ utf-8 - 8 - 8 + 11 + 11 - 5.7.2 - 5.3.27 - 2.15.1 - 3.5.6 + 5.10.0 + 6.0.19 + 2.17.2 + 4.0.2 + + jakarta.annotation + jakarta.annotation-api + 2.1.1 + org.springframework spring-context @@ -61,8 +66,8 @@ ${jackson.version} - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider + com.fasterxml.jackson.jakarta.rs + jackson-jakarta-rs-json-provider ${jackson.version} @@ -78,12 +83,12 @@ org.slf4j slf4j-api - 1.7.36 + 2.0.13 jakarta.ws.rs jakarta.ws.rs-api - 2.1.6 + 3.1.0 org.junit.jupiter diff --git a/src/main/cxf/com/inteligr8/rs/ClientCxfImpl.java b/src/main/cxf/com/inteligr8/rs/ClientCxfImpl.java index f0e1adb..a878ad8 100644 --- a/src/main/cxf/com/inteligr8/rs/ClientCxfImpl.java +++ b/src/main/cxf/com/inteligr8/rs/ClientCxfImpl.java @@ -17,8 +17,8 @@ package com.inteligr8.rs; import java.util.LinkedList; import java.util.List; -import javax.annotation.PostConstruct; -import javax.ws.rs.ext.RuntimeDelegate; +import jakarta.annotation.PostConstruct; +import jakarta.ws.rs.ext.RuntimeDelegate; import org.apache.cxf.BusFactory; import org.apache.cxf.jaxrs.client.JAXRSClientFactory; @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; +import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; /** * A class that provides pre-configured JAX-RS Client & WebTarget & @@ -108,7 +108,7 @@ public class ClientCxfImpl extends Client { om.registerModules(new JavaTimeModule()); this.getConfig().configureJacksonMapper(om); - JacksonJaxbJsonProvider jacksonProvider = new JacksonJaxbJsonProvider(om, JacksonJaxbJsonProvider.DEFAULT_ANNOTATIONS); + JacksonJsonProvider jacksonProvider = new JacksonJsonProvider(om, JacksonJsonProvider.BASIC_ANNOTATIONS); this.getConfig().configureJacksonProvider(jacksonProvider); List providersAndFilters = new LinkedList(); diff --git a/src/main/cxf/com/inteligr8/rs/CxfLoggingFilter.java b/src/main/cxf/com/inteligr8/rs/CxfLoggingFilter.java index 75c3c31..0ecf238 100644 --- a/src/main/cxf/com/inteligr8/rs/CxfLoggingFilter.java +++ b/src/main/cxf/com/inteligr8/rs/CxfLoggingFilter.java @@ -18,8 +18,8 @@ import java.io.IOException; import java.util.LinkedList; import java.util.List; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.core.MediaType; import org.apache.cxf.jaxrs.ext.multipart.Attachment; import org.apache.cxf.jaxrs.ext.multipart.MultipartBody; diff --git a/src/main/cxf/com/inteligr8/rs/CxfMultipartProvider.java b/src/main/cxf/com/inteligr8/rs/CxfMultipartProvider.java index c79f53b..7497baf 100644 --- a/src/main/cxf/com/inteligr8/rs/CxfMultipartProvider.java +++ b/src/main/cxf/com/inteligr8/rs/CxfMultipartProvider.java @@ -17,10 +17,10 @@ package com.inteligr8.rs; import java.lang.annotation.Annotation; import java.lang.reflect.Type; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.ext.Provider; +import jakarta.ws.rs.Consumes; +import jakarta.ws.rs.Produces; +import jakarta.ws.rs.core.MediaType; +import jakarta.ws.rs.ext.Provider; import org.apache.cxf.jaxrs.ext.multipart.MultipartBody; import org.apache.cxf.jaxrs.provider.MultipartProvider; diff --git a/src/main/java/com/inteligr8/rs/AuthorizationFilter.java b/src/main/java/com/inteligr8/rs/AuthorizationFilter.java index 7ed3390..a602c75 100755 --- a/src/main/java/com/inteligr8/rs/AuthorizationFilter.java +++ b/src/main/java/com/inteligr8/rs/AuthorizationFilter.java @@ -14,7 +14,7 @@ */ package com.inteligr8.rs; -import javax.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.ClientRequestFilter; /** * This is a marker that allows the developer to segregate, restrict, or limit diff --git a/src/main/java/com/inteligr8/rs/BasicAuthorizationFilter.java b/src/main/java/com/inteligr8/rs/BasicAuthorizationFilter.java index 2dfc89f..0d11761 100755 --- a/src/main/java/com/inteligr8/rs/BasicAuthorizationFilter.java +++ b/src/main/java/com/inteligr8/rs/BasicAuthorizationFilter.java @@ -17,8 +17,8 @@ package com.inteligr8.rs; import java.io.UnsupportedEncodingException; import java.util.Base64; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.core.HttpHeaders; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/inteligr8/rs/BearerTokenAuthorizationFilter.java b/src/main/java/com/inteligr8/rs/BearerTokenAuthorizationFilter.java index bfe16b4..84fb6a5 100755 --- a/src/main/java/com/inteligr8/rs/BearerTokenAuthorizationFilter.java +++ b/src/main/java/com/inteligr8/rs/BearerTokenAuthorizationFilter.java @@ -14,8 +14,8 @@ */ package com.inteligr8.rs; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.core.HttpHeaders; /** * This class implements a simple long living or proxied token-based diff --git a/src/main/java/com/inteligr8/rs/Client.java b/src/main/java/com/inteligr8/rs/Client.java index b8507d2..2af9cbf 100644 --- a/src/main/java/com/inteligr8/rs/Client.java +++ b/src/main/java/com/inteligr8/rs/Client.java @@ -16,14 +16,14 @@ package com.inteligr8.rs; import java.util.concurrent.TimeUnit; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.WebTarget; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.WebTarget; import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; -import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; +import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; /** * A class that provides pre-configured JAX-RS Client & WebTarget objects. @@ -33,7 +33,7 @@ import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; public abstract class Client { private final Object sync = new Object(); - private javax.ws.rs.client.Client client; + private jakarta.ws.rs.client.Client client; /** * @return The client configuration. @@ -43,7 +43,7 @@ public abstract class Client { /** * @return A pre-configured JAX-RS client (no URL) with configured authorization. */ - public final javax.ws.rs.client.Client getClient() { + public final jakarta.ws.rs.client.Client getClient() { synchronized (this.sync) { if (this.client == null) this.client = this.buildClient((AuthorizationFilter)null); @@ -56,7 +56,7 @@ public abstract class Client { * @param authFilter A dynamic authorization filter. * @return A pre-configured JAX-RS client (no URL) with the specified authorization. */ - public javax.ws.rs.client.Client getClient(AuthorizationFilter authFilter) { + public jakarta.ws.rs.client.Client getClient(AuthorizationFilter authFilter) { if (authFilter == null) { return this.getClient(); } else { @@ -68,12 +68,12 @@ public abstract class Client { * @param authFilter A dynamic authorization filter. * @return A pre-configured JAX-RS client (no URL) with the specified authorization. */ - public final javax.ws.rs.client.Client buildClient(AuthorizationFilter authFilter) { + public final jakarta.ws.rs.client.Client buildClient(AuthorizationFilter authFilter) { ObjectMapper om = new ObjectMapper(); om.registerModules(new JavaTimeModule()); this.getConfig().configureJacksonMapper(om); - JacksonJaxbJsonProvider provider = new JacksonJaxbJsonProvider(om, JacksonJaxbJsonProvider.DEFAULT_ANNOTATIONS); + JacksonJsonProvider provider = new JacksonJsonProvider(om, JacksonJsonProvider.BASIC_ANNOTATIONS); this.getConfig().configureJacksonProvider(provider); if (this.getConfig().isWrapRootValueEnabled()) diff --git a/src/main/java/com/inteligr8/rs/ClientConfiguration.java b/src/main/java/com/inteligr8/rs/ClientConfiguration.java index 98b2fc2..9eda168 100644 --- a/src/main/java/com/inteligr8/rs/ClientConfiguration.java +++ b/src/main/java/com/inteligr8/rs/ClientConfiguration.java @@ -16,10 +16,10 @@ package com.inteligr8.rs; import java.net.URI; -import javax.ws.rs.client.ClientBuilder; - import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; +import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; + +import jakarta.ws.rs.client.ClientBuilder; /** * This interface defines the configurable parameters of the clients; primarily @@ -151,9 +151,9 @@ public interface ClientConfiguration { } /** - * @param provider A Jackson JAX-RS provider to configure. + * @param provider A Jackson Jakarta RS provider to configure. */ - default void configureJacksonProvider(JacksonJaxbJsonProvider provider) { + default void configureJacksonProvider(JacksonJsonProvider provider) { } diff --git a/src/main/java/com/inteligr8/rs/ClientEnforcementAuthorizationFilter.java b/src/main/java/com/inteligr8/rs/ClientEnforcementAuthorizationFilter.java index 63274e9..3925a62 100644 --- a/src/main/java/com/inteligr8/rs/ClientEnforcementAuthorizationFilter.java +++ b/src/main/java/com/inteligr8/rs/ClientEnforcementAuthorizationFilter.java @@ -14,7 +14,7 @@ */ package com.inteligr8.rs; -import javax.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestContext; import org.apache.commons.lang3.StringUtils; diff --git a/src/main/java/com/inteligr8/rs/ClientImpl.java b/src/main/java/com/inteligr8/rs/ClientImpl.java index e6de5fc..3606f3f 100644 --- a/src/main/java/com/inteligr8/rs/ClientImpl.java +++ b/src/main/java/com/inteligr8/rs/ClientImpl.java @@ -14,8 +14,8 @@ */ package com.inteligr8.rs; -import javax.annotation.PostConstruct; -import javax.ws.rs.client.ClientBuilder; +import jakarta.annotation.PostConstruct; +import jakarta.ws.rs.client.ClientBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/inteligr8/rs/ForwardingAuthorizationFilter.java b/src/main/java/com/inteligr8/rs/ForwardingAuthorizationFilter.java index 731dcee..94c5338 100755 --- a/src/main/java/com/inteligr8/rs/ForwardingAuthorizationFilter.java +++ b/src/main/java/com/inteligr8/rs/ForwardingAuthorizationFilter.java @@ -14,8 +14,8 @@ */ package com.inteligr8.rs; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.core.HttpHeaders; /** * This class implements a proxied or forwarded authorization header based diff --git a/src/main/java/com/inteligr8/rs/LoggingFilter.java b/src/main/java/com/inteligr8/rs/LoggingFilter.java index 0631659..155ba5d 100644 --- a/src/main/java/com/inteligr8/rs/LoggingFilter.java +++ b/src/main/java/com/inteligr8/rs/LoggingFilter.java @@ -16,12 +16,12 @@ package com.inteligr8.rs; import java.io.IOException; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.client.ClientResponseContext; -import javax.ws.rs.client.ClientResponseFilter; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.MediaType; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.ClientRequestFilter; +import jakarta.ws.rs.client.ClientResponseContext; +import jakarta.ws.rs.client.ClientResponseFilter; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.MediaType; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/inteligr8/rs/OAuthAuthorizationCodeAuthorizationFilter.java b/src/main/java/com/inteligr8/rs/OAuthAuthorizationCodeAuthorizationFilter.java index c1a0b93..43523ef 100755 --- a/src/main/java/com/inteligr8/rs/OAuthAuthorizationCodeAuthorizationFilter.java +++ b/src/main/java/com/inteligr8/rs/OAuthAuthorizationCodeAuthorizationFilter.java @@ -16,7 +16,7 @@ package com.inteligr8.rs; import java.net.URI; -import javax.ws.rs.core.Form; +import jakarta.ws.rs.core.Form; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; diff --git a/src/main/java/com/inteligr8/rs/OAuthAuthorizationFilter.java b/src/main/java/com/inteligr8/rs/OAuthAuthorizationFilter.java index 519aaf2..3080ea4 100755 --- a/src/main/java/com/inteligr8/rs/OAuthAuthorizationFilter.java +++ b/src/main/java/com/inteligr8/rs/OAuthAuthorizationFilter.java @@ -16,22 +16,22 @@ package com.inteligr8.rs; import java.util.Map; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.Form; -import javax.ws.rs.core.HttpHeaders; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.Response.Status.Family; +import jakarta.ws.rs.WebApplicationException; +import jakarta.ws.rs.client.Client; +import jakarta.ws.rs.client.ClientBuilder; +import jakarta.ws.rs.client.ClientRequestContext; +import jakarta.ws.rs.client.Entity; +import jakarta.ws.rs.client.WebTarget; +import jakarta.ws.rs.core.Form; +import jakarta.ws.rs.core.HttpHeaders; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.Response.Status.Family; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; +import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider; /** * This class is the base for implementations of OAuth authorization flows. @@ -159,7 +159,7 @@ public abstract class OAuthAuthorizationFilter implements AuthorizationFilter { Entity
entity = Entity.form(form); Client client = ClientBuilder.newBuilder() - .register(new JacksonJaxbJsonProvider()) + .register(new JacksonJsonProvider()) .build(); WebTarget target = client.target(this.tokenUrl); diff --git a/src/main/java/com/inteligr8/rs/OAuthClientCredentialAuthorizationFilter.java b/src/main/java/com/inteligr8/rs/OAuthClientCredentialAuthorizationFilter.java index b6d9a97..b8006d6 100755 --- a/src/main/java/com/inteligr8/rs/OAuthClientCredentialAuthorizationFilter.java +++ b/src/main/java/com/inteligr8/rs/OAuthClientCredentialAuthorizationFilter.java @@ -14,7 +14,7 @@ */ package com.inteligr8.rs; -import javax.ws.rs.core.Form; +import jakarta.ws.rs.core.Form; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/com/inteligr8/rs/OAuthPasswordGrantAuthorizationFilter.java b/src/main/java/com/inteligr8/rs/OAuthPasswordGrantAuthorizationFilter.java index a5db103..9c17db3 100755 --- a/src/main/java/com/inteligr8/rs/OAuthPasswordGrantAuthorizationFilter.java +++ b/src/main/java/com/inteligr8/rs/OAuthPasswordGrantAuthorizationFilter.java @@ -14,7 +14,7 @@ */ package com.inteligr8.rs; -import javax.ws.rs.core.Form; +import jakarta.ws.rs.core.Form; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger;