3333import org .springframework .web .reactive .function .client .ExchangeStrategies ;
3434import reactor .core .publisher .Mono ;
3535import reactor .core .publisher .Flux ;
36+ import java .util .Optional ;
3637
3738import java .io .BufferedReader ;
3839import java .io .IOException ;
@@ -76,7 +77,7 @@ private String collectionToString(Collection<? extends CharSequence> collection)
7677 }
7778
7879 private HttpHeaders defaultHeaders = new HttpHeaders ();
79-
80+
8081 private String basePath = "http://localhost:8090" ;
8182
8283 private final WebClient webClient ;
@@ -87,24 +88,30 @@ private String collectionToString(Collection<? extends CharSequence> collection)
8788
8889 public ApiClient () {
8990 this .dateFormat = createDefaultDateFormat ();
90- this .webClient = buildWebClient (new ObjectMapper (), this .dateFormat );
91+ this .webClient = buildWebClient (new ObjectMapper (), dateFormat );
92+ this .init ();
9193 }
9294
9395 public ApiClient (ObjectMapper mapper , DateFormat format ) {
9496 this (buildWebClient (mapper .copy (), format ), format );
9597 }
9698
99+ public ApiClient (WebClient webClient , ObjectMapper mapper , DateFormat format ) {
100+ this (Optional .ofNullable (webClient ).orElseGet (() ->buildWebClient (mapper .copy (), format )), format );
101+ }
102+
97103 private ApiClient (WebClient webClient , DateFormat format ) {
98104 this .webClient = webClient ;
99105 this .dateFormat = format ;
106+ this .init ();
100107 }
101108
102109 public DateFormat createDefaultDateFormat () {
103110 DateFormat dateFormat = new RFC3339DateFormat ();
104111 dateFormat .setTimeZone (TimeZone .getTimeZone ("UTC" ));
105112 return dateFormat ;
106113 }
107-
114+
108115 protected void init () {
109116 // Setup authentications (key: authentication name, value: authentication).
110117 authentications = new HashMap <String , Authentication >();
@@ -129,7 +136,7 @@ public static WebClient buildWebClient(ObjectMapper mapper, DateFormat dateForma
129136 return webClient .build ();
130137 }
131138
132-
139+
133140 /**
134141 * Get the current base path
135142 * @return String the base path
@@ -582,7 +589,7 @@ private void updateParamsForAuth(String[] authNames, MultiValueMap<String, Strin
582589 auth .applyToParams (queryParams , headerParams );
583590 }
584591 }
585-
592+
586593 private class ApiClientHttpRequestInterceptor implements ClientHttpRequestInterceptor {
587594 private final Log log = LogFactory .getLog (ApiClientHttpRequestInterceptor .class );
588595
@@ -621,7 +628,7 @@ private String headersToString(HttpHeaders headers) {
621628 builder .setLength (builder .length () - 1 ); // Get rid of trailing comma
622629 return builder .toString ();
623630 }
624-
631+
625632 private String bodyToString (InputStream body ) throws IOException {
626633 StringBuilder builder = new StringBuilder ();
627634 BufferedReader bufferedReader = new BufferedReader (new InputStreamReader (body , StandardCharsets .UTF_8 ));
0 commit comments