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

Renamed QueryParam to Pair class in Android templates.

Browse Source
This commit is contained in:
Raghav Sidhanti 2015-06-22 15:28:29 -07:00
parent ecddfb7ccf
commit a1b56c9b83
9 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AndroidClientCodegen.java
View File

@ -232,8 +232,8 @@ public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfi
(sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "JsonUtil.java"));
supportingFiles.add(new SupportingFile("apiException.mustache",
(sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "ApiException.java"));
supportingFiles.add(new SupportingFile("QueryParam.mustache",
(sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "QueryParam.java"));
supportingFiles.add(new SupportingFile("Pair.mustache",
(sourceFolder + File.separator + invokerPackage).replace(".", java.io.File.separator), "Pair.java"));
}
public Boolean getUseAndroidMavenGradlePlugin() {

4
modules/swagger-codegen/src/main/resources/android-java/QueryParam.mustache → modules/swagger-codegen/src/main/resources/android-java/Pair.mustache
View File

@ -1,10 +1,10 @@
package {{invokerPackage}};
public class QueryParam {
public class Pair {
private String name = "";
private String value = "";
public QueryParam(String name, String value) {
public Pair(String name, String value) {
setName(name);
setValue(value);
}

4
modules/swagger-codegen/src/main/resources/android-java/api.mustache
View File

@ -2,7 +2,7 @@ package {{package}};
import {{invokerPackage}}.ApiException;
import {{invokerPackage}}.ApiInvoker;
import {{invokerPackage}}.QueryParam;
import {{invokerPackage}}.Pair;
import {{modelPackage}}.*;
@ -59,7 +59,7 @@ public class {{classname}} {
String path = "{{path}}".replaceAll("\\{format\\}","json"){{#pathParams}}.replaceAll("\\{" + "{{paramName}}" + "\\}", apiInvoker.escapeString({{{paramName}}}.toString())){{/pathParams}};
// query params
Set<QueryParam> queryParams = new HashSet<QueryParam>();
Set<Pair> queryParams = new HashSet<Pair>();
// header params
Map<String, String> headerParams = new HashMap<String, String>();
// form params

22
modules/swagger-codegen/src/main/resources/android-java/apiInvoker.mustache
View File

@ -135,10 +135,10 @@ public class ApiInvoker {
}
/*
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;
@ -149,7 +149,7 @@ public class ApiInvoker {
}
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;
@ -158,10 +158,10 @@ public class ApiInvoker {
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() ;
@ -169,21 +169,21 @@ public class ApiInvoker {
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;
@ -241,13 +241,13 @@ public class ApiInvoker {
}
}
public String invokeAPI(String host, String path, String method, Set<QueryParam> queryParams, Object body, Map<String, String> headerParams, Map<String, String> formParams, String contentType) throws ApiException {
public String invokeAPI(String host, String path, String method, Set<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, String> formParams, String contentType) throws ApiException {
HttpClient client = getClient(host);
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("=");

22
samples/client/petstore/android-java/src/main/java/io/swagger/client/ApiInvoker.java
View File

@ -135,10 +135,10 @@ public class ApiInvoker {
}
/*
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;
@ -149,7 +149,7 @@ public class ApiInvoker {
}
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;
@ -158,10 +158,10 @@ public class ApiInvoker {
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() ;
@ -169,21 +169,21 @@ public class ApiInvoker {
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;
@ -241,13 +241,13 @@ public class ApiInvoker {
}
}
public String invokeAPI(String host, String path, String method, Set<QueryParam> queryParams, Object body, Map<String, String> headerParams, Map<String, String> formParams, String contentType) throws ApiException {
public String invokeAPI(String host, String path, String method, Set<Pair> queryParams, Object body, Map<String, String> headerParams, Map<String, String> formParams, String contentType) throws ApiException {
HttpClient client = getClient(host);
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("=");

4
samples/client/petstore/android-java/src/main/java/io/swagger/client/QueryParam.java → samples/client/petstore/android-java/src/main/java/io/swagger/client/Pair.java
View File

@ -1,10 +1,10 @@
package io.swagger.client;
public class QueryParam {
public class Pair {
private String name = "";
private String value = "";
public QueryParam(String name, String value) {
public Pair(String name, String value) {
setName(name);
setValue(value);
}

18
samples/client/petstore/android-java/src/main/java/io/swagger/client/api/PetApi.java
View File

@ -2,7 +2,7 @@ package io.swagger.client.api;
import io.swagger.client.ApiException;
import io.swagger.client.ApiInvoker;
import io.swagger.client.QueryParam;
import io.swagger.client.Pair;
import io.swagger.client.model.*;
@ -53,7 +53,7 @@ public class PetApi {
String path = "/pet".replaceAll("\\{format\\}","json");
// query params
Set<QueryParam> queryParams = new HashSet<QueryParam>();
Set<Pair> queryParams = new HashSet<Pair>();
// header params
Map<String, String> headerParams = new HashMap<String, String>();
// form params
@ -107,7 +107,7 @@ public class PetApi {
String path = "/pet".replaceAll("\\{format\\}","json");
// query params
Set<QueryParam> queryParams = new HashSet<QueryParam>();
Set<Pair> queryParams = new HashSet<Pair>();
// header params
Map<String, String> headerParams = new HashMap<String, String>();
// form params
@ -161,7 +161,7 @@ public class PetApi {
String path = "/pet/findByStatus".replaceAll("\\{format\\}","json");
// query params
Set<QueryParam> queryParams = new HashSet<QueryParam>();
Set<Pair> queryParams = new HashSet<Pair>();
// header params
Map<String, String> headerParams = new HashMap<String, String>();
// form params
@ -217,7 +217,7 @@ public class PetApi {
String path = "/pet/findByTags".replaceAll("\\{format\\}","json");
// query params
Set<QueryParam> queryParams = new HashSet<QueryParam>();
Set<Pair> queryParams = new HashSet<Pair>();
// header params
Map<String, String> headerParams = new HashMap<String, String>();
// form params
@ -278,7 +278,7 @@ public class PetApi {
String path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
// query params
Set<QueryParam> queryParams = new HashSet<QueryParam>();
Set<Pair> queryParams = new HashSet<Pair>();
// header params
Map<String, String> headerParams = new HashMap<String, String>();
// form params
@ -339,7 +339,7 @@ public class PetApi {
String path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
// query params
Set<QueryParam> queryParams = new HashSet<QueryParam>();
Set<Pair> queryParams = new HashSet<Pair>();
// header params
Map<String, String> headerParams = new HashMap<String, String>();
// form params
@ -409,7 +409,7 @@ public class PetApi {
String path = "/pet/{petId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
// query params
Set<QueryParam> queryParams = new HashSet<QueryParam>();
Set<Pair> queryParams = new HashSet<Pair>();
// header params
Map<String, String> headerParams = new HashMap<String, String>();
// form params
@ -472,7 +472,7 @@ public class PetApi {
String path = "/pet/{petId}/uploadImage".replaceAll("\\{format\\}","json").replaceAll("\\{" + "petId" + "\\}", apiInvoker.escapeString(petId.toString()));
// query params
Set<QueryParam> queryParams = new HashSet<QueryParam>();
Set<Pair> queryParams = new HashSet<Pair>();
// header params
Map<String, String> headerParams = new HashMap<String, String>();
// form params

10
samples/client/petstore/android-java/src/main/java/io/swagger/client/api/StoreApi.java
View File

@ -2,7 +2,7 @@ package io.swagger.client.api;
import io.swagger.client.ApiException;
import io.swagger.client.ApiInvoker;
import io.swagger.client.QueryParam;
import io.swagger.client.Pair;
import io.swagger.client.model.*;
@ -52,7 +52,7 @@ public class StoreApi {
String path = "/store/inventory".replaceAll("\\{format\\}","json");
// query params
Set<QueryParam> queryParams = new HashSet<QueryParam>();
Set<Pair> queryParams = new HashSet<Pair>();
// header params
Map<String, String> headerParams = new HashMap<String, String>();
// form params
@ -106,7 +106,7 @@ public class StoreApi {
String path = "/store/order".replaceAll("\\{format\\}","json");
// query params
Set<QueryParam> queryParams = new HashSet<QueryParam>();
Set<Pair> queryParams = new HashSet<Pair>();
// header params
Map<String, String> headerParams = new HashMap<String, String>();
// form params
@ -165,7 +165,7 @@ public class StoreApi {
String path = "/store/order/{orderId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "orderId" + "\\}", apiInvoker.escapeString(orderId.toString()));
// query params
Set<QueryParam> queryParams = new HashSet<QueryParam>();
Set<Pair> queryParams = new HashSet<Pair>();
// header params
Map<String, String> headerParams = new HashMap<String, String>();
// form params
@ -224,7 +224,7 @@ public class StoreApi {
String path = "/store/order/{orderId}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "orderId" + "\\}", apiInvoker.escapeString(orderId.toString()));
// query params
Set<QueryParam> queryParams = new HashSet<QueryParam>();
Set<Pair> queryParams = new HashSet<Pair>();
// header params
Map<String, String> headerParams = new HashMap<String, String>();
// form params

18
samples/client/petstore/android-java/src/main/java/io/swagger/client/api/UserApi.java
View File

@ -2,7 +2,7 @@ package io.swagger.client.api;
import io.swagger.client.ApiException;
import io.swagger.client.ApiInvoker;
import io.swagger.client.QueryParam;
import io.swagger.client.Pair;
import io.swagger.client.model.*;
@ -53,7 +53,7 @@ public class UserApi {
String path = "/user".replaceAll("\\{format\\}","json");
// query params
Set<QueryParam> queryParams = new HashSet<QueryParam>();
Set<Pair> queryParams = new HashSet<Pair>();
// header params
Map<String, String> headerParams = new HashMap<String, String>();
// form params
@ -107,7 +107,7 @@ public class UserApi {
String path = "/user/createWithArray".replaceAll("\\{format\\}","json");
// query params
Set<QueryParam> queryParams = new HashSet<QueryParam>();
Set<Pair> queryParams = new HashSet<Pair>();
// header params
Map<String, String> headerParams = new HashMap<String, String>();
// form params
@ -161,7 +161,7 @@ public class UserApi {
String path = "/user/createWithList".replaceAll("\\{format\\}","json");
// query params
Set<QueryParam> queryParams = new HashSet<QueryParam>();
Set<Pair> queryParams = new HashSet<Pair>();
// header params
Map<String, String> headerParams = new HashMap<String, String>();
// form params
@ -216,7 +216,7 @@ public class UserApi {
String path = "/user/login".replaceAll("\\{format\\}","json");
// query params
Set<QueryParam> queryParams = new HashSet<QueryParam>();
Set<Pair> queryParams = new HashSet<Pair>();
// header params
Map<String, String> headerParams = new HashMap<String, String>();
// form params
@ -273,7 +273,7 @@ public class UserApi {
String path = "/user/logout".replaceAll("\\{format\\}","json");
// query params
Set<QueryParam> queryParams = new HashSet<QueryParam>();
Set<Pair> queryParams = new HashSet<Pair>();
// header params
Map<String, String> headerParams = new HashMap<String, String>();
// form params
@ -332,7 +332,7 @@ public class UserApi {
String path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
// query params
Set<QueryParam> queryParams = new HashSet<QueryParam>();
Set<Pair> queryParams = new HashSet<Pair>();
// header params
Map<String, String> headerParams = new HashMap<String, String>();
// form params
@ -392,7 +392,7 @@ public class UserApi {
String path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
// query params
Set<QueryParam> queryParams = new HashSet<QueryParam>();
Set<Pair> queryParams = new HashSet<Pair>();
// header params
Map<String, String> headerParams = new HashMap<String, String>();
// form params
@ -451,7 +451,7 @@ public class UserApi {
String path = "/user/{username}".replaceAll("\\{format\\}","json").replaceAll("\\{" + "username" + "\\}", apiInvoker.escapeString(username.toString()));
// query params
Set<QueryParam> queryParams = new HashSet<QueryParam>();
Set<Pair> queryParams = new HashSet<Pair>();
// header params
Map<String, String> headerParams = new HashMap<String, String>();
// form params