From de593e8e93ea5644f7971d3f77e723440e3050c7 Mon Sep 17 00:00:00 2001 From: Marco Reni Date: Thu, 23 Aug 2018 09:40:19 +0200 Subject: [PATCH 1/3] Call init method during client instanciation to init authentications --- .../resources/Java/libraries/webclient/ApiClient.mustache | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache index 28260368a9b3..d655eb0fa1a6 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache @@ -86,8 +86,9 @@ public class ApiClient { public ApiClient() { - this.dateFormat = createDefaultDateFormat(); - this.webClient = buildWebClient(new ObjectMapper(), this.dateFormat); + DateFormat dateFormat = createDefaultDateFormat(); + + this(buildWebClient(new ObjectMapper(), dateFormat), dateFormat); } public ApiClient(ObjectMapper mapper, DateFormat format) { @@ -97,6 +98,8 @@ public class ApiClient { private ApiClient(WebClient webClient, DateFormat format) { this.webClient = webClient; this.dateFormat = format; + + init(); } public DateFormat createDefaultDateFormat() { From 95445c9d9c8e1278ba1d77a519d950fbb9a7317e Mon Sep 17 00:00:00 2001 From: Marco Reni Date: Thu, 23 Aug 2018 14:05:59 +0200 Subject: [PATCH 2/3] Codestyle and updated sample --- .../resources/Java/libraries/webclient/ApiClient.mustache | 2 +- .../src/main/java/org/openapitools/client/ApiClient.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache index d655eb0fa1a6..8cfd492f155f 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache @@ -87,7 +87,7 @@ public class ApiClient { public ApiClient() { DateFormat dateFormat = createDefaultDateFormat(); - + this(buildWebClient(new ObjectMapper(), dateFormat), dateFormat); } diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/ApiClient.java index ee1885811e6f..b44c91e694d6 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/ApiClient.java @@ -86,8 +86,9 @@ private String collectionToString(Collection collection) public ApiClient() { - this.dateFormat = createDefaultDateFormat(); - this.webClient = buildWebClient(new ObjectMapper(), this.dateFormat); + DateFormat dateFormat = createDefaultDateFormat(); + + this(buildWebClient(new ObjectMapper(), dateFormat), dateFormat); } public ApiClient(ObjectMapper mapper, DateFormat format) { @@ -97,6 +98,8 @@ public ApiClient(ObjectMapper mapper, DateFormat format) { private ApiClient(WebClient webClient, DateFormat format) { this.webClient = webClient; this.dateFormat = format; + + init(); } public DateFormat createDefaultDateFormat() { From 9f8f6a34e340c791976c1a549eeec28d34f3fa77 Mon Sep 17 00:00:00 2001 From: Marco Reni Date: Thu, 23 Aug 2018 17:51:30 +0200 Subject: [PATCH 3/3] Fix --- .../resources/Java/libraries/webclient/ApiClient.mustache | 5 +++-- .../src/main/java/org/openapitools/client/ApiClient.java | 7 ++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache index 8cfd492f155f..fe3c172a6297 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/ApiClient.mustache @@ -86,9 +86,10 @@ public class ApiClient { public ApiClient() { - DateFormat dateFormat = createDefaultDateFormat(); + this.dateFormat = createDefaultDateFormat(); + this.webClient = buildWebClient(new ObjectMapper(), this.dateFormat); - this(buildWebClient(new ObjectMapper(), dateFormat), dateFormat); + init(); } public ApiClient(ObjectMapper mapper, DateFormat format) { diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/ApiClient.java index b44c91e694d6..88b883f366b4 100644 --- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/ApiClient.java @@ -86,9 +86,10 @@ private String collectionToString(Collection collection) public ApiClient() { - DateFormat dateFormat = createDefaultDateFormat(); - - this(buildWebClient(new ObjectMapper(), dateFormat), dateFormat); + this.dateFormat = createDefaultDateFormat(); + this.webClient = buildWebClient(new ObjectMapper(), this.dateFormat); + + init(); } public ApiClient(ObjectMapper mapper, DateFormat format) {