DXE-4485 Merge pull request #57 from akamai/release/6.0.1

Release/6.0.1

Author: mimazaka

CHANGELOG.md

@@ -1,15 +1,23 @@
 # Change log
 
+## 6.0.1 (December 17, 2024)
+
+### Fixes
+
+* Fixed vulnerability by upgrading the `asynchttpclient` module to 3.0.1 .
+* Removed checks in the `AsyncHttpClientEdgeGridRequestSigner` class for the `ReactiveStreamsBodyGenerator` case, which is no longer available in a new version of the `asynchttpclient` module.
+* Fixed some build errors by upgrading the JaCoCo library.
+
 ## 6.0.0 (August 21, 2024)
 
 ### BREAKING CHANGES
 
-* Replaced deprecated `ApacheHttpTransport` with `com.google.api.client.http.apache.v2.ApacheHttpTransport` in `edgegrid-signer-google-http-client`.
-* Updated `README.md` for `edgegrid-signer-google-http-client` to include changes in the instructions for signing HTTP requests with specified client credentials.
+* Replaced the deprecated `ApacheHttpTransport` method with `com.google.api.client.http.apache.v2.ApacheHttpTransport` in the `edgegrid-signer-google-http-client` module.
+* Updated the `README.md` file for the `edgegrid-signer-google-http-client` module to include changes in the instructions for signing HTTP requests with specified client credentials.
 
 ### Improvements
 
-* Add support for `ProxySelector` in `ApacheHttpClientEdgeGridRoutePlanner` to enable the use of custom proxy servers.
+* Added support for `ProxySelector` in the `ApacheHttpClientEdgeGridRoutePlanner` method to enable the use of custom proxy servers.
 
 ### Fixes
 

edgegrid-signer-apache-http-client/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>edgegrid-signer-parent</artifactId>
         <groupId>com.akamai.edgegrid</groupId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

edgegrid-signer-apache-http-client5/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>edgegrid-signer-parent</artifactId>
         <groupId>com.akamai.edgegrid</groupId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

edgegrid-signer-async-http-client/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>edgegrid-signer-parent</artifactId>
         <groupId>com.akamai.edgegrid</groupId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

edgegrid-signer-async-http-client/src/main/java/com/akamai/edgegrid/signer/ahc/AsyncHttpClientEdgeGridRequestSigner.java

@@ -26,7 +26,6 @@
 import org.asynchttpclient.RequestBuilderBase;
 import org.asynchttpclient.request.body.generator.FileBodyGenerator;
 import org.asynchttpclient.request.body.generator.InputStreamBodyGenerator;
-import org.asynchttpclient.request.body.generator.ReactiveStreamsBodyGenerator;
 import org.asynchttpclient.uri.Uri;
 
 import java.net.URI;
@@ -112,8 +111,6 @@ private byte[] serializeBody(Request request) {
             throw new UnsupportedOperationException("Serializing FileBodyGenerator in request body is not supported");
         } else if (request.getBodyGenerator() instanceof InputStreamBodyGenerator) {
             throw new UnsupportedOperationException("Serializing InputStreamBodyGenerator in request body is not supported");
-        } else if (request.getBodyGenerator() instanceof ReactiveStreamsBodyGenerator) {
-            throw new UnsupportedOperationException("Serializing ReactiveStreamsBodyGenerator in request body is not supported");
         } else if (request.getBodyGenerator() != null) {
             throw new UnsupportedOperationException("Serializing generic BodyGenerator in request body is not supported");
         } else {

edgegrid-signer-async-http-client/src/test/java/com/akamai/edgegrid/signer/ahc/AsyncHttpClientEdgeGridSignatureCalculatorTest.java

@@ -43,7 +43,7 @@ public void testCalculateAndAddSignatureForGet(Request request) throws Exception
             .host("endpoint.net")
             .build();
 
-        RequestBuilder requestToUpdate = new RequestBuilder(request);
+        RequestBuilder requestToUpdate = new RequestBuilder(request.toString());
         new AsyncHttpClientEdgeGridSignatureCalculator(credential).calculateAndAddSignature(
             request, requestToUpdate);
         Request updatedRequest = requestToUpdate.build();
@@ -65,7 +65,7 @@ public void testPreservingQueryString() throws Exception {
             .build();
 
         Request request = new RequestBuilder().setUrl("http://localhost/test?x=y").build();
-        RequestBuilder requestToUpdate = new RequestBuilder(request);
+        RequestBuilder requestToUpdate = new RequestBuilder(request.toString());
 
         new AsyncHttpClientEdgeGridSignatureCalculator(credential).calculateAndAddSignature(
             request, requestToUpdate);
@@ -86,7 +86,7 @@ public void testNotDuplicatingQueryString() throws Exception {
             .build();
 
         Request request = new RequestBuilder().setUrl("http://localhost/test").addQueryParam("x", "y").build();
-        RequestBuilder requestToUpdate = new RequestBuilder(request);
+        RequestBuilder requestToUpdate = new RequestBuilder(request.toString());
 
         new AsyncHttpClientEdgeGridSignatureCalculator(credential).calculateAndAddSignature(
             request, requestToUpdate);

edgegrid-signer-core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>edgegrid-signer-parent</artifactId>
         <groupId>com.akamai.edgegrid</groupId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
     </parent>
 
     <artifactId>edgegrid-signer-core</artifactId>

edgegrid-signer-google-http-client/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>edgegrid-signer-parent</artifactId>
         <groupId>com.akamai.edgegrid</groupId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
     </parent>
 
     <artifactId>edgegrid-signer-google-http-client</artifactId>

edgegrid-signer-rest-assured/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <artifactId>edgegrid-signer-parent</artifactId>
         <groupId>com.akamai.edgegrid</groupId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
     </parent>
 
     <artifactId>edgegrid-signer-rest-assured</artifactId>

edgerc-reader/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>edgegrid-signer-parent</artifactId>
         <groupId>com.akamai.edgegrid</groupId>
-        <version>6.0.0</version>
+        <version>6.0.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>