v2.0.8-jersey pom

README.md

@@ -1,7 +1,7 @@
 
 # Common ReST Client Library
 
-This project provides a library for Spring and POJO-based REST client instantiation.
+This project provides a library for Spring and POJO-based REST client instantiation.  It includes special classes for the Jersey JAXRS-based client frameworks.
 
 ## Usage
 
@@ -15,7 +15,7 @@ First, you will need to include the library in your project.
         <dependency>
             <groupId>com.inteligr8</groupId>
             <artifactId>common-rest-client</artifactId>
-            <version>...</version>
+            <version>...-jersey</version>
         </dependency>
         ...
     </dependencies>
@@ -23,4 +23,65 @@ First, you will need to include the library in your project.
 </project>
 ```
 
-See the `cxf` and `jersey` branches for examples and more documentation.
+### Spring Framework
+
+#### Single Client
+
+If you will only be declaring a single client in your Spring context, this is easy.  You will just need two things.  First, inject the single client into any of your Spring beans.  You may do inject it into more than one.  An example is below:
+
+```java
+@Component
+public class ... {
+    @Autowired
+    @Qualifier("client.jersey")  // may be optional
+    private Client client;
+}
+```
+
+Next, you need to configure that client.  You can do that by providing a single implementation of the `ClientConfiguration` (or `ClientJerseyConfiguration`) interface.
+
+```java
+@Configuration
+public class ... implements ClientJerseyConfiguration {
+    ...
+}
+```
+
+#### Multiple Clients
+
+If you will or may have multiple clients in your Spring context, there is an extra step.  You will still need to define a `ClientConfiguration` for each.  On top of that, you will need to create specialized implementations of each client.  That special implementation will reference the configuration directly.  An example is below.
+
+```java
+@Component("my.client")
+public class MyClient extends ClientJerseyImpl {
+    @Autowired
+    public MyClient(MyClientConfiguration config) {
+        super(config);
+    }
+}
+```
+
+You can then inject your client(s) into your Spring beans.  Like the example below:
+
+```java
+@Component
+public class ... {
+    @Autowired
+    private MyClient client;
+
+    @PostConstruct
+    public void init() {
+        MyJaxRsApi api = this.client.getApi(MyJaxRsApi.class);
+    }
+}
+
+### POJO
+
+You do not have to use the Spring framework to use these classes.  You can instantiate them directly.  But you wil still need to create a `ClientConfiguration` as mentioned above.
+
+```java
+MyClientConfiguration config = new MyClientConfiguration();
+...
+ClientJerseyImpl client = new ClientJerseyImpl(config);
+MyJaxRsApi api = client.getApi(MyJaxRsApi.class);
+```

pom.xml

@@ -6,11 +6,11 @@
 	
 	<groupId>com.inteligr8</groupId>
 	<artifactId>common-rest-client</artifactId>
-	<version>3.0.3</version>
+	<version>2.0.8-jersey</version>
 	<packaging>jar</packaging>
 
 	<name>ReST API Client for Java</name>
-	<description>A common library for building REST API clients</description>
+	<description>A common library for building Jersey REST API clients</description>
 	<url>https://bitbucket.org/inteligr8/common-rest-client</url>
 
 	<licenses>
@@ -40,20 +40,16 @@
 
 	<properties>
 		<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
-		<maven.compiler.source>11</maven.compiler.source>
+		<maven.compiler.source>8</maven.compiler.source>
-		<maven.compiler.target>11</maven.compiler.target>
+		<maven.compiler.target>8</maven.compiler.target>
 
-		<junit.version>5.12.0</junit.version>
+		<junit.version>5.7.2</junit.version>
-		<spring.version>6.0.23</spring.version>
+		<spring.version>5.3.27</spring.version>
-		<jackson.version>2.17.3</jackson.version>
+		<jackson.version>2.15.1</jackson.version>
+		<jersey.version>2.39.1</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>
@@ -65,8 +61,8 @@
 			<version>${jackson.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.fasterxml.jackson.jakarta.rs</groupId>
+			<groupId>com.fasterxml.jackson.jaxrs</groupId>
-			<artifactId>jackson-jakarta-rs-json-provider</artifactId>
+			<artifactId>jackson-jaxrs-json-provider</artifactId>
 			<version>${jackson.version}</version>
 		</dependency>
 		<dependency>
@@ -74,20 +70,15 @@
 			<artifactId>jackson-datatype-jsr310</artifactId>
 			<version>${jackson.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-lang3</artifactId>
-			<version>3.17.0</version>
-		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
-			<version>2.0.17</version>
+			<version>1.7.36</version>
 		</dependency>
 		<dependency>
 			<groupId>jakarta.ws.rs</groupId>
 			<artifactId>jakarta.ws.rs-api</artifactId>
-			<version>3.1.0</version>
+			<version>2.1.6</version>
 		</dependency>
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
@@ -107,13 +98,67 @@
 			<version>4.5.14</version>
 			<scope>test</scope>
 		</dependency>
+		
+		<!-- Jersey libraries -->
+		<dependency>
+			<groupId>org.glassfish.jersey.ext</groupId>
+			<artifactId>jersey-proxy-client</artifactId>
+			<version>${jersey.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.core</groupId>
+			<artifactId>jersey-client</artifactId>
+			<version>${jersey.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.media</groupId>
+			<artifactId>jersey-media-multipart</artifactId>
+			<version>${jersey.version}</version>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.inject</groupId>
+			<artifactId>jersey-hk2</artifactId>
+			<version>${jersey.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.glassfish.jersey.media</groupId>
+			<artifactId>jersey-media-json-jackson</artifactId>
+			<version>${jersey.version}</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	
 	<build>
 		<plugins>
 			<plugin>
-				<artifactId>maven-surefire-plugin</artifactId>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>build-helper-maven-plugin</artifactId>
 				<version>3.4.0</version>
+				<executions>
+					<execution>
+						<id>add-jaxrs-src</id>
+						<goals><goal>add-source</goal></goals>
+						<configuration>
+							<sources>
+								<source>src/main/jersey</source>
+							</sources>
+						</configuration>
+					</execution>
+					<execution>
+						<id>add-test-src</id>
+						<goals><goal>add-test-source</goal></goals>
+						<configuration>
+							<sources>
+								<source>src/test/jersey</source>
+							</sources>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>3.1.0</version>
 				<dependencies>
 					<dependency>
 						<groupId>org.junit.jupiter</groupId>
@@ -124,7 +169,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-failsafe-plugin</artifactId>
-				<version>3.4.0</version>
+				<version>3.1.0</version>
 				<dependencies>
 					<dependency>
 						<groupId>org.junit.jupiter</groupId>
@@ -180,7 +225,7 @@
 					<plugin>
 						<groupId>org.sonatype.plugins</groupId>
 						<artifactId>nexus-staging-maven-plugin</artifactId>
-						<version>1.6.14</version>
+						<version>1.6.13</version>
 						<configuration>
 							<serverId>ossrh</serverId>
 							<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>

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

@@ -14,7 +14,7 @@
  */
 package com.inteligr8.rs;
 
-import jakarta.ws.rs.client.ClientRequestFilter;
+import javax.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

@@ -17,10 +17,8 @@ package com.inteligr8.rs;
 import java.io.UnsupportedEncodingException;
 import java.util.Base64;
 
-import jakarta.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientRequestContext;
-import jakarta.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.HttpHeaders;
-
-import org.apache.commons.lang3.StringUtils;
 
 /**
  * This class implements a simple 2-credential (username & password) based
@@ -34,14 +32,12 @@ public class BasicAuthorizationFilter implements AuthorizationFilter {
 	private final String password;
 	
 	/**
-	 * This constructor instantiates the filter with required fields.
-	 * 
 	 * @param username A username or access key.
 	 * @param password A password or secret key.
 	 */
 	public BasicAuthorizationFilter(String username, String password) {
-		this.username = StringUtils.trimToNull(username);
+		this.username = username;
-		this.password = StringUtils.trimToNull(password);
+		this.password = password;
 	}
 	
 	/**

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

@@ -14,8 +14,8 @@
  */
 package com.inteligr8.rs;
 
-import jakarta.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientRequestContext;
-import jakarta.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.HttpHeaders;
 
 /**
  * This class implements a simple long living or proxied token-based
@@ -32,8 +32,6 @@ public class BearerTokenAuthorizationFilter implements AuthorizationFilter {
 	private final String token;
 	
 	/**
-	 * This constructor instantiates the filter with required fields.
-	 * 
 	 * @param token A 'Bearer' token.
 	 */
 	public BearerTokenAuthorizationFilter(String token) {

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

@@ -16,39 +16,34 @@ package com.inteligr8.rs;
 
 import java.util.concurrent.TimeUnit;
 
-import jakarta.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.ClientBuilder;
-import jakarta.ws.rs.client.WebTarget;
+import javax.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.jakarta.rs.json.JacksonJsonProvider;
+import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
 
 /**
- * A class that provides pre-configured Jakarta RS Client & WebTarget objects.
+ * A class that provides pre-configured JAX-RS Client & WebTarget objects.
  * 
  * @author brian@inteligr8.com
  */
 public abstract class Client {
 	
 	private final Object sync = new Object();
-	private jakarta.ws.rs.client.Client client;
+	private javax.ws.rs.client.Client client;
 	
 	/**
-	 * This method retrieves the configuration for the client.
-	 * 
 	 * @return The client configuration.
 	 */
 	public abstract ClientConfiguration getConfig();
 	
 	/**
-	 * This method retrieves an anonymous cached instance of the underlying
+	 * @return A pre-configured JAX-RS client (no URL) with configured authorization.
-	 * Jakarta RS client.
-	 * 
-	 * @return A pre-configured Jakarta RS client (no URL) with configured authorization.
 	 */
-	public final jakarta.ws.rs.client.Client getClient() {
+	public final javax.ws.rs.client.Client getClient() {
 		synchronized (this.sync) {
 			if (this.client == null)
 				this.client = this.buildClient((AuthorizationFilter)null);
@@ -58,13 +53,10 @@ public abstract class Client {
 	}
 	
 	/**
-	 * This method retrieves either an anonymous cached instance or builds an
-	 * authorized instance of the underlying Jakarta RS client.
-	 * 
 	 * @param authFilter A dynamic authorization filter.
-	 * @return A pre-configured Jakarta RS client (no URL) with the specified authorization.
+	 * @return A pre-configured JAX-RS client (no URL) with the specified authorization.
 	 */
-	public jakarta.ws.rs.client.Client getClient(AuthorizationFilter authFilter) {
+	public javax.ws.rs.client.Client getClient(AuthorizationFilter authFilter) {
 		if (authFilter == null) {
 			return this.getClient();
 		} else {
@@ -73,17 +65,15 @@ public abstract class Client {
 	}
 	
 	/**
-	 * This method builds a new Jakarta RS client with optional authorization.
-	 * 
 	 * @param authFilter A dynamic authorization filter.
-	 * @return A pre-configured Jakarta RS client (no URL) with the specified authorization.
+	 * @return A pre-configured JAX-RS client (no URL) with the specified authorization.
 	 */
-	public final jakarta.ws.rs.client.Client buildClient(AuthorizationFilter authFilter) {
+	public final javax.ws.rs.client.Client buildClient(AuthorizationFilter authFilter) {
 	    ObjectMapper om = new ObjectMapper();
 	    om.registerModules(new JavaTimeModule());
 	    this.getConfig().configureJacksonMapper(om);
 	    
-	    JacksonJsonProvider provider = new JacksonJsonProvider(om, JacksonJsonProvider.BASIC_ANNOTATIONS);
+	    JacksonJaxbJsonProvider provider = new JacksonJaxbJsonProvider(om, JacksonJaxbJsonProvider.DEFAULT_ANNOTATIONS);
 		this.getConfig().configureJacksonProvider(provider);
         
 		if (this.getConfig().isWrapRootValueEnabled())
@@ -111,19 +101,14 @@ public abstract class Client {
 	}
     
     /**
-	 * This method allows sub-classes to extend the Jakarta RS client builder
+     * @param clientBuilder A client builder
-	 * before the client is built.
-	 * 
-     * @param clientBuilder A Jakarta RS client builder.
      */
     public void buildClient(ClientBuilder clientBuilder) {
         // for extension purposes
     }
 
 	/**
-	 * This method builds an anonymous Jakarta RS target.
+	 * @return A pre-configured JAX-RS target (client w/ base URL) with configured authorization.
-	 * 
-	 * @return A pre-configured Jakarta RS target (client w/ base URL) with configured authorization.
 	 */
 	public final WebTarget getTarget() {
 		return this.getClient()
@@ -131,10 +116,8 @@ public abstract class Client {
 	}
 
 	/**
-	 * This method builds an authorized Jakarta RS target.
-	 * 
 	 * @param authFilter A dynamic authorization filter.
-	 * @return A pre-configured Jakarta RS target (client w/ base URL) with the specified authorization.
+	 * @return A pre-configured JAX-RS target (client w/ base URL) with the specified authorization.
 	 */
 	public WebTarget getTarget(AuthorizationFilter authFilter) {
 		if (authFilter == null) {
@@ -146,10 +129,10 @@ public abstract class Client {
 	}
 	
 	/**
-	 * This method retrieves a Jakarta RS implementation of the specified API.
+	 * This method retrieves a JAX-RS implementation of the specified API.
 	 * 
-	 * @param <T> A Jakarta RS annotated API class.
+	 * @param <T> A JAX-RS annotated API class.
-	 * @param apiClass A Jakarta RS annotated API class.
+	 * @param apiClass A JAX-RS annotated API class.
 	 * @return An instance of the API class.
 	 */
 	public final <T> T getApi(Class<T> apiClass) {
@@ -157,12 +140,12 @@ public abstract class Client {
 	}
 
 	/**
-	 * This method retrieves a Jakarta RS implementation of the specified API with
+	 * This method retrieves a JAX-RS implementation of the specified API with
 	 * the specified authorization.
 	 * 
-	 * @param <T> A Jakarta RS annotated API class.
+	 * @param <T> A JAX-RS annotated API class.
 	 * @param authFilter A dynamic authorization filter.
-	 * @param apiClass A Jakarta RS annotated API class.
+	 * @param apiClass A JAX-RS annotated API class.
 	 * @return An instance of the API class.
 	 */
 	public abstract <T> T getApi(AuthorizationFilter authFilter, Class<T> apiClass);

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

@@ -16,10 +16,10 @@ package com.inteligr8.rs;
 
 import java.net.URI;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import javax.ws.rs.client.ClientBuilder;
-import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider;
 
-import jakarta.ws.rs.client.ClientBuilder;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
 
 /**
  * This interface defines the configurable parameters of the clients; primarily
@@ -30,127 +30,89 @@ import jakarta.ws.rs.client.ClientBuilder;
 public interface ClientConfiguration {
 	
 	/**
-	 * This method retrieves the base/root URL of the client service.
+	 * @return The base or root URL of the service.
-	 * 
-	 * @return The URL.
 	 */
 	String getBaseUrl();
 	
 	/**
-	 * This method retrieves the username to use in HTTP BASIC authentication/authorization.
+	 * @return The username for BASIC authentication.
-	 * 
-	 * @return A username.
 	 */
 	default String getBasicAuthUsername() {
 		return null;
 	}
 
 	/**
-	 * This method retrieves the password to use in HTTP BASIC authentication/authorization.
+	 * @return The corresponding password for the username in BASIC authentication.
-	 * 
-	 * @return The corresponding password for the username.
 	 */
 	default String getBasicAuthPassword() {
 		return null;
 	}
 	
 	/**
-	 * This method retrieves the client identifier to use in Client Enforcement authorization.
+	 * @return The client ID for Client Enforcement authentication.
-	 * 
-	 * @return A client identifier.
 	 */
 	default String getClientId() {
 		return null;
 	}
 
 	/**
-	 * This method retrieves the client secret to use in Client Enforcement authorization.
+	 * @return The corresponding client secret for the client ID in Client Enforcement authentication.
-	 * 
-	 * @return The corresponding client secret for the client identifier.
 	 */
 	default String getClientSecret() {
 		return null;
 	}
 	
 	/**
-	 * This method retrieves the token to use in HTTP BEARER authorization.
+	 * @return The token for BEARER authorization.
-	 * This is provided in a response to the token URL.
-	 * 
-	 * @return An access token.
 	 */
 	default String getBearerToken() {
 		return null;
 	}
 	
 	/**
-	 * This method retrieves the token URL to use for OAuth authorization.
+	 * @return The token URL for OAuth authorization.
-	 * The value can be pulled from OAuth endpoint well-known meta-data.  That
-	 * endpoint or the token URL itself may also be provided OAuth IdP
-	 * administrator.
-	 * 
-	 * @return An OAuth token URL.
 	 */
 	default String getOAuthTokenUrl() {
 		return null;
 	}
 	
 	/**
-	 * This method retrieves the client identifier to use in OAuth
+	 * @return The client ID provided by the OAuth IdP administrator.
-	 * authorization.  This is provided by the OAuth IdP administrator or
-	 * tooling.
-	 * 
-	 * @return A client identifier.
 	 */
 	default String getOAuthClientId() {
 		return this.getClientId();
 	}
 
 	/**
-	 * This method retrieves the client secret to use in OAuth authorization.
+	 * @return The corresponding client secret for the client ID provided by the OAuth IdP administrator.
-	 * This is provided by the OAuth IdP administrator or tooling.
-	 * 
-	 * @return The corresponding client secret for the client identifier.
 	 */
 	default String getOAuthClientSecret() {
 		return this.getClientSecret();
 	}
 	
 	/**
-	 * This method retrieves the authorization code to use in OAuth
+	 * @return The authorization code used in the OAuth Authorization Code flow.
-	 * Authorization Code flow.  This is provided by the OAuth IdP
-	 * administrator or tooling.
-	 * 
-	 * @return An authorization code.
 	 */
 	default String getOAuthAuthCode() {
 		return null;
 	}
 	
 	/**
-	 * This method retrieves the redirect URL to use in OAuth Authorization
+	 * @return The redirect URL used in the OAuth Authorization Code flow.
-	 * Code flow.  This has meaning to the client-side web application.
-	 * 
-	 * @return A URL for the OAuth flow to redirect to when complete.
 	 */
 	default String getOAuthAuthRedirectUri() {
 		return null;
 	}
 	
 	/**
-	 * This method retrieves the username to use in OAuth Password Grant flow.
+	 * @return The username used in the OAuth Password Grant flow.
-	 * This is provided by the OAuth IdP administrator or tooling.
-	 * 
-	 * @return A username.
 	 */
 	default String getOAuthUsername() {
 		return null;
 	}
 	
 	/**
-	 * This method retrieves the password to use in OAuth Password Grant flow.
+	 * @return The corresponding password for the username used in the OAuth Password Grant flow.
-	 * This is provided by the OAuth IdP administrator or tooling.
-	 * 
-	 * @return The corresponding password for the username.
 	 */
 	default String getOAuthPassword() {
 		return null;
@@ -158,22 +120,10 @@ public interface ClientConfiguration {
 	
 	
 	
-	/**
-	 * This method retrieves the connection (before request sent) timeout for
-	 * the client.
-	 * 
-	 * @return A timeout in milliseconds.
-	 */
 	default Integer getConnectTimeoutInMillis() {
 	    return null;
 	}
 	
-	/**
-	 * This method retrieves the response (after request sent) timeout for the
-	 * client.
-	 * 
-	 * @return A timeout in milliseconds.
-	 */
 	default Integer getResponseTimeoutInMillis() {
 	    return null;
 	}
@@ -181,38 +131,29 @@ public interface ClientConfiguration {
 	
 
 	/**
-	 * This method enables/disables the JackSON UNWRAP_ROOT_VALUE feature.
+	 * @return true to enable Jackson UNWRAP_ROOT_VALUE feature; false otherwise.
-	 * 
-	 * @return `true` to enable; `false` otherwise.
 	 */
 	default boolean isUnwrapRootValueEnabled() {
 		return false;
 	}
 
 	/**
-	 * This method enables/disables the JackSON WRAP_ROOT_VALUE feature.
+	 * @return true to enable Jackson WRAP_ROOT_VALUE feature; false otherwise.
-	 * 
-	 * @return `true` to enable; `false` otherwise.
 	 */
 	default boolean isWrapRootValueEnabled() {
 		return false;
 	}
     
     /**
-	 * This method allows sub-classes to extend the JackSON mapper
+     * @param mapper A Jackson object mapper to configure.
-	 * configuration and behavior.
-	 * 
-     * @param mapper A JackSON object mapper.
      */
     default void configureJacksonMapper(ObjectMapper mapper) {
     }
 	
 	/**
-	 * This method allows sub-classes to extend the JackSON JSON provider.
+	 * @param provider A Jackson JAX-RS provider to configure.
-	 * 
-	 * @param provider A JackSON Jakarta RS provider.
 	 */
-	default void configureJacksonProvider(JacksonJsonProvider provider) {
+	default void configureJacksonProvider(JacksonJaxbJsonProvider provider) {
 	}
 	
 	

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

@@ -14,9 +14,7 @@
  */
 package com.inteligr8.rs;
 
-import jakarta.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientRequestContext;
-
-import org.apache.commons.lang3.StringUtils;
 
 /**
  * This class is the base for implementations of client authorization similar
@@ -47,8 +45,8 @@ public class ClientEnforcementAuthorizationFilter implements AuthorizationFilter
 	 * @param clientSecret A secret corresponding to the client ID.
 	 */
 	public ClientEnforcementAuthorizationFilter(String clientId, String clientSecret) {
-		this.clientId = StringUtils.trimToNull(clientId);
+		this.clientId = clientId;
-		this.clientSecret = StringUtils.trimToNull(clientSecret);
+		this.clientSecret = clientSecret;
 	}
 
 	/**

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

@@ -14,18 +14,21 @@
  */
 package com.inteligr8.rs;
 
-import jakarta.annotation.PostConstruct;
+import javax.annotation.PostConstruct;
-import jakarta.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.ClientBuilder;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
 /**
- * A class that provides pre-configured Jakarta RS Client & WebTarget
+ * A class that provides pre-configured JAX-RS Client & WebTarget objects
- * objects.
+ * for Jersey.
  * 
  * @author brian@inteligr8.com
  */
+@Component("client.jaxrs")
 public class ClientImpl extends Client {
 	
 	private final Logger logger = LoggerFactory.getLogger(ClientImpl.class);
@@ -34,30 +37,44 @@ public class ClientImpl extends Client {
 	
 	/**
 	 * This constructor is for Spring or POJO use.
-	 * 
 	 * @param config The client configuration.
 	 */
+	@Autowired
 	public ClientImpl(ClientConfiguration config) {
 		this.config = config;
 	}
 
 	/**
-	 * This method is a placeholder.
+	 * This method registers the Jersey library as the default provider for the
+	 * JAX-RS specification.
 	 */
 	@PostConstruct
 	public void register() {
 		this.logger.info("API Base URL: {}", this.getConfig().getBaseUrl());
 	}
 	
+	/**
+	 * @param clientBuilder A client builder.
+	 */
 	@Override
 	public void buildClient(ClientBuilder clientBuilder) {
 	}
 	
-	@Override
+	/**
+	 * @return The client configuration.
+	 */
 	public ClientConfiguration getConfig() {
 		return this.config;
 	}
 
+	/**
+	 * This method retrieves a JAX-RS implementation of the specified API with
+	 * the specified authorization.
+	 * 
+	 * @param authFilter A dynamic authorization filter.
+	 * @param apiClass A JAX-RS annotation API class.
+	 * @return An instance of the API class.
+	 */
 	@Override
 	public <T> T getApi(AuthorizationFilter authFilter, Class<T> apiClass) {
 		throw new UnsupportedOperationException();

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

@@ -14,8 +14,8 @@
  */
 package com.inteligr8.rs;
 
-import jakarta.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientRequestContext;
-import jakarta.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.HttpHeaders;
 
 /**
  * This class implements a proxied or forwarded authorization header based
@@ -32,8 +32,6 @@ public class ForwardingAuthorizationFilter implements AuthorizationFilter {
 	private final String authorizationHeaderValue;
 	
 	/**
-	 * This constructor instantiates the filter with required fields.
-	 * 
 	 * @param authorizationHeaderValue A previously used or formulated 'Authorization' header.
 	 */
 	public ForwardingAuthorizationFilter(String authorizationHeaderValue) {

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

@@ -1,68 +0,0 @@
-/*
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- * 
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-package com.inteligr8.rs;
-
-import java.io.UnsupportedEncodingException;
-import java.util.List;
-import java.util.Map.Entry;
-
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-
-import jakarta.ws.rs.client.ClientRequestContext;
-
-/**
- * This class implements a header-based authorization filter.
- *  
- * @author brian@inteligr8.com
- */
-public class HeaderAuthorizationFilter implements AuthorizationFilter {
-	
-	private final MultiValueMap<String, Object> headers = new LinkedMultiValueMap<>();
-	
-	/**
-	 * This constructor instantiates the filter with required fields.
-	 * 
-	 * @param headerName A header name.
-	 * @param headerValue A header value.
-	 */
-    public HeaderAuthorizationFilter(String headerName, Object headerValue) {
-	    this.headers.add(headerName, headerValue);
-	}
-    
-	/**
-	 * This method adds another header name/value to outgoing requests.
-	 * 
-	 * @param headerName A header name.
-	 * @param headerValue A header value.
-	 * @return This class for fluent chaining.
-	 */
-    public HeaderAuthorizationFilter add(String headerName, Object headerValue) {
-        this.headers.add(headerName, headerValue);
-        return this;
-    }
-	
-	/**
-	 * This method applies the 'Authorization' header to the {@link ClientRequestContext}.
-	 * 
-	 * @param requestContext A request context.
-	 */
-	@Override
-	public void filter(ClientRequestContext requestContext) throws UnsupportedEncodingException {
-	    for (Entry<String, List<Object>> header : this.headers.entrySet())
-	        requestContext.getHeaders().put(header.getKey(), header.getValue());
-	}
-
-}

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

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

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

@@ -16,11 +16,7 @@ package com.inteligr8.rs;
 
 import java.net.URI;
 
-import jakarta.ws.rs.core.Form;
+import javax.ws.rs.core.Form;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * This class implements the OAuth Authorization Code flow as an authorization
@@ -29,8 +25,6 @@ import org.slf4j.LoggerFactory;
  * @author brian@inteligr8.com
  */
 public class OAuthAuthorizationCodeAuthorizationFilter extends OAuthAuthorizationFilter {
-    
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
 	
 	private final String code;
 	private final URI redirectUri;
@@ -74,13 +68,12 @@ public class OAuthAuthorizationCodeAuthorizationFilter extends OAuthAuthorizatio
 	public OAuthAuthorizationCodeAuthorizationFilter(String tokenUrl, String clientId, String clientSecret, String code, URI redirectUri) {
 		super(tokenUrl, clientId, clientSecret);
 		
-		this.code = StringUtils.trimToNull(code);
+		this.code = code;
 		this.redirectUri = redirectUri;
 	}
 	
 	@Override
 	protected Form createForm() {
-        this.logger.debug("Using OAuth grant_type 'authorization_code'");
 		Form form = new Form().param("grant_type", "authorization_code");
 		if (this.redirectUri != null)
 			form.param("redirect_uri", this.redirectUri.toString());

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

@@ -16,22 +16,21 @@ package com.inteligr8.rs;
 
 import java.util.Map;
 
-import jakarta.ws.rs.WebApplicationException;
+import javax.ws.rs.WebApplicationException;
-import jakarta.ws.rs.client.Client;
+import javax.ws.rs.client.Client;
-import jakarta.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.ClientBuilder;
-import jakarta.ws.rs.client.ClientRequestContext;
+import javax.ws.rs.client.ClientRequestContext;
-import jakarta.ws.rs.client.Entity;
+import javax.ws.rs.client.Entity;
-import jakarta.ws.rs.client.WebTarget;
+import javax.ws.rs.client.WebTarget;
-import jakarta.ws.rs.core.Form;
+import javax.ws.rs.core.Form;
-import jakarta.ws.rs.core.HttpHeaders;
+import javax.ws.rs.core.HttpHeaders;
-import jakarta.ws.rs.core.Response;
+import javax.ws.rs.core.Response;
-import jakarta.ws.rs.core.Response.Status.Family;
+import javax.ws.rs.core.Response.Status.Family;
 
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.fasterxml.jackson.jakarta.rs.json.JacksonJsonProvider;
+import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
 
 /**
  * This class is the base for implementations of OAuth authorization flows.
@@ -89,9 +88,9 @@ public abstract class OAuthAuthorizationFilter implements AuthorizationFilter {
 	 */
 	public OAuthAuthorizationFilter(String tokenUrl, String clientId, String clientSecret, String scope) {
 		this.tokenUrl = tokenUrl;
-		this.clientId = StringUtils.trimToNull(clientId);
+		this.clientId = clientId;
-		this.clientSecret = StringUtils.trimToNull(clientSecret);
+		this.clientSecret = clientSecret;
-		this.scope = StringUtils.trimToNull(scope);
+		this.scope = scope;
 	}
 
 	/**
@@ -159,7 +158,7 @@ public abstract class OAuthAuthorizationFilter implements AuthorizationFilter {
 		Entity<Form> entity = Entity.form(form);
 		
 		Client client = ClientBuilder.newBuilder()
-                .register(new JacksonJsonProvider())
+                .register(new JacksonJaxbJsonProvider())
                 .build();
 		WebTarget target = client.target(this.tokenUrl);
 		

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

@@ -14,10 +14,7 @@
  */
 package com.inteligr8.rs;
 
-import jakarta.ws.rs.core.Form;
+import javax.ws.rs.core.Form;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * This class implements the OAuth Client Credential flow as an authorization
@@ -26,8 +23,6 @@ import org.slf4j.LoggerFactory;
  * @author brian@inteligr8.com
  */
 public class OAuthClientCredentialAuthorizationFilter extends OAuthAuthorizationFilter {
-    
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
 	/**
 	 * @param tokenUrl The URL to the OAuth IdP token service.
@@ -40,7 +35,6 @@ public class OAuthClientCredentialAuthorizationFilter extends OAuthAuthorization
 	
 	@Override
 	protected Form createForm() {
-        this.logger.debug("Using OAuth grant_type 'client_credentials'");
 		return new Form().param("grant_type", "client_credentials");
 	}
 	

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

@@ -14,11 +14,7 @@
  */
 package com.inteligr8.rs;
 
-import jakarta.ws.rs.core.Form;
+import javax.ws.rs.core.Form;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 /**
  * This class implements the OAuth Password Grant flow as an authorization
@@ -27,8 +23,6 @@ import org.slf4j.LoggerFactory;
  * @author brian@inteligr8.com
  */
 public class OAuthPasswordGrantAuthorizationFilter extends OAuthAuthorizationFilter {
-    
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
 	
 	private final String username;
 	private final String password;
@@ -52,13 +46,12 @@ public class OAuthPasswordGrantAuthorizationFilter extends OAuthAuthorizationFil
 	 */
 	public OAuthPasswordGrantAuthorizationFilter(String tokenUrl, String clientId, String clientSecret, String username, String password) {
 		super(tokenUrl, clientId, clientSecret);
-		this.username = StringUtils.trimToNull(username);
+		this.username = username;
-		this.password = StringUtils.trimToNull(password);
+		this.password = password;
 	}
 	
 	@Override
 	protected Form createForm() {
-        this.logger.debug("Using OAuth grant_type 'password': {}", this.username);
 		return new Form().param("grant_type", "password")
 				.param("username", this.username);
 	}

src/main/jersey/com/inteligr8/rs/ClientJerseyConfiguration.java

@@ -0,0 +1,35 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.inteligr8.rs;
+
+/**
+ * This interface defines additional configurations specific to the Jersey
+ * JAX-RS library and its nuances.
+ * 
+ * @author brian@inteligr8.com
+ */
+public interface ClientJerseyConfiguration extends ClientConfiguration {
+	
+	/**
+	 * Jersey is automatically strict in its adherence to the ReST API
+	 * specifications.  It requires a body to PUT calls by default.
+	 * 
+	 * @return true to require body in PUT calls; false to make it optional
+	 */
+	default boolean isPutBodyRequired() {
+		return true;
+	}
+
+}

src/main/jersey/com/inteligr8/rs/ClientJerseyImpl.java

@@ -0,0 +1,105 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.inteligr8.rs;
+
+import javax.annotation.PostConstruct;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.ext.RuntimeDelegate;
+
+import org.glassfish.jersey.client.ClientProperties;
+import org.glassfish.jersey.client.proxy.WebResourceFactory;
+import org.glassfish.jersey.internal.RuntimeDelegateImpl;
+import org.glassfish.jersey.media.multipart.MultiPartFeature;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * A class that provides pre-configured JAX-RS Client &amp; WebTarget objects
+ * for Jersey.
+ * 
+ * @author brian@inteligr8.com
+ */
+@Component("client.jersey")
+public class ClientJerseyImpl extends Client {
+	
+	private final Logger logger = LoggerFactory.getLogger(ClientJerseyImpl.class);
+	
+	private ClientJerseyConfiguration config;
+	
+	/**
+	 * This constructor is for Spring or POJO use.
+	 * @param config The client configuration.
+	 */
+	@Autowired
+	public ClientJerseyImpl(ClientJerseyConfiguration config) {
+		this.config = config;
+	}
+
+	/**
+	 * This method registers the Jersey library as the default provider for the
+	 * JAX-RS specification.
+	 */
+	@PostConstruct
+	public void register() {
+		if (RuntimeDelegate.getInstance() == null) {
+			this.logger.info("Setting JAX-RS runtime delegate to the Jersey library");
+			RuntimeDelegate.setInstance(new RuntimeDelegateImpl());
+		} else if (RuntimeDelegate.getInstance() instanceof RuntimeDelegateImpl) {
+			this.logger.info("JAX-RS runtime delegate already the Jersey library");
+		} else {
+			this.logger.warn("Setting JAX-RS runtime delegate to the Jersey library; was: " + RuntimeDelegate.getInstance().getClass().getName());
+			RuntimeDelegate.setInstance(new RuntimeDelegateImpl());
+		}
+		
+		if (this.logger.isInfoEnabled())
+			this.logger.info("API Base URL: " + this.getConfig().getBaseUrl());
+	}
+	
+	/**
+	 * @param clientBuilder A client builder.
+	 */
+	@Override
+	public void buildClient(ClientBuilder clientBuilder) {
+		clientBuilder.register(MultiPartFeature.class);
+
+		if (!this.getConfig().isPutBodyRequired()) {
+			// allow PUT operations without body data
+			clientBuilder.property(ClientProperties.SUPPRESS_HTTP_COMPLIANCE_VALIDATION, true);
+		}
+	}
+	
+	/**
+	 * @return The client configuration.
+	 */
+	public ClientJerseyConfiguration getConfig() {
+		return this.config;
+	}
+
+	/**
+	 * This method retrieves a JAX-RS implementation of the specified API with
+	 * the specified authorization.
+	 * 
+	 * @param authFilter A dynamic authorization filter.
+	 * @param apiClass A JAX-RS annotation API class.
+	 * @return An instance of the API class.
+	 */
+	@Override
+	public <T> T getApi(AuthorizationFilter authFilter, Class<T> apiClass) {
+		return WebResourceFactory.newResource(apiClass, this.getTarget(authFilter));
+	}
+
+}