Compare commits

..
Author SHA1 Message Date
brian.long eb88f0bfbc v3.0.2-jersey pom 2025-02-28 11:27:15 -05:00
brian.long 079e04d386 Merge branch 'stable' into stable-jersey 2025-02-28 11:26:40 -05:00
brian.long d1a4cfdb89 Merge branch 'develop-jersey' into stable-jersey 2025-02-28 11:25:59 -05:00
brian.long eb2bd96ced v3.0.2 pom 2025-02-28 11:12:23 -05:00
brian.long c2147e1461 Merge branch 'develop' into stable 2025-02-28 11:12:03 -05:00
brian.long 63b48b8cbf Merge branch 'develop-jersey' into stable-jersey 2024-08-15 12:04:51 -04:00
brian.long eb7ac34f5e Merge branch 'develop' into stable 2024-08-15 11:52:02 -04:00
brian.long 009bf7bb87 v2.0.10-jersey pom 2024-03-05 18:53:01 -05:00
brian.long b7c8e4479a Merge branch 'develop-jersey' into stable-jersey 2024-03-05 18:52:40 -05:00
brian.long 271016dcf9 v2.0.10 pom 2024-03-05 18:49:07 -05:00
brian.long 00ec8c972d Merge branch 'develop' into stable 2024-03-05 18:47:56 -05:00
brian.long 1b2fbe5413 v2.0.9-jersey pom 2024-01-23 10:45:42 -05:00
brian.long 80990f5335 Merge branch 'develop-jersey' into stable-jersey 2024-01-23 10:45:25 -05:00
brian.long d4cd2f248c v2.0.9 pom 2024-01-23 10:42:51 -05:00
brian.long ac6f82a7f4 Merge branch 'develop' into stable 2024-01-23 10:41:11 -05:00
brian.long a8d2740329 v2.0.8-jersey pom 2023-06-29 10:56:57 -04:00
brian.long 1f50bb8d3f Merge branch 'develop-jersey' into stable-jersey 2023-06-29 10:56:38 -04:00
brian.long 0258cfcb9a v2.0.8 pom 2023-06-29 10:46:39 -04:00
brian.long 6fc43b85f7 Merge branch 'develop' into stable 2023-06-29 10:46:11 -04:00
brian.long 512f118354 v2.0.7 pom 2023-06-12 17:23:23 -04:00
brian.long 7c98ce5545 v2.0.7-jersey pom 2023-06-12 17:19:39 -04:00
brian.long 4c7e9da980 Merge branch 'develop-jersey' into stable-jersey 2023-06-12 17:19:21 -04:00
brian.long 21255bfb3d Merge branch 'develop' into stable 2023-06-12 17:16:33 -04:00
brian.long 518be99d4e v2.0.6-jersey pom 2023-06-12 16:14:51 -04:00
brian.long 2dd7de15a3 Merge branch 'develop-jersey' into stable-jersey 2023-06-12 16:14:16 -04:00
brian.long f10fd39e97 v2.0.6 pom 2023-06-12 16:10:25 -04:00
brian.long eaed628f00 Merge branch 'develop' into stable 2023-06-12 16:08:46 -04:00
brian.long a4a1b3a9e6 v2.0.4-jersey 2023-05-30 18:02:43 -04:00
brian.long 9e3c749f9b Merge branch 'develop-jersey' into stable-jersey 2023-05-30 18:02:14 -04:00
brian.long cd278bcc81 v2.0.4 pom 2023-05-30 18:00:33 -04:00
brian.long b64c408029 Merge branch 'develop' into stable 2023-05-30 18:00:06 -04:00
brian.long 722a04fe16 v2.0.3-jersey 2023-05-30 12:45:35 -04:00
brian.long 1e5fcf6ab8 Merge branch 'develop-jersey' into stable-jersey 2023-05-30 12:45:13 -04:00
brian.long ec6e7cc15d v2.0.3 pom 2023-05-30 12:44:41 -04:00
brian.long 2451c634b7 Merge branch 'develop' into stable 2023-05-30 12:44:21 -04:00
brian.long 5c242d88f1 v2.0.2-jersey pom 2023-05-29 10:17:17 -04:00
brian.long e56152c47b Merge branch 'develop-jersey' into stable-jersey 2023-05-29 10:16:34 -04:00
brian.long ed00346e71 v2.0.2 pom 2023-05-29 10:15:38 -04:00
brian.long c001576b65 Merge branch 'develop' into stable 2023-05-29 10:11:16 -04:00
brian.long 22ab063d4e Merge branch 'develop-jersey' into stable-jersey 2022-10-02 17:58:08 -04:00
brian.long 6cb7afd9f1 Merge branch 'develop' into stable 2022-10-02 17:56:01 -04:00
brian.long 5df5388bd2 Merge branch 'develop' into stable 2022-10-02 17:52:21 -04:00
brian.long 5cda622082 v2.0.1 poms 2022-10-01 21:26:18 -04:00
brian.long e1191abaaa Merge branch 'develop' into stable 2022-10-01 21:25:26 -04:00
brian.long 67ea4b72b3 POM release to v2.0.0 2022-10-01 00:53:17 -04:00
brian.long a574154c20 Merge branch 'develop' into stable 2022-10-01 00:52:53 -04:00
brian.long b1b19d8cb0 Merge branch 'develop' into stable 2022-05-02 18:33:27 -04:00
brian.long 160766e0ef v1.1.6 pom 2022-04-07 23:36:39 -04:00
brian.long e167ac43cc Merge branch 'develop' into stable 2022-04-07 23:36:09 -04:00
brian.long a28fc13161 v1.1.5 pom 2022-03-08 13:32:45 -05:00
brian.long 52c7e3cf6d Merge branch 'develop' into stable 2022-03-08 13:29:28 -05:00
brian.long bd7413bb48 v1.1.4 pom 2022-02-02 13:34:16 -05:00
brian.long 75c518801f Merge branch 'develop' into stable 2022-02-02 13:33:47 -05:00
brian.long b3bc04467b v1.1.3 pom 2021-12-21 17:13:26 -05:00
brian.long 88c8657a34 Merge branch 'develop' into stable 2021-12-21 17:12:58 -05:00
brian.long 28b2478a08 v1.1.2 pom 2021-12-02 16:25:05 -05:00
brian.long dc63abc272 Merge branch 'develop' into stable 2021-12-02 16:20:39 -05:00
brian.long dd5d0f504a Merge branch 'develop' into stable 2021-10-27 14:54:54 -04:00
brian.long 34d03a91e5 Merge branch 'develop' into stable 2021-09-03 12:42:25 -04:00
brian.long 2584b8d668 v1.1.1 pom 2021-09-03 11:38:52 -04:00
brian.long a756b05f6c Merge branch 'develop' into stable 2021-09-03 11:38:22 -04:00
brian.long 853b4e66cf Merge branch 'develop' into stable 2021-09-01 14:43:43 -04:00
brian.long f2032df0f3 Merge branch 'develop' into stable 2021-08-31 13:22:01 -04:00
brian.long 8d3f4559bd v1.0.2 pom 2021-07-22 15:23:15 -04:00
brian.long 3f476bba5c Merge branch 'develop' into stable 2021-07-22 15:22:49 -04:00
brian.long 6292dde23b v1.0.1 pom 2021-07-07 11:07:04 -04:00
brian.long 659f71c72c Merge branch 'develop' into stable 2021-07-07 11:06:35 -04:00
brian.long 52f77dddbb v1.0.0 pom 2021-06-16 15:59:04 -04:00
4 changed files with 53 additions and 48 deletions
+40 -35
View File
@@ -6,7 +6,7 @@
<groupId>com.inteligr8</groupId>
<artifactId>common-rest-client</artifactId>
<version>3.0-SNAPSHOT-jersey</version>
<version>3.0.2-jersey</version>
<packaging>jar</packaging>
<name>ReST API Client for Java</name>
@@ -43,16 +43,17 @@
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<spring.version>6.2.18</spring.version>
<jackson.version>2.21.1</jackson.version>
<jersey.version>4.0.2</jersey.version>
<junit.version>5.12.0</junit.version>
<spring.version>6.0.23</spring.version>
<jackson.version>2.17.3</jackson.version>
<jersey.version>3.1.10</jersey.version>
</properties>
<dependencies>
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
<version>3.0.0</version>
<version>2.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
@@ -77,7 +78,7 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.20.0</version>
<version>3.17.0</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -89,11 +90,10 @@
<artifactId>jakarta.ws.rs-api</artifactId>
<version>3.1.0</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>5.14.3</version>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -140,27 +140,11 @@
</dependencies>
<build>
<pluginManagement>
<plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.5.5</version>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.5.5</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.6.1</version>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
<version>3.4.0</version>
<executions>
<execution>
<id>add-jaxrs-src</id>
@@ -182,12 +166,34 @@
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.4.0</version>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
<version>3.4.0</version>
<dependencies>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.version}</version>
</dependency>
</dependencies>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>central-publish</id>
<id>ossrh-release</id>
<properties>
<maven.deploy.skip>true</maven.deploy.skip>
</properties>
@@ -227,20 +233,19 @@
</executions>
</plugin>
<plugin>
<groupId>org.sonatype.central</groupId>
<artifactId>central-publishing-maven-plugin</artifactId>
<version>0.10.0</version>
<extensions>true</extensions>
<groupId>org.sonatype.plugins</groupId>
<artifactId>nexus-staging-maven-plugin</artifactId>
<version>1.6.14</version>
<configuration>
<publishingServerId>central</publishingServerId>
<autoPublish>true</autoPublish>
<serverId>ossrh</serverId>
<nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
<autoReleaseAfterClose>true</autoReleaseAfterClose>
</configuration>
<!-- for some reason this is required... -->
<executions>
<execution>
<id>deploy</id>
<id>ossrh-deploy</id>
<phase>deploy</phase>
<goals><goal>publish</goal></goals>
<goals><goal>deploy</goal></goals>
</execution>
</executions>
</plugin>
@@ -30,7 +30,7 @@ import jakarta.ws.rs.client.ClientRequestContext;
*/
public class HeaderAuthorizationFilter implements AuthorizationFilter {
private final MultiValueMap<String, Object> headers = new LinkedMultiValueMap<>();
private final MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
/**
* This constructor instantiates the filter with required fields.
@@ -38,7 +38,7 @@ public class HeaderAuthorizationFilter implements AuthorizationFilter {
* @param headerName A header name.
* @param headerValue A header value.
*/
public HeaderAuthorizationFilter(String headerName, Object headerValue) {
public HeaderAuthorizationFilter(String headerName, String headerValue) {
this.headers.add(headerName, headerValue);
}
@@ -49,7 +49,7 @@ public class HeaderAuthorizationFilter implements AuthorizationFilter {
* @param headerValue A header value.
* @return This class for fluent chaining.
*/
public HeaderAuthorizationFilter add(String headerName, Object headerValue) {
public HeaderAuthorizationFilter add(String headerName, String headerValue) {
this.headers.add(headerName, headerValue);
return this;
}
@@ -61,8 +61,8 @@ public class HeaderAuthorizationFilter implements AuthorizationFilter {
*/
@Override
public void filter(ClientRequestContext requestContext) throws UnsupportedEncodingException {
for (Entry<String, List<Object>> header : this.headers.entrySet())
requestContext.getHeaders().put(header.getKey(), header.getValue());
for (Entry<String, List<String>> header : this.headers.entrySet())
requestContext.getHeaders().addAll(header.getKey(), header.getValue());
}
}
@@ -16,7 +16,7 @@ package com.inteligr8.rs;
/**
* This interface defines additional configurations specific to the Jersey
* Jakarta RS library and its nuances.
* JAX-RS library and its nuances.
*
* @author brian@inteligr8.com
*/
@@ -47,17 +47,17 @@ public class ClientJerseyImpl extends Client {
/**
* This method registers the Jersey library as the default provider for the
* Jakarta RS specification.
* JAX-RS specification.
*/
@PostConstruct
public void register() {
if (RuntimeDelegate.getInstance() == null) {
this.logger.info("Setting Jakarta RS runtime delegate to the Jersey library");
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("Jakarta RS runtime delegate already the Jersey library");
this.logger.info("JAX-RS runtime delegate already the Jersey library");
} else {
this.logger.warn("Setting Jakarta RS runtime delegate to the Jersey library; was: " + RuntimeDelegate.getInstance().getClass().getName());
this.logger.warn("Setting JAX-RS runtime delegate to the Jersey library; was: " + RuntimeDelegate.getInstance().getClass().getName());
RuntimeDelegate.setInstance(new RuntimeDelegateImpl());
}
@@ -86,11 +86,11 @@ public class ClientJerseyImpl extends Client {
}
/**
* This method retrieves a Jakarta RS implementation of the specified API
* with the specified authorization.
* This method retrieves a JAX-RS implementation of the specified API with
* the specified authorization.
*
* @param authFilter A dynamic authorization filter.
* @param apiClass A Jakarta RS annotation API class.
* @param apiClass A JAX-RS annotation API class.
* @return An instance of the API class.
*/
@Override