loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-07-03 06:00:52 +00:00
Code Issues Packages Projects Releases Wiki 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java
View File

@ -116,7 +116,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig {
supportingFiles.add(new SupportingFile("Configuration.mustache", invokerFolder, "Configuration.java")); supportingFiles.add(new SupportingFile("Configuration.mustache", invokerFolder, "Configuration.java"));
supportingFiles.add(new SupportingFile("JsonUtil.mustache", invokerFolder, "JsonUtil.java")); supportingFiles.add(new SupportingFile("JsonUtil.mustache", invokerFolder, "JsonUtil.java"));
supportingFiles.add(new SupportingFile("StringUtil.mustache", invokerFolder, "StringUtil.java")); supportingFiles.add(new SupportingFile("StringUtil.mustache", invokerFolder, "StringUtil.java"));
supportingFiles.add(new SupportingFile("QueryParam.mustache", invokerFolder, "QueryParam.java")); supportingFiles.add(new SupportingFile("Pair.mustache", invokerFolder, "Pair.java"));
final String authFolder = (sourceFolder + File.separator + invokerPackage + ".auth").replace(".", File.separator); final String authFolder = (sourceFolder + File.separator + invokerPackage + ".auth").replace(".", File.separator);
supportingFiles.add(new SupportingFile("auth/Authentication.mustache", authFolder, "Authentication.java")); supportingFiles.add(new SupportingFile("auth/Authentication.mustache", authFolder, "Authentication.java"));

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

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

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

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

@ -3,7 +3,7 @@ package {{package}};
import {{invokerPackage}}.ApiException; import {{invokerPackage}}.ApiException;
import {{invokerPackage}}.ApiClient; import {{invokerPackage}}.ApiClient;
import {{invokerPackage}}.Configuration; import {{invokerPackage}}.Configuration;
import {{invokerPackage}}.QueryParam; import {{invokerPackage}}.Pair;
import {{modelPackage}}.*; import {{modelPackage}}.*;
@ -62,7 +62,7 @@ public class {{classname}} {
.replaceAll("\\{" + "{{paramName}}" + "\\}", apiClient.escapeString({{{paramName}}}.toString())){{/pathParams}}; .replaceAll("\\{" + "{{paramName}}" + "\\}", apiClient.escapeString({{{paramName}}}.toString())){{/pathParams}};
// query params // query params
Set<QueryParam> queryParams = new HashSet<QueryParam>(); Set<Pair> queryParams = new HashSet<Pair>();
Map<String, String> headerParams = new HashMap<String, String>(); Map<String, String> headerParams = new HashMap<String, String>();
Map<String, String> formParams = new HashMap<String, String>(); Map<String, String> formParams = new HashMap<String, String>();

6
modules/swagger-codegen/src/main/resources/Java/auth/ApiKeyAuth.mustache
View File

@ -1,6 +1,6 @@
package {{invokerPackage}}.auth; package {{invokerPackage}}.auth;
import {{invokerPackage}}.QueryParam; import {{invokerPackage}}.Pair;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -42,7 +42,7 @@ public class ApiKeyAuth implements Authentication {
} }
@Override @Override
public void applyToParams(Set<QueryParam> queryParams, Map<String, String> headerParams) { public void applyToParams(Set<Pair> queryParams, Map<String, String> headerParams) {
String value; String value;
if (apiKeyPrefix != null) { if (apiKeyPrefix != null) {
value = apiKeyPrefix + " " + apiKey; value = apiKeyPrefix + " " + apiKey;
@ -50,7 +50,7 @@ public class ApiKeyAuth implements Authentication {
value = apiKey; value = apiKey;
} }
if (location == "query") { if (location == "query") {
queryParams.add(new QueryParam(paramName, value)); queryParams.add(new Pair(paramName, value));
} else if (location == "header") { } else if (location == "header") {
headerParams.put(paramName, value); headerParams.put(paramName, value);
} }

4
modules/swagger-codegen/src/main/resources/Java/auth/Authentication.mustache
View File

@ -1,11 +1,11 @@
package {{invokerPackage}}.auth; package {{invokerPackage}}.auth;
import {{invokerPackage}}.QueryParam; import {{invokerPackage}}.Pair;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
public interface Authentication { public interface Authentication {
/** Apply authentication settings to header and query params. */ /** Apply authentication settings to header and query params. */
void applyToParams(Set<QueryParam> queryParams, Map<String, String> headerParams); void applyToParams(Set<Pair> queryParams, Map<String, String> headerParams);
} }

4
modules/swagger-codegen/src/main/resources/Java/auth/HttpBasicAuth.mustache
View File

@ -1,6 +1,6 @@
package {{invokerPackage}}.auth; package {{invokerPackage}}.auth;
import {{invokerPackage}}.QueryParam; import {{invokerPackage}}.Pair;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -29,7 +29,7 @@ public class HttpBasicAuth implements Authentication {
} }
@Override @Override
public void applyToParams(Set<QueryParam> queryParams, Map<String, String> headerParams) { public void applyToParams(Set<Pair> queryParams, Map<String, String> headerParams) {
String str = (username == null ? "" : username) + ":" + (password == null ? "" : password); String str = (username == null ? "" : username) + ":" + (password == null ? "" : password);
try { try {
headerParams.put("Authorization", "Basic " + DatatypeConverter.printBase64Binary(str.getBytes("UTF-8"))); headerParams.put("Authorization", "Basic " + DatatypeConverter.printBase64Binary(str.getBytes("UTF-8")));

4
modules/swagger-codegen/src/main/resources/Java/auth/OAuth.mustache
View File

@ -1,13 +1,13 @@
package {{invokerPackage}}.auth; package {{invokerPackage}}.auth;
import {{invokerPackage}}.QueryParam; import {{invokerPackage}}.Pair;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
public class OAuth implements Authentication { public class OAuth implements Authentication {
@Override @Override
public void applyToParams(Set<QueryParam> queryParams, Map<String, String> headerParams) { public void applyToParams(Set<Pair> queryParams, Map<String, String> headerParams) {
// TODO: support oauth // TODO: support oauth
} }
} }

24
samples/client/petstore/java/src/main/java/io/swagger/client/ApiClient.java
View File

@ -240,10 +240,10 @@ public class ApiClient {
} }
/* /*
Format to {@code QueryParam} objects. Format to {@code Pair} objects.
*/ */
public Set<QueryParam> parameterToQueryParams(String collectionFormat, String name, Object value){ public Set<Pair> parameterToQueryParams(String collectionFormat, String name, Object value){
Set<QueryParam> params = new HashSet<QueryParam>(); Set<Pair> params = new HashSet<Pair>();
// preconditions // preconditions
if (name == null || name.isEmpty() || value == null) return params; if (name == null || name.isEmpty() || value == null) return params;
@ -254,7 +254,7 @@ public class ApiClient {
} }
if (valueCollection == null) { if (valueCollection == null) {
params.add(new QueryParam(name, String.valueOf(value))); params.add(new Pair(name, String.valueOf(value)));
return params; return params;
} else if (valueCollection.isEmpty()) { } else if (valueCollection.isEmpty()) {
return params; return params;
@ -263,10 +263,10 @@ public class ApiClient {
collectionFormat = (collectionFormat == null || collectionFormat.isEmpty() ? "csv" : collectionFormat); // default: csv collectionFormat = (collectionFormat == null || collectionFormat.isEmpty() ? "csv" : collectionFormat); // default: csv
if (collectionFormat.equals("csv")) { if (collectionFormat.equals("csv")) {
params.add(new QueryParam(name, parameterToString(value))); params.add(new Pair(name, parameterToString(value)));
} else if (collectionFormat.equals("multi")) { } else if (collectionFormat.equals("multi")) {
for (String item : valueCollection) { for (String item : valueCollection) {
params.add(new QueryParam(name, item)); params.add(new Pair(name, item));
} }
} else if (collectionFormat.equals("ssv")) { } else if (collectionFormat.equals("ssv")) {
StringBuilder sb = new StringBuilder() ; StringBuilder sb = new StringBuilder() ;
@ -274,21 +274,21 @@ public class ApiClient {
sb.append(" "); sb.append(" ");
sb.append(item); sb.append(item);
} }
params.add(new QueryParam(name, sb.substring(1))); params.add(new Pair(name, sb.substring(1)));
} else if (collectionFormat.equals("tsv")) { } else if (collectionFormat.equals("tsv")) {
StringBuilder sb = new StringBuilder() ; StringBuilder sb = new StringBuilder() ;
for (String item : valueCollection) { for (String item : valueCollection) {
sb.append("\t"); sb.append("\t");
sb.append(item); sb.append(item);
} }
params.add(new QueryParam(name, sb.substring(1))); params.add(new Pair(name, sb.substring(1)));
} else if (collectionFormat.equals("pipes")) { } else if (collectionFormat.equals("pipes")) {
StringBuilder sb = new StringBuilder() ; StringBuilder sb = new StringBuilder() ;
for (String item : valueCollection) { for (String item : valueCollection) {
sb.append("|"); sb.append("|");
sb.append(item); sb.append(item);
} }
params.add(new QueryParam(name, sb.substring(1))); params.add(new Pair(name, sb.substring(1)));
} }
return params; return params;
@ -397,7 +397,7 @@ public class ApiClient {
* @param authNames The authentications to apply * @param authNames The authentications to apply
* @return The response body in type of string * @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); updateParamsForAuth(authNames, queryParams, headerParams);
Client client = getClient(); Client client = getClient();
@ -405,7 +405,7 @@ public class ApiClient {
StringBuilder b = new StringBuilder(); StringBuilder b = new StringBuilder();
b.append("?"); b.append("?");
if (queryParams != null){ if (queryParams != null){
for (QueryParam queryParam : queryParams){ for (Pair queryParam : queryParams){
if (!queryParam.getName().isEmpty()) { if (!queryParam.getName().isEmpty()) {
b.append(escapeString(queryParam.getName())); b.append(escapeString(queryParam.getName()));
b.append("="); b.append("=");
@ -515,7 +515,7 @@ public class ApiClient {
* *
* @param authNames The authentications to apply * @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) { for (String authName : authNames) {
Authentication auth = authentications.get(authName); Authentication auth = authentications.get(authName);
if (auth == null) throw new RuntimeException("Authentication undefined: " + authName); if (auth == null) throw new RuntimeException("Authentication undefined: " + authName);

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

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

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

@ -3,7 +3,7 @@ package io.swagger.client.api;
import io.swagger.client.ApiException; import io.swagger.client.ApiException;
import io.swagger.client.ApiClient; import io.swagger.client.ApiClient;
import io.swagger.client.Configuration; import io.swagger.client.Configuration;
import io.swagger.client.QueryParam; import io.swagger.client.Pair;
import io.swagger.client.model.*; import io.swagger.client.model.*;
@ -55,7 +55,7 @@ public class PetApi {
String path = "/pet".replaceAll("\\{format\\}","json"); String path = "/pet".replaceAll("\\{format\\}","json");
// query params // query params
Set<QueryParam> queryParams = new HashSet<QueryParam>(); Set<Pair> queryParams = new HashSet<Pair>();
Map<String, String> headerParams = new HashMap<String, String>(); Map<String, String> headerParams = new HashMap<String, String>();
Map<String, String> formParams = new HashMap<String, String>(); Map<String, String> formParams = new HashMap<String, String>();
@ -112,7 +112,7 @@ public class PetApi {
String path = "/pet".replaceAll("\\{format\\}","json"); String path = "/pet".replaceAll("\\{format\\}","json");
// query params // query params
Set<QueryParam> queryParams = new HashSet<QueryParam>(); Set<Pair> queryParams = new HashSet<Pair>();
Map<String, String> headerParams = new HashMap<String, String>(); Map<String, String> headerParams = new HashMap<String, String>();
Map<String, String> formParams = new HashMap<String, String>(); Map<String, String> formParams = new HashMap<String, String>();
@ -169,7 +169,7 @@ public class PetApi {
String path = "/pet/findByStatus".replaceAll("\\{format\\}","json"); String path = "/pet/findByStatus".replaceAll("\\{format\\}","json");
// query params // query params
Set<QueryParam> queryParams = new HashSet<QueryParam>(); Set<Pair> queryParams = new HashSet<Pair>();
Map<String, String> headerParams = new HashMap<String, String>(); Map<String, String> headerParams = new HashMap<String, String>();
Map<String, String> formParams = new HashMap<String, String>(); Map<String, String> formParams = new HashMap<String, String>();
@ -228,7 +228,7 @@ public class PetApi {
String path = "/pet/findByTags".replaceAll("\\{format\\}","json"); String path = "/pet/findByTags".replaceAll("\\{format\\}","json");
// query params // query params
Set<QueryParam> queryParams = new HashSet<QueryParam>(); Set<Pair> queryParams = new HashSet<Pair>();
Map<String, String> headerParams = new HashMap<String, String>(); Map<String, String> headerParams = new HashMap<String, String>();
Map<String, String> formParams = new HashMap<String, String>(); Map<String, String> formParams = new HashMap<String, String>();
@ -293,7 +293,7 @@ public class PetApi {
.replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
// query params // query params
Set<QueryParam> queryParams = new HashSet<QueryParam>(); Set<Pair> queryParams = new HashSet<Pair>();
Map<String, String> headerParams = new HashMap<String, String>(); Map<String, String> headerParams = new HashMap<String, String>();
Map<String, String> formParams = new HashMap<String, String>(); Map<String, String> formParams = new HashMap<String, String>();
@ -358,7 +358,7 @@ public class PetApi {
.replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
// query params // query params
Set<QueryParam> queryParams = new HashSet<QueryParam>(); Set<Pair> queryParams = new HashSet<Pair>();
Map<String, String> headerParams = new HashMap<String, String>(); Map<String, String> headerParams = new HashMap<String, String>();
Map<String, String> formParams = new HashMap<String, String>(); Map<String, String> formParams = new HashMap<String, String>();
@ -436,7 +436,7 @@ public class PetApi {
.replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
// query params // query params
Set<QueryParam> queryParams = new HashSet<QueryParam>(); Set<Pair> queryParams = new HashSet<Pair>();
Map<String, String> headerParams = new HashMap<String, String>(); Map<String, String> headerParams = new HashMap<String, String>();
Map<String, String> formParams = new HashMap<String, String>(); Map<String, String> formParams = new HashMap<String, String>();
@ -503,7 +503,7 @@ public class PetApi {
.replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString()));
// query params // query params
Set<QueryParam> queryParams = new HashSet<QueryParam>(); Set<Pair> queryParams = new HashSet<Pair>();
Map<String, String> headerParams = new HashMap<String, String>(); Map<String, String> headerParams = new HashMap<String, String>();
Map<String, String> formParams = new HashMap<String, String>(); Map<String, String> formParams = new HashMap<String, String>();

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

@ -3,7 +3,7 @@ package io.swagger.client.api;
import io.swagger.client.ApiException; import io.swagger.client.ApiException;
import io.swagger.client.ApiClient; import io.swagger.client.ApiClient;
import io.swagger.client.Configuration; import io.swagger.client.Configuration;
import io.swagger.client.QueryParam; import io.swagger.client.Pair;
import io.swagger.client.model.*; import io.swagger.client.model.*;
@ -54,7 +54,7 @@ public class StoreApi {
String path = "/store/inventory".replaceAll("\\{format\\}","json"); String path = "/store/inventory".replaceAll("\\{format\\}","json");
// query params // query params
Set<QueryParam> queryParams = new HashSet<QueryParam>(); Set<Pair> queryParams = new HashSet<Pair>();
Map<String, String> headerParams = new HashMap<String, String>(); Map<String, String> headerParams = new HashMap<String, String>();
Map<String, String> formParams = new HashMap<String, String>(); Map<String, String> formParams = new HashMap<String, String>();
@ -111,7 +111,7 @@ public class StoreApi {
String path = "/store/order".replaceAll("\\{format\\}","json"); String path = "/store/order".replaceAll("\\{format\\}","json");
// query params // query params
Set<QueryParam> queryParams = new HashSet<QueryParam>(); Set<Pair> queryParams = new HashSet<Pair>();
Map<String, String> headerParams = new HashMap<String, String>(); Map<String, String> headerParams = new HashMap<String, String>();
Map<String, String> formParams = new HashMap<String, String>(); Map<String, String> formParams = new HashMap<String, String>();
@ -174,7 +174,7 @@ public class StoreApi {
.replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString())); .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString()));
// query params // query params
Set<QueryParam> queryParams = new HashSet<QueryParam>(); Set<Pair> queryParams = new HashSet<Pair>();
Map<String, String> headerParams = new HashMap<String, String>(); Map<String, String> headerParams = new HashMap<String, String>();
Map<String, String> formParams = new HashMap<String, String>(); Map<String, String> formParams = new HashMap<String, String>();
@ -237,7 +237,7 @@ public class StoreApi {
.replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString())); .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString()));
// query params // query params
Set<QueryParam> queryParams = new HashSet<QueryParam>(); Set<Pair> queryParams = new HashSet<Pair>();
Map<String, String> headerParams = new HashMap<String, String>(); Map<String, String> headerParams = new HashMap<String, String>();
Map<String, String> formParams = new HashMap<String, String>(); Map<String, String> formParams = new HashMap<String, String>();

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

@ -3,7 +3,7 @@ package io.swagger.client.api;
import io.swagger.client.ApiException; import io.swagger.client.ApiException;
import io.swagger.client.ApiClient; import io.swagger.client.ApiClient;
import io.swagger.client.Configuration; import io.swagger.client.Configuration;
import io.swagger.client.QueryParam; import io.swagger.client.Pair;
import io.swagger.client.model.*; import io.swagger.client.model.*;
@ -55,7 +55,7 @@ public class UserApi {
String path = "/user".replaceAll("\\{format\\}","json"); String path = "/user".replaceAll("\\{format\\}","json");
// query params // query params
Set<QueryParam> queryParams = new HashSet<QueryParam>(); Set<Pair> queryParams = new HashSet<Pair>();
Map<String, String> headerParams = new HashMap<String, String>(); Map<String, String> headerParams = new HashMap<String, String>();
Map<String, String> formParams = new HashMap<String, String>(); Map<String, String> formParams = new HashMap<String, String>();
@ -112,7 +112,7 @@ public class UserApi {
String path = "/user/createWithArray".replaceAll("\\{format\\}","json"); String path = "/user/createWithArray".replaceAll("\\{format\\}","json");
// query params // query params
Set<QueryParam> queryParams = new HashSet<QueryParam>(); Set<Pair> queryParams = new HashSet<Pair>();
Map<String, String> headerParams = new HashMap<String, String>(); Map<String, String> headerParams = new HashMap<String, String>();
Map<String, String> formParams = new HashMap<String, String>(); Map<String, String> formParams = new HashMap<String, String>();
@ -169,7 +169,7 @@ public class UserApi {
String path = "/user/createWithList".replaceAll("\\{format\\}","json"); String path = "/user/createWithList".replaceAll("\\{format\\}","json");
// query params // query params
Set<QueryParam> queryParams = new HashSet<QueryParam>(); Set<Pair> queryParams = new HashSet<Pair>();
Map<String, String> headerParams = new HashMap<String, String>(); Map<String, String> headerParams = new HashMap<String, String>();
Map<String, String> formParams = new HashMap<String, String>(); Map<String, String> formParams = new HashMap<String, String>();
@ -227,7 +227,7 @@ public class UserApi {
String path = "/user/login".replaceAll("\\{format\\}","json"); String path = "/user/login".replaceAll("\\{format\\}","json");
// query params // query params
Set<QueryParam> queryParams = new HashSet<QueryParam>(); Set<Pair> queryParams = new HashSet<Pair>();
Map<String, String> headerParams = new HashMap<String, String>(); Map<String, String> headerParams = new HashMap<String, String>();
Map<String, String> formParams = new HashMap<String, String>(); Map<String, String> formParams = new HashMap<String, String>();
@ -287,7 +287,7 @@ public class UserApi {
String path = "/user/logout".replaceAll("\\{format\\}","json"); String path = "/user/logout".replaceAll("\\{format\\}","json");
// query params // query params
Set<QueryParam> queryParams = new HashSet<QueryParam>(); Set<Pair> queryParams = new HashSet<Pair>();
Map<String, String> headerParams = new HashMap<String, String>(); Map<String, String> headerParams = new HashMap<String, String>();
Map<String, String> formParams = new HashMap<String, String>(); Map<String, String> formParams = new HashMap<String, String>();
@ -350,7 +350,7 @@ public class UserApi {
.replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
// query params // query params
Set<QueryParam> queryParams = new HashSet<QueryParam>(); Set<Pair> queryParams = new HashSet<Pair>();
Map<String, String> headerParams = new HashMap<String, String>(); Map<String, String> headerParams = new HashMap<String, String>();
Map<String, String> formParams = new HashMap<String, String>(); Map<String, String> formParams = new HashMap<String, String>();
@ -414,7 +414,7 @@ public class UserApi {
.replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
// query params // query params
Set<QueryParam> queryParams = new HashSet<QueryParam>(); Set<Pair> queryParams = new HashSet<Pair>();
Map<String, String> headerParams = new HashMap<String, String>(); Map<String, String> headerParams = new HashMap<String, String>();
Map<String, String> formParams = new HashMap<String, String>(); Map<String, String> formParams = new HashMap<String, String>();
@ -477,7 +477,7 @@ public class UserApi {
.replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString()));
// query params // query params
Set<QueryParam> queryParams = new HashSet<QueryParam>(); Set<Pair> queryParams = new HashSet<Pair>();
Map<String, String> headerParams = new HashMap<String, String>(); Map<String, String> headerParams = new HashMap<String, String>();
Map<String, String> formParams = new HashMap<String, String>(); Map<String, String> formParams = new HashMap<String, String>();

6
samples/client/petstore/java/src/main/java/io/swagger/client/auth/ApiKeyAuth.java
View File

@ -1,6 +1,6 @@
package io.swagger.client.auth; package io.swagger.client.auth;
import io.swagger.client.QueryParam; import io.swagger.client.Pair;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -42,7 +42,7 @@ public class ApiKeyAuth implements Authentication {
} }
@Override @Override
public void applyToParams(Set<QueryParam> queryParams, Map<String, String> headerParams) { public void applyToParams(Set<Pair> queryParams, Map<String, String> headerParams) {
String value; String value;
if (apiKeyPrefix != null) { if (apiKeyPrefix != null) {
value = apiKeyPrefix + " " + apiKey; value = apiKeyPrefix + " " + apiKey;
@ -50,7 +50,7 @@ public class ApiKeyAuth implements Authentication {
value = apiKey; value = apiKey;
} }
if (location == "query") { if (location == "query") {
queryParams.add(new QueryParam(paramName, value)); queryParams.add(new Pair(paramName, value));
} else if (location == "header") { } else if (location == "header") {
headerParams.put(paramName, value); headerParams.put(paramName, value);
} }

4
samples/client/petstore/java/src/main/java/io/swagger/client/auth/Authentication.java
View File

@ -1,11 +1,11 @@
package io.swagger.client.auth; package io.swagger.client.auth;
import io.swagger.client.QueryParam; import io.swagger.client.Pair;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
public interface Authentication { public interface Authentication {
/** Apply authentication settings to header and query params. */ /** Apply authentication settings to header and query params. */
void applyToParams(Set<QueryParam> queryParams, Map<String, String> headerParams); void applyToParams(Set<Pair> queryParams, Map<String, String> headerParams);
} }

4
samples/client/petstore/java/src/main/java/io/swagger/client/auth/HttpBasicAuth.java
View File

@ -1,6 +1,6 @@
package io.swagger.client.auth; package io.swagger.client.auth;
import io.swagger.client.QueryParam; import io.swagger.client.Pair;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@ -29,7 +29,7 @@ public class HttpBasicAuth implements Authentication {
} }
@Override @Override
public void applyToParams(Set<QueryParam> queryParams, Map<String, String> headerParams) { public void applyToParams(Set<Pair> queryParams, Map<String, String> headerParams) {
String str = (username == null ? "" : username) + ":" + (password == null ? "" : password); String str = (username == null ? "" : username) + ":" + (password == null ? "" : password);
try { try {
headerParams.put("Authorization", "Basic " + DatatypeConverter.printBase64Binary(str.getBytes("UTF-8"))); headerParams.put("Authorization", "Basic " + DatatypeConverter.printBase64Binary(str.getBytes("UTF-8")));

4
samples/client/petstore/java/src/main/java/io/swagger/client/auth/OAuth.java
View File

@ -1,13 +1,13 @@
package io.swagger.client.auth; package io.swagger.client.auth;
import io.swagger.client.QueryParam; import io.swagger.client.Pair;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
public class OAuth implements Authentication { public class OAuth implements Authentication {
@Override @Override
public void applyToParams(Set<QueryParam> queryParams, Map<String, String> headerParams) { public void applyToParams(Set<Pair> queryParams, Map<String, String> headerParams) {
// TODO: support oauth // TODO: support oauth
} }
} }

8
samples/client/petstore/java/src/test/java/io/swagger/client/auth/ApiKeyAuthTest.java
View File

@ -5,7 +5,7 @@ import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import io.swagger.client.QueryParam; import io.swagger.client.Pair;
import org.junit.*; import org.junit.*;
import static org.junit.Assert.*; import static org.junit.Assert.*;
@ -13,7 +13,7 @@ import static org.junit.Assert.*;
public class ApiKeyAuthTest { public class ApiKeyAuthTest {
@Test @Test
public void testApplyToParamsInQuery() { public void testApplyToParamsInQuery() {
Set<QueryParam> queryParams = new HashSet<QueryParam>(); Set<Pair> queryParams = new HashSet<Pair>();
Map<String, String> headerParams = new HashMap<String, String>(); Map<String, String> headerParams = new HashMap<String, String>();
ApiKeyAuth auth = new ApiKeyAuth("query", "api_key"); ApiKeyAuth auth = new ApiKeyAuth("query", "api_key");
@ -21,7 +21,7 @@ public class ApiKeyAuthTest {
auth.applyToParams(queryParams, headerParams); auth.applyToParams(queryParams, headerParams);
assertEquals(1, queryParams.size()); assertEquals(1, queryParams.size());
for (QueryParam queryParam : queryParams) { for (Pair queryParam : queryParams) {
assertEquals("my-api-key", queryParam.getValue()); assertEquals("my-api-key", queryParam.getValue());
} }
@ -31,7 +31,7 @@ public class ApiKeyAuthTest {
@Test @Test
public void testApplyToParamsInHeaderWithPrefix() { public void testApplyToParamsInHeaderWithPrefix() {
Set<QueryParam> queryParams = new HashSet<QueryParam>(); Set<Pair> queryParams = new HashSet<Pair>();
Map<String, String> headerParams = new HashMap<String, String>(); Map<String, String> headerParams = new HashMap<String, String>();
ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN"); ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN");

4
samples/client/petstore/java/src/test/java/io/swagger/client/auth/HttpBasicAuthTest.java
View File

@ -5,7 +5,7 @@ import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import io.swagger.client.QueryParam; import io.swagger.client.Pair;
import org.junit.*; import org.junit.*;
import static org.junit.Assert.*; import static org.junit.Assert.*;
@ -20,7 +20,7 @@ public class HttpBasicAuthTest {
@Test @Test
public void testApplyToParams() { public void testApplyToParams() {
Set<QueryParam> queryParams = new HashSet<QueryParam>(); Set<Pair> queryParams = new HashSet<Pair>();
Map<String, String> headerParams = new HashMap<String, String>(); Map<String, String> headerParams = new HashMap<String, String>();
auth.setUsername("my-username"); auth.setUsername("my-username");