loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Renamed QueryParam to Pair class in Java templates.

Browse Source
This commit is contained in:
Raghav Sidhanti
2015-06-22 15:16:45 -07:00
parent 7a9a41fe01
commit ecddfb7ccf
19 changed files with 78 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache
View File

@@ -241,10 +241,10 @@ public class ApiClient {
}
/*
Format to {@code QueryParam} objects.
Format to {@code Pair} objects.
*/
public Set<QueryParam> parameterToQueryParams(String collectionFormat, String name, Object value){
Set<QueryParam> params = new HashSet<QueryParam>();
public Set<Pair> parameterToQueryParams(String collectionFormat, String name, Object value){
Set<Pair> params = new HashSet<Pair>();
// preconditions
if (name == null || name.isEmpty() || value == null) return params;
@@ -255,7 +255,7 @@ public class ApiClient {
}
if (valueCollection == null) {
params.add(new QueryParam(name, String.valueOf(value)));
params.add(new Pair(name, String.valueOf(value)));
return params;
} else if (valueCollection.isEmpty()) {
return params;
@@ -264,10 +264,10 @@ public class ApiClient {
collectionFormat = (collectionFormat == null || collectionFormat.isEmpty() ? "csv" : collectionFormat); // default: csv
if (collectionFormat.equals("csv")) {
params.add(new QueryParam(name, parameterToString(value)));
params.add(new Pair(name, parameterToString(value)));
} else if (collectionFormat.equals("multi")) {
for (String item : valueCollection) {
params.add(new QueryParam(name, item));
params.add(new Pair(name, item));
}
} else if (collectionFormat.equals("ssv")) {
StringBuilder sb = new StringBuilder() ;
@@ -275,21 +275,21 @@ public class ApiClient {
sb.append(" ");
sb.append(item);
}
params.add(new QueryParam(name, sb.substring(1)));
params.add(new Pair(name, sb.substring(1)));
} else if (collectionFormat.equals("tsv")) {
StringBuilder sb = new StringBuilder() ;
for (String item : valueCollection) {
sb.append("\t");
sb.append(item);
}
params.add(new QueryParam(name, sb.substring(1)));
params.add(new Pair(name, sb.substring(1)));
} else if (collectionFormat.equals("pipes")) {
StringBuilder sb = new StringBuilder() ;
for (String item : valueCollection) {
sb.append("|");
sb.append(item);
}
params.add(new QueryParam(name, sb.substring(1)));
params.add(new Pair(name, sb.substring(1)));
}
return params;
@@ -398,7 +398,7 @@ public class ApiClient {
* @param authNames The authentications to apply
* @return The response body in type of string
*/
public String invokeAPI(String path, String method, Set<QueryParam> queryParams, Object body, Map<String, String> headerParams, Map<String, String> formParams, String accept, String contentType, String[] authNames) throws ApiException {
public String invokeAPI(String path, String method, Set<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, String> formParams, String accept, String contentType, String[] authNames) throws ApiException {
updateParamsForAuth(authNames, queryParams, headerParams);
Client client = getClient();
@@ -406,7 +406,7 @@ public class ApiClient {
StringBuilder b = new StringBuilder();
b.append("?");
if (queryParams != null){
for (QueryParam queryParam : queryParams){
for (Pair queryParam : queryParams){
if (!queryParam.getName().isEmpty()) {
b.append(escapeString(queryParam.getName()));
b.append("=");
@@ -516,7 +516,7 @@ public class ApiClient {
*
* @param authNames The authentications to apply
*/
private void updateParamsForAuth(String[] authNames, Set<QueryParam> queryParams, Map<String, String> headerParams) {
private void updateParamsForAuth(String[] authNames, Set<Pair> queryParams, Map<String, String> headerParams) {
for (String authName : authNames) {
Authentication auth = authentications.get(authName);
if (auth == null) throw new RuntimeException("Authentication undefined: " + authName);