Merge branch 'main' into feature/add_webhooks_implementation

RanjeethKbb · web-flow · commit f6f879ac8db2 · 2025-12-10T16:17:23.000+05:30
diff --git a/boat-scaffold/src/main/templates/boat-java/libraries/resttemplate/ApiClient.mustache b/boat-scaffold/src/main/templates/boat-java/libraries/resttemplate/ApiClient.mustache
@@ -697,7 +697,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()]));
         }

Original file line number	Diff line number	Diff line change
`@@ -697,7 +697,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {`
`697`	`697`	`throw new RestClientException("Could not build URL: " + builder.toUriString(), ex);`
`698`	`698`	`}`
`699`	`699`
`700`		`- final BodyBuilder requestBuilder = RequestEntity.method(method, uri);`
	`700`	`+ final BodyBuilder requestBuilder = RequestEntity.method(method, UriComponentsBuilder.fromHttpUrl(basePath).toUriString() + finalUri, uriParams);`
`701`	`701`	`if (accept != null) {`
`702`	`702`	`requestBuilder.accept(accept.toArray(new MediaType[accept.size()]));`
`703`	`703`	`}`