Escape query params before invoking api (#5023)

nmuesch · wing328 · commit 2722c602acf7 · 2020-01-18T17:25:18.000+08:00
* Escape query params before invoking api

* Update petstore file

* Update remaining petstore examples
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
@@ -694,7 +694,7 @@ public class ApiClient {
     if (queryParams != null) {
       for (Pair queryParam : queryParams) {
         if (queryParam.getValue() != null) {
-          target = target.queryParam(queryParam.getName(), queryParam.getValue());
+          target = target.queryParam(queryParam.getName(), escapeString(queryParam.getValue()));
         }
       }
     }
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/ApiClient.java
@@ -678,7 +678,7 @@ public <T> ApiResponse<T> invokeAPI(String path, String method, List<Pair> query
     if (queryParams != null) {
       for (Pair queryParam : queryParams) {
         if (queryParam.getValue() != null) {
-          target = target.queryParam(queryParam.getName(), queryParam.getValue());
+          target = target.queryParam(queryParam.getName(), escapeString(queryParam.getValue()));
         }
       }
     }
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
@@ -678,7 +678,7 @@ public <T> ApiResponse<T> invokeAPI(String path, String method, List<Pair> query
     if (queryParams != null) {
       for (Pair queryParam : queryParams) {
         if (queryParam.getValue() != null) {
-          target = target.queryParam(queryParam.getName(), queryParam.getValue());
+          target = target.queryParam(queryParam.getName(), escapeString(queryParam.getValue()));
         }
       }
     }
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/ApiClient.java
@@ -678,7 +678,7 @@ public <T> ApiResponse<T> invokeAPI(String path, String method, List<Pair> query
     if (queryParams != null) {
       for (Pair queryParam : queryParams) {
         if (queryParam.getValue() != null) {
-          target = target.queryParam(queryParam.getName(), queryParam.getValue());
+          target = target.queryParam(queryParam.getName(), escapeString(queryParam.getValue()));
         }
       }
     }

Original file line number	Diff line number	Diff line change
`@@ -694,7 +694,7 @@ public class ApiClient {`
`694`	`694`	`if (queryParams != null) {`
`695`	`695`	`for (Pair queryParam : queryParams) {`
`696`	`696`	`if (queryParam.getValue() != null) {`
`697`		`- target = target.queryParam(queryParam.getName(), queryParam.getValue());`
	`697`	`+ target = target.queryParam(queryParam.getName(), escapeString(queryParam.getValue()));`
`698`	`698`	`}`
`699`	`699`	`}`
`700`	`700`	`}`
Original file line number	Diff line number	Diff line change
`@@ -678,7 +678,7 @@ public <T> ApiResponse<T> invokeAPI(String path, String method, List<Pair> query`
`678`	`678`	`if (queryParams != null) {`
`679`	`679`	`for (Pair queryParam : queryParams) {`
`680`	`680`	`if (queryParam.getValue() != null) {`
`681`		`- target = target.queryParam(queryParam.getName(), queryParam.getValue());`
	`681`	`+ target = target.queryParam(queryParam.getName(), escapeString(queryParam.getValue()));`
`682`	`682`	`}`
`683`	`683`	`}`
`684`	`684`	`}`