Skip to content

Commit 191eba4

Browse files
YobynYobyn
authored
replace all UriComponentsBuilder.fromHttpUrl() with UriComponentsBuilder.fromUriString() because UriComponentsBuilder.fromHttpUrl will be removed in the near future. (#20893)
1 parent b1f572e commit 191eba4

File tree

23 files changed

+32
-32
lines changed
  • modules/openapi-generator/src/main/resources/Java/libraries
  • samples/client
    • echo_api/java
    • others/java
      • restclient-useAbstractionForFiles/src/main/java/org/openapitools/client
      • resttemplate-list-schema-validation/src/main/java/org/openapitools/client
      • resttemplate-useAbstractionForFiles/src/main/java/org/openapitools/client
      • webclient-useAbstractionForFiles/src/main/java/org/openapitools/client
    • petstore/java
      • restclient-nullable-arrays/src/main/java/org/openapitools/client
      • restclient-swagger2/src/main/java/org/openapitools/client
      • restclient-useSingleRequestParameter/src/main/java/org/openapitools/client
      • restclient/src/main/java/org/openapitools/client
      • resttemplate-jakarta/src/main/java/org/openapitools/client
      • resttemplate-swagger1/src/main/java/org/openapitools/client
      • resttemplate-swagger2/src/main/java/org/openapitools/client
      • resttemplate-withXml/src/main/java/org/openapitools/client
      • resttemplate/src/main/java/org/openapitools/client
      • webclient-jakarta/src/main/java/org/openapitools/client
      • webclient-nullable-arrays/src/main/java/org/openapitools/client
      • webclient-swagger2/src/main/java/org/openapitools/client
      • webclient-useSingleRequestParameter/src/main/java/org/openapitools/client
      • webclient/src/main/java/org/openapitools/client

23 files changed

+32
-32
lines changed

‎modules/openapi-generator/src/main/resources/Java/libraries/restclient/ApiClient.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -658,7 +658,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
658658
MediaType contentType, String[] authNames) {
659659
updateParamsForAuth(authNames, queryParams, headerParams, cookieParams);
660660
661-
final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(path);
661+
final UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(basePath).path(path);
662662
663663
String finalUri = builder.build(false).toUriString();
664664
Map<String, Object> uriParams = new HashMap<>();

‎modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/ApiClient.mustache‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
754754
finalUri += "?" + queryUri;
755755
}
756756
String expandedPath = this.expandPath(finalUri, uriParams);
757-
final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(expandedPath);
757+
final UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(basePath).path(expandedPath);
758758
759759
URI uri;
760760
try {
@@ -763,7 +763,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
763763
throw new RestClientException("Could not build URL: " + builder.toUriString(), ex);
764764
}
765765
766-
final BodyBuilder requestBuilder = RequestEntity.method(method, UriComponentsBuilder.fromHttpUrl(basePath).toUriString() + finalUri, uriParams);
766+
final BodyBuilder requestBuilder = RequestEntity.method(method, UriComponentsBuilder.fromUriString(basePath).toUriString() + finalUri, uriParams);
767767
if (accept != null) {
768768
requestBuilder.accept(accept.toArray(new MediaType[accept.size()]));
769769
}

‎modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} {
666666
MediaType contentType, String[] authNames) {
667667
updateParamsForAuth(authNames, queryParams, headerParams, cookieParams);
668668
669-
final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(path);
669+
final UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(basePath).path(path);
670670
671671
String finalUri = builder.build(false).toUriString();
672672
Map<String, Object> uriParams = new HashMap<>();

‎samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -612,7 +612,7 @@ private RestClient.RequestBodySpec prepareRequest(String path, HttpMethod method
612612
MediaType contentType, String[] authNames) {
613613
updateParamsForAuth(authNames, queryParams, headerParams, cookieParams);
614614

615-
final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(path);
615+
final UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(basePath).path(path);
616616

617617
String finalUri = builder.build(false).toUriString();
618618
Map<String, Object> uriParams = new HashMap<>();

‎samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<Strin
672672
finalUri += "?" + queryUri;
673673
}
674674
String expandedPath = this.expandPath(finalUri, uriParams);
675-
final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(expandedPath);
675+
final UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(basePath).path(expandedPath);
676676

677677
URI uri;
678678
try {
@@ -681,7 +681,7 @@ public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<Strin
681681
throw new RestClientException("Could not build URL: " + builder.toUriString(), ex);
682682
}
683683

684-
final BodyBuilder requestBuilder = RequestEntity.method(method, UriComponentsBuilder.fromHttpUrl(basePath).toUriString() + finalUri, uriParams);
684+
final BodyBuilder requestBuilder = RequestEntity.method(method, UriComponentsBuilder.fromUriString(basePath).toUriString() + finalUri, uriParams);
685685
if (accept != null) {
686686
requestBuilder.accept(accept.toArray(new MediaType[accept.size()]));
687687
}

‎samples/client/others/java/restclient-useAbstractionForFiles/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ private RestClient.RequestBodySpec prepareRequest(String path, HttpMethod method
610610
MediaType contentType, String[] authNames) {
611611
updateParamsForAuth(authNames, queryParams, headerParams, cookieParams);
612612

613-
final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(path);
613+
final UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(basePath).path(path);
614614

615615
String finalUri = builder.build(false).toUriString();
616616
Map<String, Object> uriParams = new HashMap<>();

‎samples/client/others/java/resttemplate-list-schema-validation/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<Strin
615615
finalUri += "?" + queryUri;
616616
}
617617
String expandedPath = this.expandPath(finalUri, uriParams);
618-
final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(expandedPath);
618+
final UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(basePath).path(expandedPath);
619619

620620
URI uri;
621621
try {
@@ -624,7 +624,7 @@ public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<Strin
624624
throw new RestClientException("Could not build URL: " + builder.toUriString(), ex);
625625
}
626626

627-
final BodyBuilder requestBuilder = RequestEntity.method(method, UriComponentsBuilder.fromHttpUrl(basePath).toUriString() + finalUri, uriParams);
627+
final BodyBuilder requestBuilder = RequestEntity.method(method, UriComponentsBuilder.fromUriString(basePath).toUriString() + finalUri, uriParams);
628628
if (accept != null) {
629629
requestBuilder.accept(accept.toArray(new MediaType[accept.size()]));
630630
}

‎samples/client/others/java/resttemplate-useAbstractionForFiles/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<Strin
615615
finalUri += "?" + queryUri;
616616
}
617617
String expandedPath = this.expandPath(finalUri, uriParams);
618-
final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(expandedPath);
618+
final UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(basePath).path(expandedPath);
619619

620620
URI uri;
621621
try {
@@ -624,7 +624,7 @@ public <T> ResponseEntity<T> invokeAPI(String path, HttpMethod method, Map<Strin
624624
throw new RestClientException("Could not build URL: " + builder.toUriString(), ex);
625625
}
626626

627-
final BodyBuilder requestBuilder = RequestEntity.method(method, UriComponentsBuilder.fromHttpUrl(basePath).toUriString() + finalUri, uriParams);
627+
final BodyBuilder requestBuilder = RequestEntity.method(method, UriComponentsBuilder.fromUriString(basePath).toUriString() + finalUri, uriParams);
628628
if (accept != null) {
629629
requestBuilder.accept(accept.toArray(new MediaType[accept.size()]));
630630
}

‎samples/client/others/java/webclient-useAbstractionForFiles/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -636,7 +636,7 @@ private WebClient.RequestBodySpec prepareRequest(String path, HttpMethod method,
636636
MediaType contentType, String[] authNames) {
637637
updateParamsForAuth(authNames, queryParams, headerParams, cookieParams);
638638

639-
final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(path);
639+
final UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(basePath).path(path);
640640

641641
String finalUri = builder.build(false).toUriString();
642642
Map<String, Object> uriParams = new HashMap<>();

‎samples/client/petstore/java/restclient-nullable-arrays/src/main/java/org/openapitools/client/ApiClient.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ private RestClient.RequestBodySpec prepareRequest(String path, HttpMethod method
610610
MediaType contentType, String[] authNames) {
611611
updateParamsForAuth(authNames, queryParams, headerParams, cookieParams);
612612

613-
final UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(basePath).path(path);
613+
final UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(basePath).path(path);
614614

615615
String finalUri = builder.build(false).toUriString();
616616
Map<String, Object> uriParams = new HashMap<>();

0 commit comments

Comments
 (0)