forked from loafle/openapi-generator-original
Merge remote-tracking branch 'origin/4.2.x' into 5.0.x
This commit is contained in:
@@ -170,24 +170,14 @@ public class ApiClient {
|
||||
}
|
||||
|
||||
/**
|
||||
* Set HTTP client
|
||||
* Set HTTP client, which must never be null.
|
||||
*
|
||||
* @param newHttpClient An instance of OkHttpClient
|
||||
* @return Api Client
|
||||
* @throws NullPointerException when newHttpClient is null
|
||||
*/
|
||||
public ApiClient setHttpClient(OkHttpClient newHttpClient) {
|
||||
if(!httpClient.equals(newHttpClient)) {
|
||||
OkHttpClient.Builder builder = newHttpClient.newBuilder();
|
||||
Iterator<Interceptor> networkInterceptorIterator = httpClient.networkInterceptors().iterator();
|
||||
while(networkInterceptorIterator.hasNext()) {
|
||||
builder.addNetworkInterceptor(networkInterceptorIterator.next());
|
||||
}
|
||||
Iterator<Interceptor> interceptorIterator = httpClient.interceptors().iterator();
|
||||
while(interceptorIterator.hasNext()) {
|
||||
builder.addInterceptor(interceptorIterator.next());
|
||||
}
|
||||
this.httpClient = builder.build();
|
||||
}
|
||||
this.httpClient = Objects.requireNonNull(newHttpClient, "HttpClient must not be null!");
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user