inteligr8/common-rest-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v3.x; jersey v3.x

Browse Source
This commit is contained in:
Brian Long 2024-08-15 11:51:22 -04:00
commit 3f34ddb59d
15 changed files with 63 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>com.inteligr8</groupId> <groupId>com.inteligr8</groupId>
<artifactId>common-rest-client</artifactId> <artifactId>common-rest-client</artifactId>
<version>2.0-SNAPSHOT-jersey</version> <version>3.0-SNAPSHOT-jersey</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>ReST API Client for Java</name> <name>ReST API Client for Java</name>
@ -40,16 +40,21 @@
<properties> <properties>
<project.build.sourceEncoding>utf-8</project.build.sourceEncoding> <project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
<maven.compiler.source>8</maven.compiler.source> <maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>8</maven.compiler.target> <maven.compiler.target>11</maven.compiler.target>
<junit.version>5.7.2</junit.version> <junit.version>5.10.0</junit.version>
<spring.version>5.3.27</spring.version> <spring.version>6.0.19</spring.version>
<jackson.version>2.15.1</jackson.version> <jackson.version>2.17.2</jackson.version>
<jersey.version>2.39.1</jersey.version> <jersey.version>3.1.8</jersey.version>
</properties> </properties>
<dependencies> <dependencies>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>2.1.1</version>
</dependency>
<dependency> <dependency>
<groupId>org.springframework</groupId> <groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId> <artifactId>spring-context</artifactId>
@ -61,8 +66,8 @@
<version>${jackson.version}</version> <version>${jackson.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.fasterxml.jackson.jaxrs</groupId> <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
<artifactId>jackson-jaxrs-json-provider</artifactId> <artifactId>jackson-jakarta-rs-json-provider</artifactId>
<version>${jackson.version}</version> <version>${jackson.version}</version>
</dependency> </dependency>
<dependency> <dependency>
@ -78,12 +83,12 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>1.7.36</version> <version>2.0.13</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.ws.rs</groupId> <groupId>jakarta.ws.rs</groupId>
<artifactId>jakarta.ws.rs-api</artifactId> <artifactId>jakarta.ws.rs-api</artifactId>
<version>2.1.6</version> <version>3.1.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>

2
src/main/java/com/inteligr8/rs/AuthorizationFilter.java
View File

@ -14,7 +14,7 @@
*/ */
package com.inteligr8.rs; 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 * This is a marker that allows the developer to segregate, restrict, or limit

4
src/main/java/com/inteligr8/rs/BasicAuthorizationFilter.java
View File

@ -17,8 +17,8 @@ package com.inteligr8.rs;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.util.Base64; import java.util.Base64;
import javax.ws.rs.client.ClientRequestContext; import jakarta.ws.rs.client.ClientRequestContext;
import javax.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.HttpHeaders;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;

4
src/main/java/com/inteligr8/rs/BearerTokenAuthorizationFilter.java
View File

@ -14,8 +14,8 @@
*/ */
package com.inteligr8.rs; package com.inteligr8.rs;
import javax.ws.rs.client.ClientRequestContext; import jakarta.ws.rs.client.ClientRequestContext;
import javax.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.HttpHeaders;
/** /**
* This class implements a simple long living or proxied token-based * This class implements a simple long living or proxied token-based

16
src/main/java/com/inteligr8/rs/Client.java
View File

@ -16,14 +16,14 @@ package com.inteligr8.rs;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import javax.ws.rs.client.ClientBuilder; import jakarta.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.WebTarget; import jakarta.ws.rs.client.WebTarget;
import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; 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 &amp; WebTarget objects. * A class that provides pre-configured JAX-RS Client &amp; WebTarget objects.
@ -33,7 +33,7 @@ import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
public abstract class Client { public abstract class Client {
private final Object sync = new Object(); private final Object sync = new Object();
private javax.ws.rs.client.Client client; private jakarta.ws.rs.client.Client client;
/** /**
* @return The client configuration. * @return The client configuration.
@ -43,7 +43,7 @@ public abstract class Client {
/** /**
* @return A pre-configured JAX-RS client (no URL) with configured authorization. * @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) { synchronized (this.sync) {
if (this.client == null) if (this.client == null)
this.client = this.buildClient((AuthorizationFilter)null); this.client = this.buildClient((AuthorizationFilter)null);
@ -56,7 +56,7 @@ public abstract class Client {
* @param authFilter A dynamic authorization filter. * @param authFilter A dynamic authorization filter.
* @return A pre-configured JAX-RS client (no URL) with the specified authorization. * @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) { if (authFilter == null) {
return this.getClient(); return this.getClient();
} else { } else {
@ -68,12 +68,12 @@ public abstract class Client {
* @param authFilter A dynamic authorization filter. * @param authFilter A dynamic authorization filter.
* @return A pre-configured JAX-RS client (no URL) with the specified authorization. * @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(); ObjectMapper om = new ObjectMapper();
om.registerModules(new JavaTimeModule()); om.registerModules(new JavaTimeModule());
this.getConfig().configureJacksonMapper(om); this.getConfig().configureJacksonMapper(om);
JacksonJaxbJsonProvider provider = new JacksonJaxbJsonProvider(om, JacksonJaxbJsonProvider.DEFAULT_ANNOTATIONS); JacksonJsonProvider provider = new JacksonJsonProvider(om, JacksonJsonProvider.BASIC_ANNOTATIONS);
this.getConfig().configureJacksonProvider(provider); this.getConfig().configureJacksonProvider(provider);
if (this.getConfig().isWrapRootValueEnabled()) if (this.getConfig().isWrapRootValueEnabled())

10
src/main/java/com/inteligr8/rs/ClientConfiguration.java
View File

@ -16,10 +16,10 @@ package com.inteligr8.rs;
import java.net.URI; import java.net.URI;
import javax.ws.rs.client.ClientBuilder;
import com.fasterxml.jackson.databind.ObjectMapper; 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 * 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) {
} }

2
src/main/java/com/inteligr8/rs/ClientEnforcementAuthorizationFilter.java
View File

@ -14,7 +14,7 @@
*/ */
package com.inteligr8.rs; package com.inteligr8.rs;
import javax.ws.rs.client.ClientRequestContext; import jakarta.ws.rs.client.ClientRequestContext;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;

4
src/main/java/com/inteligr8/rs/ClientImpl.java
View File

@ -14,8 +14,8 @@
*/ */
package com.inteligr8.rs; package com.inteligr8.rs;
import javax.annotation.PostConstruct; import jakarta.annotation.PostConstruct;
import javax.ws.rs.client.ClientBuilder; import jakarta.ws.rs.client.ClientBuilder;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

4
src/main/java/com/inteligr8/rs/ForwardingAuthorizationFilter.java
View File

@ -14,8 +14,8 @@
*/ */
package com.inteligr8.rs; package com.inteligr8.rs;
import javax.ws.rs.client.ClientRequestContext; import jakarta.ws.rs.client.ClientRequestContext;
import javax.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.HttpHeaders;
/** /**
* This class implements a proxied or forwarded authorization header based * This class implements a proxied or forwarded authorization header based

12
src/main/java/com/inteligr8/rs/LoggingFilter.java
View File

@ -16,12 +16,12 @@ package com.inteligr8.rs;
import java.io.IOException; import java.io.IOException;
import javax.ws.rs.client.ClientRequestContext; import jakarta.ws.rs.client.ClientRequestContext;
import javax.ws.rs.client.ClientRequestFilter; import jakarta.ws.rs.client.ClientRequestFilter;
import javax.ws.rs.client.ClientResponseContext; import jakarta.ws.rs.client.ClientResponseContext;
import javax.ws.rs.client.ClientResponseFilter; import jakarta.ws.rs.client.ClientResponseFilter;
import javax.ws.rs.core.Form; import jakarta.ws.rs.core.Form;
import javax.ws.rs.core.MediaType; import jakarta.ws.rs.core.MediaType;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

2
src/main/java/com/inteligr8/rs/OAuthAuthorizationCodeAuthorizationFilter.java
View File

@ -16,7 +16,7 @@ package com.inteligr8.rs;
import java.net.URI; import java.net.URI;
import javax.ws.rs.core.Form; import jakarta.ws.rs.core.Form;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;

24
src/main/java/com/inteligr8/rs/OAuthAuthorizationFilter.java
View File

@ -16,22 +16,22 @@ package com.inteligr8.rs;
import java.util.Map; import java.util.Map;
import javax.ws.rs.WebApplicationException; import jakarta.ws.rs.WebApplicationException;
import javax.ws.rs.client.Client; import jakarta.ws.rs.client.Client;
import javax.ws.rs.client.ClientBuilder; import jakarta.ws.rs.client.ClientBuilder;
import javax.ws.rs.client.ClientRequestContext; import jakarta.ws.rs.client.ClientRequestContext;
import javax.ws.rs.client.Entity; import jakarta.ws.rs.client.Entity;
import javax.ws.rs.client.WebTarget; import jakarta.ws.rs.client.WebTarget;
import javax.ws.rs.core.Form; import jakarta.ws.rs.core.Form;
import javax.ws.rs.core.HttpHeaders; import jakarta.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response; import jakarta.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status.Family; import jakarta.ws.rs.core.Response.Status.Family;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; 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. * This class is the base for implementations of OAuth authorization flows.
@ -159,7 +159,7 @@ public abstract class OAuthAuthorizationFilter implements AuthorizationFilter {
Entity<Form> entity = Entity.form(form); Entity<Form> entity = Entity.form(form);
Client client = ClientBuilder.newBuilder() Client client = ClientBuilder.newBuilder()
.register(new JacksonJaxbJsonProvider()) .register(new JacksonJsonProvider())
.build(); .build();
WebTarget target = client.target(this.tokenUrl); WebTarget target = client.target(this.tokenUrl);

2
src/main/java/com/inteligr8/rs/OAuthClientCredentialAuthorizationFilter.java
View File

@ -14,7 +14,7 @@
*/ */
package com.inteligr8.rs; package com.inteligr8.rs;
import javax.ws.rs.core.Form; import jakarta.ws.rs.core.Form;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;

2
src/main/java/com/inteligr8/rs/OAuthPasswordGrantAuthorizationFilter.java
View File

@ -14,7 +14,7 @@
*/ */
package com.inteligr8.rs; package com.inteligr8.rs;
import javax.ws.rs.core.Form; import jakarta.ws.rs.core.Form;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;

6
src/main/jersey/com/inteligr8/rs/ClientJerseyImpl.java
View File

@ -14,9 +14,9 @@
*/ */
package com.inteligr8.rs; package com.inteligr8.rs;
import javax.annotation.PostConstruct; import jakarta.annotation.PostConstruct;
import javax.ws.rs.client.ClientBuilder; import jakarta.ws.rs.client.ClientBuilder;
import javax.ws.rs.ext.RuntimeDelegate; import jakarta.ws.rs.ext.RuntimeDelegate;
import org.glassfish.jersey.client.ClientProperties; import org.glassfish.jersey.client.ClientProperties;
import org.glassfish.jersey.client.proxy.WebResourceFactory; import org.glassfish.jersey.client.proxy.WebResourceFactory;