From ecddfb7ccf4376b2986c65cab6eca8d7eca206e7 Mon Sep 17 00:00:00 2001 From: Raghav Sidhanti Date: Mon, 22 Jun 2015 15:16:45 -0700 Subject: [PATCH] Renamed QueryParam to Pair class in Java templates. --- .../codegen/languages/JavaClientCodegen.java | 2 +- .../main/resources/Java/ApiClient.mustache | 24 +++++++++---------- .../{QueryParam.mustache => Pair.mustache} | 4 ++-- .../src/main/resources/Java/api.mustache | 4 ++-- .../resources/Java/auth/ApiKeyAuth.mustache | 6 ++--- .../Java/auth/Authentication.mustache | 4 ++-- .../Java/auth/HttpBasicAuth.mustache | 4 ++-- .../main/resources/Java/auth/OAuth.mustache | 4 ++-- .../java/io/swagger/client/ApiClient.java | 24 +++++++++---------- .../client/{QueryParam.java => Pair.java} | 4 ++-- .../java/io/swagger/client/api/PetApi.java | 18 +++++++------- .../java/io/swagger/client/api/StoreApi.java | 10 ++++---- .../java/io/swagger/client/api/UserApi.java | 18 +++++++------- .../io/swagger/client/auth/ApiKeyAuth.java | 6 ++--- .../swagger/client/auth/Authentication.java | 4 ++-- .../io/swagger/client/auth/HttpBasicAuth.java | 4 ++-- .../java/io/swagger/client/auth/OAuth.java | 4 ++-- .../swagger/client/auth/ApiKeyAuthTest.java | 8 +++---- .../client/auth/HttpBasicAuthTest.java | 4 ++-- 19 files changed, 78 insertions(+), 78 deletions(-) rename modules/swagger-codegen/src/main/resources/Java/{QueryParam.mustache => Pair.mustache} (89%) rename samples/client/petstore/java/src/main/java/io/swagger/client/{QueryParam.java => Pair.java} (89%) diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java index 0f4e8c212ac..2f31cddec6f 100644 --- a/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/JavaClientCodegen.java @@ -116,7 +116,7 @@ public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { supportingFiles.add(new SupportingFile("Configuration.mustache", invokerFolder, "Configuration.java")); supportingFiles.add(new SupportingFile("JsonUtil.mustache", invokerFolder, "JsonUtil.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); supportingFiles.add(new SupportingFile("auth/Authentication.mustache", authFolder, "Authentication.java")); diff --git a/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache b/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache index 59a0ee73281..888f407a412 100644 --- a/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/ApiClient.mustache @@ -241,10 +241,10 @@ public class ApiClient { } /* - Format to {@code QueryParam} objects. + Format to {@code Pair} objects. */ - public Set parameterToQueryParams(String collectionFormat, String name, Object value){ - Set params = new HashSet(); + public Set parameterToQueryParams(String collectionFormat, String name, Object value){ + Set params = new HashSet(); // 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 queryParams, Object body, Map headerParams, Map formParams, String accept, String contentType, String[] authNames) throws ApiException { + public String invokeAPI(String path, String method, Set queryParams, Object body, Map headerParams, Map 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 queryParams, Map headerParams) { + private void updateParamsForAuth(String[] authNames, Set queryParams, Map headerParams) { for (String authName : authNames) { Authentication auth = authentications.get(authName); if (auth == null) throw new RuntimeException("Authentication undefined: " + authName); diff --git a/modules/swagger-codegen/src/main/resources/Java/QueryParam.mustache b/modules/swagger-codegen/src/main/resources/Java/Pair.mustache similarity index 89% rename from modules/swagger-codegen/src/main/resources/Java/QueryParam.mustache rename to modules/swagger-codegen/src/main/resources/Java/Pair.mustache index 23b1b26f55c..9805c74903b 100644 --- a/modules/swagger-codegen/src/main/resources/Java/QueryParam.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/Pair.mustache @@ -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); } diff --git a/modules/swagger-codegen/src/main/resources/Java/api.mustache b/modules/swagger-codegen/src/main/resources/Java/api.mustache index 66dc25d66bf..8d8709da186 100644 --- a/modules/swagger-codegen/src/main/resources/Java/api.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/api.mustache @@ -3,7 +3,7 @@ package {{package}}; import {{invokerPackage}}.ApiException; import {{invokerPackage}}.ApiClient; import {{invokerPackage}}.Configuration; -import {{invokerPackage}}.QueryParam; +import {{invokerPackage}}.Pair; import {{modelPackage}}.*; @@ -62,7 +62,7 @@ public class {{classname}} { .replaceAll("\\{" + "{{paramName}}" + "\\}", apiClient.escapeString({{{paramName}}}.toString())){{/pathParams}}; // query params - Set queryParams = new HashSet(); + Set queryParams = new HashSet(); Map headerParams = new HashMap(); Map formParams = new HashMap(); diff --git a/modules/swagger-codegen/src/main/resources/Java/auth/ApiKeyAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/ApiKeyAuth.mustache index 46fa51087b6..aefbe453efd 100644 --- a/modules/swagger-codegen/src/main/resources/Java/auth/ApiKeyAuth.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/auth/ApiKeyAuth.mustache @@ -1,6 +1,6 @@ package {{invokerPackage}}.auth; -import {{invokerPackage}}.QueryParam; +import {{invokerPackage}}.Pair; import java.util.Map; import java.util.Set; @@ -42,7 +42,7 @@ public class ApiKeyAuth implements Authentication { } @Override - public void applyToParams(Set queryParams, Map headerParams) { + public void applyToParams(Set queryParams, Map headerParams) { String value; if (apiKeyPrefix != null) { value = apiKeyPrefix + " " + apiKey; @@ -50,7 +50,7 @@ public class ApiKeyAuth implements Authentication { value = apiKey; } if (location == "query") { - queryParams.add(new QueryParam(paramName, value)); + queryParams.add(new Pair(paramName, value)); } else if (location == "header") { headerParams.put(paramName, value); } diff --git a/modules/swagger-codegen/src/main/resources/Java/auth/Authentication.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/Authentication.mustache index 1f39a402b2c..9e0b328915c 100644 --- a/modules/swagger-codegen/src/main/resources/Java/auth/Authentication.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/auth/Authentication.mustache @@ -1,11 +1,11 @@ package {{invokerPackage}}.auth; -import {{invokerPackage}}.QueryParam; +import {{invokerPackage}}.Pair; import java.util.Map; import java.util.Set; public interface Authentication { /** Apply authentication settings to header and query params. */ - void applyToParams(Set queryParams, Map headerParams); + void applyToParams(Set queryParams, Map headerParams); } diff --git a/modules/swagger-codegen/src/main/resources/Java/auth/HttpBasicAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/HttpBasicAuth.mustache index b5bc993f7c4..73c52d96ff1 100644 --- a/modules/swagger-codegen/src/main/resources/Java/auth/HttpBasicAuth.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/auth/HttpBasicAuth.mustache @@ -1,6 +1,6 @@ package {{invokerPackage}}.auth; -import {{invokerPackage}}.QueryParam; +import {{invokerPackage}}.Pair; import java.util.Map; import java.util.Set; @@ -29,7 +29,7 @@ public class HttpBasicAuth implements Authentication { } @Override - public void applyToParams(Set queryParams, Map headerParams) { + public void applyToParams(Set queryParams, Map headerParams) { String str = (username == null ? "" : username) + ":" + (password == null ? "" : password); try { headerParams.put("Authorization", "Basic " + DatatypeConverter.printBase64Binary(str.getBytes("UTF-8"))); diff --git a/modules/swagger-codegen/src/main/resources/Java/auth/OAuth.mustache b/modules/swagger-codegen/src/main/resources/Java/auth/OAuth.mustache index ab634489eda..4de2fbed905 100644 --- a/modules/swagger-codegen/src/main/resources/Java/auth/OAuth.mustache +++ b/modules/swagger-codegen/src/main/resources/Java/auth/OAuth.mustache @@ -1,13 +1,13 @@ package {{invokerPackage}}.auth; -import {{invokerPackage}}.QueryParam; +import {{invokerPackage}}.Pair; import java.util.Map; import java.util.Set; public class OAuth implements Authentication { @Override - public void applyToParams(Set queryParams, Map headerParams) { + public void applyToParams(Set queryParams, Map headerParams) { // TODO: support oauth } } diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/ApiClient.java b/samples/client/petstore/java/src/main/java/io/swagger/client/ApiClient.java index dd14a1c2454..441e5cc1f3c 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/ApiClient.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/ApiClient.java @@ -240,10 +240,10 @@ public class ApiClient { } /* - Format to {@code QueryParam} objects. + Format to {@code Pair} objects. */ - public Set parameterToQueryParams(String collectionFormat, String name, Object value){ - Set params = new HashSet(); + public Set parameterToQueryParams(String collectionFormat, String name, Object value){ + Set params = new HashSet(); // preconditions if (name == null || name.isEmpty() || value == null) return params; @@ -254,7 +254,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; @@ -263,10 +263,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() ; @@ -274,21 +274,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; @@ -397,7 +397,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 queryParams, Object body, Map headerParams, Map formParams, String accept, String contentType, String[] authNames) throws ApiException { + public String invokeAPI(String path, String method, Set queryParams, Object body, Map headerParams, Map formParams, String accept, String contentType, String[] authNames) throws ApiException { updateParamsForAuth(authNames, queryParams, headerParams); Client client = getClient(); @@ -405,7 +405,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("="); @@ -515,7 +515,7 @@ public class ApiClient { * * @param authNames The authentications to apply */ - private void updateParamsForAuth(String[] authNames, Set queryParams, Map headerParams) { + private void updateParamsForAuth(String[] authNames, Set queryParams, Map headerParams) { for (String authName : authNames) { Authentication auth = authentications.get(authName); if (auth == null) throw new RuntimeException("Authentication undefined: " + authName); diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/QueryParam.java b/samples/client/petstore/java/src/main/java/io/swagger/client/Pair.java similarity index 89% rename from samples/client/petstore/java/src/main/java/io/swagger/client/QueryParam.java rename to samples/client/petstore/java/src/main/java/io/swagger/client/Pair.java index 240352e890f..4b7112f6db6 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/QueryParam.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/Pair.java @@ -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); } diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/src/main/java/io/swagger/client/api/PetApi.java index 3fc9bd267e4..85d87534175 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/api/PetApi.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/api/PetApi.java @@ -3,7 +3,7 @@ package io.swagger.client.api; import io.swagger.client.ApiException; import io.swagger.client.ApiClient; import io.swagger.client.Configuration; -import io.swagger.client.QueryParam; +import io.swagger.client.Pair; import io.swagger.client.model.*; @@ -55,7 +55,7 @@ public class PetApi { String path = "/pet".replaceAll("\\{format\\}","json"); // query params - Set queryParams = new HashSet(); + Set queryParams = new HashSet(); Map headerParams = new HashMap(); Map formParams = new HashMap(); @@ -112,7 +112,7 @@ public class PetApi { String path = "/pet".replaceAll("\\{format\\}","json"); // query params - Set queryParams = new HashSet(); + Set queryParams = new HashSet(); Map headerParams = new HashMap(); Map formParams = new HashMap(); @@ -169,7 +169,7 @@ public class PetApi { String path = "/pet/findByStatus".replaceAll("\\{format\\}","json"); // query params - Set queryParams = new HashSet(); + Set queryParams = new HashSet(); Map headerParams = new HashMap(); Map formParams = new HashMap(); @@ -228,7 +228,7 @@ public class PetApi { String path = "/pet/findByTags".replaceAll("\\{format\\}","json"); // query params - Set queryParams = new HashSet(); + Set queryParams = new HashSet(); Map headerParams = new HashMap(); Map formParams = new HashMap(); @@ -293,7 +293,7 @@ public class PetApi { .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); // query params - Set queryParams = new HashSet(); + Set queryParams = new HashSet(); Map headerParams = new HashMap(); Map formParams = new HashMap(); @@ -358,7 +358,7 @@ public class PetApi { .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); // query params - Set queryParams = new HashSet(); + Set queryParams = new HashSet(); Map headerParams = new HashMap(); Map formParams = new HashMap(); @@ -436,7 +436,7 @@ public class PetApi { .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); // query params - Set queryParams = new HashSet(); + Set queryParams = new HashSet(); Map headerParams = new HashMap(); Map formParams = new HashMap(); @@ -503,7 +503,7 @@ public class PetApi { .replaceAll("\\{" + "petId" + "\\}", apiClient.escapeString(petId.toString())); // query params - Set queryParams = new HashSet(); + Set queryParams = new HashSet(); Map headerParams = new HashMap(); Map formParams = new HashMap(); diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/api/StoreApi.java b/samples/client/petstore/java/src/main/java/io/swagger/client/api/StoreApi.java index f15b7140a5c..a94a57990c3 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/api/StoreApi.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/api/StoreApi.java @@ -3,7 +3,7 @@ package io.swagger.client.api; import io.swagger.client.ApiException; import io.swagger.client.ApiClient; import io.swagger.client.Configuration; -import io.swagger.client.QueryParam; +import io.swagger.client.Pair; import io.swagger.client.model.*; @@ -54,7 +54,7 @@ public class StoreApi { String path = "/store/inventory".replaceAll("\\{format\\}","json"); // query params - Set queryParams = new HashSet(); + Set queryParams = new HashSet(); Map headerParams = new HashMap(); Map formParams = new HashMap(); @@ -111,7 +111,7 @@ public class StoreApi { String path = "/store/order".replaceAll("\\{format\\}","json"); // query params - Set queryParams = new HashSet(); + Set queryParams = new HashSet(); Map headerParams = new HashMap(); Map formParams = new HashMap(); @@ -174,7 +174,7 @@ public class StoreApi { .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString())); // query params - Set queryParams = new HashSet(); + Set queryParams = new HashSet(); Map headerParams = new HashMap(); Map formParams = new HashMap(); @@ -237,7 +237,7 @@ public class StoreApi { .replaceAll("\\{" + "orderId" + "\\}", apiClient.escapeString(orderId.toString())); // query params - Set queryParams = new HashSet(); + Set queryParams = new HashSet(); Map headerParams = new HashMap(); Map formParams = new HashMap(); diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/api/UserApi.java b/samples/client/petstore/java/src/main/java/io/swagger/client/api/UserApi.java index a0c977c7256..4a3a69fe3e4 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/api/UserApi.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/api/UserApi.java @@ -3,7 +3,7 @@ package io.swagger.client.api; import io.swagger.client.ApiException; import io.swagger.client.ApiClient; import io.swagger.client.Configuration; -import io.swagger.client.QueryParam; +import io.swagger.client.Pair; import io.swagger.client.model.*; @@ -55,7 +55,7 @@ public class UserApi { String path = "/user".replaceAll("\\{format\\}","json"); // query params - Set queryParams = new HashSet(); + Set queryParams = new HashSet(); Map headerParams = new HashMap(); Map formParams = new HashMap(); @@ -112,7 +112,7 @@ public class UserApi { String path = "/user/createWithArray".replaceAll("\\{format\\}","json"); // query params - Set queryParams = new HashSet(); + Set queryParams = new HashSet(); Map headerParams = new HashMap(); Map formParams = new HashMap(); @@ -169,7 +169,7 @@ public class UserApi { String path = "/user/createWithList".replaceAll("\\{format\\}","json"); // query params - Set queryParams = new HashSet(); + Set queryParams = new HashSet(); Map headerParams = new HashMap(); Map formParams = new HashMap(); @@ -227,7 +227,7 @@ public class UserApi { String path = "/user/login".replaceAll("\\{format\\}","json"); // query params - Set queryParams = new HashSet(); + Set queryParams = new HashSet(); Map headerParams = new HashMap(); Map formParams = new HashMap(); @@ -287,7 +287,7 @@ public class UserApi { String path = "/user/logout".replaceAll("\\{format\\}","json"); // query params - Set queryParams = new HashSet(); + Set queryParams = new HashSet(); Map headerParams = new HashMap(); Map formParams = new HashMap(); @@ -350,7 +350,7 @@ public class UserApi { .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); // query params - Set queryParams = new HashSet(); + Set queryParams = new HashSet(); Map headerParams = new HashMap(); Map formParams = new HashMap(); @@ -414,7 +414,7 @@ public class UserApi { .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); // query params - Set queryParams = new HashSet(); + Set queryParams = new HashSet(); Map headerParams = new HashMap(); Map formParams = new HashMap(); @@ -477,7 +477,7 @@ public class UserApi { .replaceAll("\\{" + "username" + "\\}", apiClient.escapeString(username.toString())); // query params - Set queryParams = new HashSet(); + Set queryParams = new HashSet(); Map headerParams = new HashMap(); Map formParams = new HashMap(); diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/ApiKeyAuth.java b/samples/client/petstore/java/src/main/java/io/swagger/client/auth/ApiKeyAuth.java index d72432ce2e9..edd98a16414 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/ApiKeyAuth.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/auth/ApiKeyAuth.java @@ -1,6 +1,6 @@ package io.swagger.client.auth; -import io.swagger.client.QueryParam; +import io.swagger.client.Pair; import java.util.Map; import java.util.Set; @@ -42,7 +42,7 @@ public class ApiKeyAuth implements Authentication { } @Override - public void applyToParams(Set queryParams, Map headerParams) { + public void applyToParams(Set queryParams, Map headerParams) { String value; if (apiKeyPrefix != null) { value = apiKeyPrefix + " " + apiKey; @@ -50,7 +50,7 @@ public class ApiKeyAuth implements Authentication { value = apiKey; } if (location == "query") { - queryParams.add(new QueryParam(paramName, value)); + queryParams.add(new Pair(paramName, value)); } else if (location == "header") { headerParams.put(paramName, value); } diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/Authentication.java b/samples/client/petstore/java/src/main/java/io/swagger/client/auth/Authentication.java index 4f661852f34..32e61103cd7 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/Authentication.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/auth/Authentication.java @@ -1,11 +1,11 @@ package io.swagger.client.auth; -import io.swagger.client.QueryParam; +import io.swagger.client.Pair; import java.util.Map; import java.util.Set; public interface Authentication { /** Apply authentication settings to header and query params. */ - void applyToParams(Set queryParams, Map headerParams); + void applyToParams(Set queryParams, Map headerParams); } diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/HttpBasicAuth.java b/samples/client/petstore/java/src/main/java/io/swagger/client/auth/HttpBasicAuth.java index 4beaee8b675..0f2428222ac 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/HttpBasicAuth.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/auth/HttpBasicAuth.java @@ -1,6 +1,6 @@ package io.swagger.client.auth; -import io.swagger.client.QueryParam; +import io.swagger.client.Pair; import java.util.Map; import java.util.Set; @@ -29,7 +29,7 @@ public class HttpBasicAuth implements Authentication { } @Override - public void applyToParams(Set queryParams, Map headerParams) { + public void applyToParams(Set queryParams, Map headerParams) { String str = (username == null ? "" : username) + ":" + (password == null ? "" : password); try { headerParams.put("Authorization", "Basic " + DatatypeConverter.printBase64Binary(str.getBytes("UTF-8"))); diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/OAuth.java b/samples/client/petstore/java/src/main/java/io/swagger/client/auth/OAuth.java index b754567564f..e0b8f942b39 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/auth/OAuth.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/auth/OAuth.java @@ -1,13 +1,13 @@ package io.swagger.client.auth; -import io.swagger.client.QueryParam; +import io.swagger.client.Pair; import java.util.Map; import java.util.Set; public class OAuth implements Authentication { @Override - public void applyToParams(Set queryParams, Map headerParams) { + public void applyToParams(Set queryParams, Map headerParams) { // TODO: support oauth } } diff --git a/samples/client/petstore/java/src/test/java/io/swagger/client/auth/ApiKeyAuthTest.java b/samples/client/petstore/java/src/test/java/io/swagger/client/auth/ApiKeyAuthTest.java index e99f310f94f..1f0c150cabb 100644 --- a/samples/client/petstore/java/src/test/java/io/swagger/client/auth/ApiKeyAuthTest.java +++ b/samples/client/petstore/java/src/test/java/io/swagger/client/auth/ApiKeyAuthTest.java @@ -5,7 +5,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import io.swagger.client.QueryParam; +import io.swagger.client.Pair; import org.junit.*; import static org.junit.Assert.*; @@ -13,7 +13,7 @@ import static org.junit.Assert.*; public class ApiKeyAuthTest { @Test public void testApplyToParamsInQuery() { - Set queryParams = new HashSet(); + Set queryParams = new HashSet(); Map headerParams = new HashMap(); ApiKeyAuth auth = new ApiKeyAuth("query", "api_key"); @@ -21,7 +21,7 @@ public class ApiKeyAuthTest { auth.applyToParams(queryParams, headerParams); assertEquals(1, queryParams.size()); - for (QueryParam queryParam : queryParams) { + for (Pair queryParam : queryParams) { assertEquals("my-api-key", queryParam.getValue()); } @@ -31,7 +31,7 @@ public class ApiKeyAuthTest { @Test public void testApplyToParamsInHeaderWithPrefix() { - Set queryParams = new HashSet(); + Set queryParams = new HashSet(); Map headerParams = new HashMap(); ApiKeyAuth auth = new ApiKeyAuth("header", "X-API-TOKEN"); diff --git a/samples/client/petstore/java/src/test/java/io/swagger/client/auth/HttpBasicAuthTest.java b/samples/client/petstore/java/src/test/java/io/swagger/client/auth/HttpBasicAuthTest.java index 5125abce49b..562daa5ba89 100644 --- a/samples/client/petstore/java/src/test/java/io/swagger/client/auth/HttpBasicAuthTest.java +++ b/samples/client/petstore/java/src/test/java/io/swagger/client/auth/HttpBasicAuthTest.java @@ -5,7 +5,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import io.swagger.client.QueryParam; +import io.swagger.client.Pair; import org.junit.*; import static org.junit.Assert.*; @@ -20,7 +20,7 @@ public class HttpBasicAuthTest { @Test public void testApplyToParams() { - Set queryParams = new HashSet(); + Set queryParams = new HashSet(); Map headerParams = new HashMap(); auth.setUsername("my-username");