From 659b00a4f95349c9876206e92176f8547b8eb2f9 Mon Sep 17 00:00:00 2001 From: Yuri Orlov Date: Mon, 5 Apr 2021 15:02:28 +0300 Subject: [PATCH] use standard constant for UTF8 charset in generated java api clients (#7828) --- .../main/resources/Java/libraries/native/ApiClient.mustache | 5 ++--- .../src/main/java/org/openapitools/client/ApiClient.java | 5 ++--- .../src/main/java/org/openapitools/client/ApiClient.java | 5 ++--- .../src/main/java/org/openapitools/client/ApiClient.java | 5 ++--- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/ApiClient.mustache index 4c915fb3f38..095a71939a7 100644 --- a/modules/openapi-generator/src/main/resources/Java/libraries/native/ApiClient.mustache +++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/ApiClient.mustache @@ -16,7 +16,6 @@ import java.net.URLEncoder; import java.net.http.HttpClient; import java.net.http.HttpRequest; import java.net.http.HttpResponse; -import java.nio.charset.Charset; import java.time.Duration; {{#java8}} import java.time.OffsetDateTime; @@ -29,6 +28,8 @@ import java.util.StringJoiner; import java.util.function.Consumer; import java.util.stream.Collectors; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Configuration and utility class for API clients. * @@ -45,8 +46,6 @@ import java.util.stream.Collectors; {{>generatedAnnotation}} public class ApiClient { - private static final Charset UTF_8 = Charset.forName("UTF-8"); - private HttpClient.Builder builder; private ObjectMapper mapper; private String scheme; diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/ApiClient.java index 7a8aa96b42d..98cdbf0646b 100644 --- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/ApiClient.java @@ -25,7 +25,6 @@ import java.net.URLEncoder; import java.net.http.HttpClient; import java.net.http.HttpRequest; import java.net.http.HttpResponse; -import java.nio.charset.Charset; import java.time.Duration; import java.time.OffsetDateTime; import java.time.format.DateTimeFormatter; @@ -36,6 +35,8 @@ import java.util.StringJoiner; import java.util.function.Consumer; import java.util.stream.Collectors; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Configuration and utility class for API clients. * @@ -52,8 +53,6 @@ import java.util.stream.Collectors; @javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ApiClient { - private static final Charset UTF_8 = Charset.forName("UTF-8"); - private HttpClient.Builder builder; private ObjectMapper mapper; private String scheme; diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiClient.java index 7a8aa96b42d..98cdbf0646b 100644 --- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiClient.java @@ -25,7 +25,6 @@ import java.net.URLEncoder; import java.net.http.HttpClient; import java.net.http.HttpRequest; import java.net.http.HttpResponse; -import java.nio.charset.Charset; import java.time.Duration; import java.time.OffsetDateTime; import java.time.format.DateTimeFormatter; @@ -36,6 +35,8 @@ import java.util.StringJoiner; import java.util.function.Consumer; import java.util.stream.Collectors; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Configuration and utility class for API clients. * @@ -52,8 +53,6 @@ import java.util.stream.Collectors; @javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ApiClient { - private static final Charset UTF_8 = Charset.forName("UTF-8"); - private HttpClient.Builder builder; private ObjectMapper mapper; private String scheme; diff --git a/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/ApiClient.java b/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/ApiClient.java index 7a8aa96b42d..98cdbf0646b 100644 --- a/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/ApiClient.java +++ b/samples/openapi3/client/petstore/java/native/src/main/java/org/openapitools/client/ApiClient.java @@ -25,7 +25,6 @@ import java.net.URLEncoder; import java.net.http.HttpClient; import java.net.http.HttpRequest; import java.net.http.HttpResponse; -import java.nio.charset.Charset; import java.time.Duration; import java.time.OffsetDateTime; import java.time.format.DateTimeFormatter; @@ -36,6 +35,8 @@ import java.util.StringJoiner; import java.util.function.Consumer; import java.util.stream.Collectors; +import static java.nio.charset.StandardCharsets.UTF_8; + /** * Configuration and utility class for API clients. * @@ -52,8 +53,6 @@ import java.util.stream.Collectors; @javax.annotation.processing.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ApiClient { - private static final Charset UTF_8 = Charset.forName("UTF-8"); - private HttpClient.Builder builder; private ObjectMapper mapper; private String scheme;