From 38b49e77af1aab18ab31fe000f5ecdbac926f76f Mon Sep 17 00:00:00 2001 From: tomred-net Date: Sat, 27 Mar 2021 15:01:39 +1300 Subject: [PATCH] fix #8755 [BUG] Java (jersey2) ApiClient debug cannot be enabled (#8756) * fix #8755 [BUG] Java (jersey2) ApiClient debug cannot be enabled * fix #8755 updating samples --- .../resources/Java/libraries/jersey2/ApiClient.mustache | 6 ++---- .../src/main/java/org/openapitools/client/ApiClient.java | 6 ++---- .../src/main/java/org/openapitools/client/ApiClient.java | 6 ++---- .../src/main/java/org/openapitools/client/ApiClient.java | 6 ++---- .../src/main/java/org/openapitools/client/ApiClient.java | 6 ++---- .../src/main/java/org/openapitools/client/ApiClient.java | 6 ++---- 6 files changed, 12 insertions(+), 24 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache index d12dec1bbdb..65494e8ea04 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/ApiClient.mustache @@ -1229,10 +1229,8 @@ public class ApiClient{{#jsr310}} extends JavaTimeFormatter{{/jsr310}} { * @return Client */ protected Client buildHttpClient() { - // use the default client config if not yet initialized - if (clientConfig == null) { - clientConfig = getDefaultClientConfig(); - } + // recreate the client config to pickup changes + clientConfig = getDefaultClientConfig(); ClientBuilder clientBuilder = ClientBuilder.newBuilder(); customizeClientBuilder(clientBuilder); diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/ApiClient.java index 4d67e498c9b..32fedf9b732 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/ApiClient.java @@ -1143,10 +1143,8 @@ public class ApiClient extends JavaTimeFormatter { * @return Client */ protected Client buildHttpClient() { - // use the default client config if not yet initialized - if (clientConfig == null) { - clientConfig = getDefaultClientConfig(); - } + // recreate the client config to pickup changes + clientConfig = getDefaultClientConfig(); ClientBuilder clientBuilder = ClientBuilder.newBuilder(); customizeClientBuilder(clientBuilder); diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java index 4d67e498c9b..32fedf9b732 100644 --- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java @@ -1143,10 +1143,8 @@ public class ApiClient extends JavaTimeFormatter { * @return Client */ protected Client buildHttpClient() { - // use the default client config if not yet initialized - if (clientConfig == null) { - clientConfig = getDefaultClientConfig(); - } + // recreate the client config to pickup changes + clientConfig = getDefaultClientConfig(); ClientBuilder clientBuilder = ClientBuilder.newBuilder(); customizeClientBuilder(clientBuilder); diff --git a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java index 5c32cf83c42..6162256fc17 100644 --- a/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/openapi3/client/extensions/x-auth-id-alias/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java @@ -1063,10 +1063,8 @@ public class ApiClient extends JavaTimeFormatter { * @return Client */ protected Client buildHttpClient() { - // use the default client config if not yet initialized - if (clientConfig == null) { - clientConfig = getDefaultClientConfig(); - } + // recreate the client config to pickup changes + clientConfig = getDefaultClientConfig(); ClientBuilder clientBuilder = ClientBuilder.newBuilder(); customizeClientBuilder(clientBuilder); diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/ApiClient.java b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/ApiClient.java index e595c163345..543f834a5d8 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/src/main/java/org/openapitools/client/ApiClient.java @@ -1008,10 +1008,8 @@ public class ApiClient extends JavaTimeFormatter { * @return Client */ protected Client buildHttpClient() { - // use the default client config if not yet initialized - if (clientConfig == null) { - clientConfig = getDefaultClientConfig(); - } + // recreate the client config to pickup changes + clientConfig = getDefaultClientConfig(); ClientBuilder clientBuilder = ClientBuilder.newBuilder(); customizeClientBuilder(clientBuilder); diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java index 3f5a66745bf..266cd2c6d5a 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/ApiClient.java @@ -1227,10 +1227,8 @@ public class ApiClient extends JavaTimeFormatter { * @return Client */ protected Client buildHttpClient() { - // use the default client config if not yet initialized - if (clientConfig == null) { - clientConfig = getDefaultClientConfig(); - } + // recreate the client config to pickup changes + clientConfig = getDefaultClientConfig(); ClientBuilder clientBuilder = ClientBuilder.newBuilder(); customizeClientBuilder(clientBuilder);