Merge remote-tracking branch 'origin/main' into test-nextlink-url-query-parameters

Author: newtork

README.md

@@ -3,7 +3,7 @@
 ![build](https://github.com/SAP/cloud-sdk-java/actions/workflows/continuous-integration.yaml/badge.svg?branch=main)
 [![REUSE status](https://api.reuse.software/badge/github.com/SAP/cloud-sdk-java)](https://api.reuse.software/info/github.com/SAP/cloud-sdk-java)
 [![Fosstars security rating](https://github.com/SAP/cloud-sdk-java/blob/fosstars-report/fosstars_badge.svg)](https://github.com/SAP/cloud-sdk-java/blob/fosstars-report/fosstars_report.md)
-[![Maven Central](https://img.shields.io/badge/maven_central-5.18.0-blue.svg)](https://search.maven.org/search?q=g:com.sap.cloud.sdk%20AND%20a:sdk-core%20AND%20v:5.18.0)
+[![Maven Central](https://img.shields.io/badge/maven_central-5.19.0-blue.svg)](https://search.maven.org/search?q=g:com.sap.cloud.sdk%20AND%20a:sdk-core%20AND%20v:5.19.0)
 
 # SAP Cloud SDK for Java
 

archetypes/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk</groupId>
 		<artifactId>sdk-parent</artifactId>
-		<version>5.19.0-SNAPSHOT</version>
+		<version>5.20.0-SNAPSHOT</version>
 	</parent>
 	<groupId>com.sap.cloud.sdk.archetypes</groupId>
 	<artifactId>archetypes-parent</artifactId>

archetypes/spring-boot3/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.archetypes</groupId>
 		<artifactId>archetypes-parent</artifactId>
-		<version>5.19.0-SNAPSHOT</version>
+		<version>5.20.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>spring-boot3</artifactId>
 	<packaging>maven-archetype</packaging>

archetypes/spring-boot3/src/main/resources/archetype-resources/pom.xml

@@ -15,7 +15,7 @@
         <spring-boot.version>3.3.0</spring-boot.version>
 
         <java.version>17</java.version>
-        <cloud-sdk.version>5.19.0-SNAPSHOT</cloud-sdk.version>
+        <cloud-sdk.version>5.20.0-SNAPSHOT</cloud-sdk.version>
 
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>

cloudplatform/caching/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.19.0-SNAPSHOT</version>
+		<version>5.20.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>caching</artifactId>
 	<name>Business Technology Platform - Caching</name>

cloudplatform/cloudplatform-connectivity-scp-cf/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.19.0-SNAPSHOT</version>
+		<version>5.20.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>cloudplatform-connectivity-scp-cf</artifactId>
 	<name>(Deprecated) Cloud Platform - Connectivity SAP BTP Cloud Foundry</name>

cloudplatform/cloudplatform-connectivity/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.19.0-SNAPSHOT</version>
+		<version>5.20.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>cloudplatform-connectivity</artifactId>
 	<name>Business Technology Platform - Connectivity</name>

cloudplatform/cloudplatform-core/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.19.0-SNAPSHOT</version>
+		<version>5.20.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>cloudplatform-core</artifactId>
 	<name>Cloud Platform - Core</name>

cloudplatform/connectivity-apache-httpclient4/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.sap.cloud.sdk.cloudplatform</groupId>
 		<artifactId>cloudplatform-parent</artifactId>
-		<version>5.19.0-SNAPSHOT</version>
+		<version>5.20.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>connectivity-apache-httpclient4</artifactId>
 	<name>Connectivity - Apache HTTP Client 4</name>

cloudplatform/connectivity-apache-httpclient4/src/main/java/com/sap/cloud/sdk/cloudplatform/connectivity/HttpClientWrapper.java

@@ -31,7 +31,7 @@
  * and it will append the url configured in the destination.
  */
 @Slf4j
-class HttpClientWrapper extends CloseableHttpClient
+class HttpClientWrapper extends CloseableHttpClient implements UriQueryMerger
 {
     private final CloseableHttpClient httpClient;
     @Getter( AccessLevel.PACKAGE )
@@ -107,15 +107,20 @@ HttpClientWrapper withDestination( final HttpDestinationProperties destination )
         return new HttpClientWrapper(httpClient, destination);
     }
 
-    HttpUriRequest wrapRequest( final HttpUriRequest request )
+    @Nonnull
+    public URI mergeRequestUri( @Nonnull final URI requestUri )
     {
         final UriPathMerger merger = new UriPathMerger();
-        URI requestUri = merger.merge(destination.getUri(), request.getURI());
+        final URI mergedUri = merger.merge(destination.getUri(), requestUri);
 
         final String queryString = Joiner.on("&").join(QueryParamGetter.getQueryParameters(destination));
-        requestUri = merger.merge(requestUri, URI.create("/?" + queryString));
+        return merger.merge(mergedUri, URI.create("/?" + queryString));
+    }
 
+    HttpUriRequest wrapRequest( final HttpUriRequest request )
+    {
         final RequestBuilder requestBuilder = RequestBuilder.copy(request);
+        final URI requestUri = mergeRequestUri(request.getURI());
         requestBuilder.setUri(requestUri);
 
         for( final Header header : destination.getHeaders(requestUri) ) {