From fb2c866dfc39d0de25f86bab6025e63130bf39ff Mon Sep 17 00:00:00 2001 From: William Cheng Date: Sat, 22 Jul 2023 16:44:29 +0800 Subject: [PATCH] Revert "fix(java): plus url encoding (#15539)" (#16158) This reverts commit d000f90759202967ad5d719e5031307f486bf6fb. --- .../src/main/resources/Java/libraries/native/ApiClient.mustache | 2 +- .../org/openapitools/codegen/java/JavaClientCodegenTest.java | 2 +- .../src/main/java/org/openapitools/client/ApiClient.java | 2 +- .../native/src/main/java/org/openapitools/client/ApiClient.java | 2 +- 4 files changed, 4 insertions(+), 4 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 ee22f4a22c2..14add046a0b 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 @@ -74,7 +74,7 @@ public class ApiClient { * @return URL-encoded representation of the input string. */ public static String urlEncode(String s) { - return URLEncoder.encode(s, UTF_8).replaceAll("\\+", "%2B"); + return URLEncoder.encode(s, UTF_8).replaceAll("\\+", "%20"); } /** diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java index 79db84f94bf..e96bb15fd5e 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaClientCodegenTest.java @@ -1359,7 +1359,7 @@ public class JavaClientCodegenTest { validateJavaSourceFiles(files); TestUtils.assertFileContains(Paths.get(output + "/src/main/java/xyz/abcdef/ApiClient.java"), - "public static String urlEncode(String s) { return URLEncoder.encode(s, UTF_8).replaceAll(\"\\\\+\", \"%2B\"); }"); + "public static String urlEncode(String s) { return URLEncoder.encode(s, UTF_8).replaceAll(\"\\\\+\", \"%20\"); }"); } /** 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 3fce30ef91c..7229635a0fd 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 @@ -83,7 +83,7 @@ public class ApiClient { * @return URL-encoded representation of the input string. */ public static String urlEncode(String s) { - return URLEncoder.encode(s, UTF_8).replaceAll("\\+", "%2B"); + return URLEncoder.encode(s, UTF_8).replaceAll("\\+", "%20"); } /** 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 3fce30ef91c..7229635a0fd 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 @@ -83,7 +83,7 @@ public class ApiClient { * @return URL-encoded representation of the input string. */ public static String urlEncode(String s) { - return URLEncoder.encode(s, UTF_8).replaceAll("\\+", "%2B"); + return URLEncoder.encode(s, UTF_8).replaceAll("\\+", "%20"); } /**