[BUG][JAVA][restTemplate] ApiClient is not compatible with spring-web…

… 6 Observation API (#15421) * ApiClient is not compatible with spring-web 6 Observation API. Field uri is never filled * Update samples
OpenAPITools · May 9, 2023 · fb059c2 · fb059c2
1 parent 3cf646c
commit fb059c2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache
@@ -696,7 +696,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
             throw new RestClientException("Could not build URL: " + builder.toUriString(), ex);
         }
 
-        final BodyBuilder requestBuilder = RequestEntity.method(method, uri);
+        final BodyBuilder requestBuilder = RequestEntity.method(method, UriComponentsBuilder.fromHttpUrl(basePath).toUriString() + finalUri, uriParams);
         if (accept != null) {
             requestBuilder.accept(accept.toArray(new MediaType[accept.size()]));
         }

diff --git a/...t/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/ApiClient.java b/...t/petstore/java/resttemplate-jakarta/src/main/java/org/openapitools/client/ApiClient.java
@@ -613,7 +613,7 @@ public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<Strin
             throw new RestClientException("Could not build URL: " + builder.toUriString(), ex);
         }
 
-        final BodyBuilder requestBuilder = RequestEntity.method(method, uri);
+        final BodyBuilder requestBuilder = RequestEntity.method(method, UriComponentsBuilder.fromHttpUrl(basePath).toUriString() + finalUri, uriParams);
         if (accept != null) {
             requestBuilder.accept(accept.toArray(new MediaType[accept.size()]));
         }

diff --git a/.../petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/ApiClient.java b/.../petstore/java/resttemplate-swagger1/src/main/java/org/openapitools/client/ApiClient.java
@@ -613,7 +613,7 @@ public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<Strin
             throw new RestClientException("Could not build URL: " + builder.toUriString(), ex);
         }
 
-        final BodyBuilder requestBuilder = RequestEntity.method(method, uri);
+        final BodyBuilder requestBuilder = RequestEntity.method(method, UriComponentsBuilder.fromHttpUrl(basePath).toUriString() + finalUri, uriParams);
         if (accept != null) {
             requestBuilder.accept(accept.toArray(new MediaType[accept.size()]));
         }

diff --git a/...t/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java b/...t/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/ApiClient.java
@@ -650,7 +650,7 @@ public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<Strin
             throw new RestClientException("Could not build URL: " + builder.toUriString(), ex);
         }
 
-        final BodyBuilder requestBuilder = RequestEntity.method(method, uri);
+        final BodyBuilder requestBuilder = RequestEntity.method(method, UriComponentsBuilder.fromHttpUrl(basePath).toUriString() + finalUri, uriParams);
         if (accept != null) {
             requestBuilder.accept(accept.toArray(new MediaType[accept.size()]));
         }

diff --git a/...es/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java b/...es/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java
@@ -645,7 +645,7 @@ public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<Strin
             throw new RestClientException("Could not build URL: " + builder.toUriString(), ex);
         }
 
-        final BodyBuilder requestBuilder = RequestEntity.method(method, uri);
+        final BodyBuilder requestBuilder = RequestEntity.method(method, UriComponentsBuilder.fromHttpUrl(basePath).toUriString() + finalUri, uriParams);
         if (accept != null) {
             requestBuilder.accept(accept.toArray(new MediaType[accept.size()]));
         }