Skip to content
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.

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

Allow for nested params #147

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
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
54 changes: 48 additions & 6 deletions lib/src/main/java/com/github/kevinsawicki/http/HttpRequest.java
Original file line number Diff line number Diff line change
Expand Up @@ -3141,6 +3141,25 @@ public HttpRequest form(final Object name, final Object value)
*/
public HttpRequest form(final Object name, final Object value, String charset)
throws HttpRequestException {
List<Object> names = new ArrayList<Object>();
names.add(name);
return form(names, value, charset);
}

/**
* Write the name/value pair as form data to the request body
* <p>
* The values specified will be URL-encoded and sent with the
* 'application/x-www-form-urlencoded' content-type
*
* @param names Name of param, as a list of ancestors
* @param value
* @param charset
* @return this request
* @throws HttpRequestException
*/
public HttpRequest form(final List<Object> names, final Object value, String charset)
throws HttpRequestException {
final boolean first = !form;
if (first) {
contentType(CONTENT_TYPE_FORM, charset);
Expand All @@ -3149,12 +3168,35 @@ public HttpRequest form(final Object name, final Object value, String charset)
charset = getValidCharset(charset);
try {
openOutput();
if (!first)
output.write('&');
output.write(URLEncoder.encode(name.toString(), charset));
output.write('=');
if (value != null)
output.write(URLEncoder.encode(value.toString(), charset));
if (value instanceof List<?>) {
names.add("");
for (Object item : (List<Object>)value)
form(names, item, charset);
names.remove(names.size() - 1);
} else if (value instanceof Map<?, ?>) {
for (Entry<Object, Object> entry : ((Map<Object, Object>)value).entrySet()) {
names.add(entry.getKey());
form(names, entry.getValue(), charset);
names.remove(names.size() - 1);
}
} else {
if (!first)
output.write('&');

boolean firstName = true;
for (Object name : names) {
if (!firstName)
output.write('[');
output.write(URLEncoder.encode(name.toString(), charset));
if (!firstName)
output.write(']');
firstName = false;
}

output.write('=');
if (value != null)
output.write(URLEncoder.encode(value.toString(), charset));
}
} catch (IOException e) {
throw new HttpRequestException(e);
}
Expand Down