v3.x; jersey v3.x (3f34ddb5) · Commits · Inteligr8 / common-rest-client

pom.xml

+16 −11

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@

		<groupId>com.inteligr8</groupId>
		<artifactId>common-rest-client</artifactId>
		<version>2.0-SNAPSHOT-jersey</version>
		<version>3.0-SNAPSHOT-jersey</version>
		<packaging>jar</packaging>

		<name>ReST API Client for Java</name>
		@@ -40,16 +40,21 @@

		<properties>
		<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
		<maven.compiler.source>8</maven.compiler.source>
		<maven.compiler.target>8</maven.compiler.target>
		<maven.compiler.source>11</maven.compiler.source>
		<maven.compiler.target>11</maven.compiler.target>

		<junit.version>5.7.2</junit.version>
		<spring.version>5.3.27</spring.version>
		<jackson.version>2.15.1</jackson.version>
		<jersey.version>2.39.1</jersey.version>
		<junit.version>5.10.0</junit.version>
		<spring.version>6.0.19</spring.version>
		<jackson.version>2.17.2</jackson.version>
		<jersey.version>3.1.8</jersey.version>
		</properties>

		<dependencies>
		<dependency>
		<groupId>jakarta.annotation</groupId>
		<artifactId>jakarta.annotation-api</artifactId>
		<version>2.1.1</version>
		</dependency>
		<dependency>
		<groupId>org.springframework</groupId>
		<artifactId>spring-context</artifactId>
		@@ -61,8 +66,8 @@
		<version>${jackson.version}</version>
		</dependency>
		<dependency>
		<groupId>com.fasterxml.jackson.jaxrs</groupId>
		<artifactId>jackson-jaxrs-json-provider</artifactId>
		<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
		<artifactId>jackson-jakarta-rs-json-provider</artifactId>
		<version>${jackson.version}</version>
		</dependency>
		<dependency>
		@@ -78,12 +83,12 @@
		<dependency>
		<groupId>org.slf4j</groupId>
		<artifactId>slf4j-api</artifactId>
		<version>1.7.36</version>
		<version>2.0.13</version>
		</dependency>
		<dependency>
		<groupId>jakarta.ws.rs</groupId>
		<artifactId>jakarta.ws.rs-api</artifactId>
		<version>2.1.6</version>
		<version>3.1.0</version>
		</dependency>
		<dependency>
		<groupId>org.junit.jupiter</groupId>

src/main/java/com/inteligr8/rs/AuthorizationFilter.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

src/main/java/com/inteligr8/rs/BasicAuthorizationFilter.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;

src/main/java/com/inteligr8/rs/BearerTokenAuthorizationFilter.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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

src/main/java/com/inteligr8/rs/Client.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -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())