Apache
/
httpcomponents-client
mirror of https://github.com/apache/httpcomponents-client.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HTTPCLIENT-746: Alternative URL coding methods 

Contributed by Stojce Dimski <sdmiski at yahoo.it>
Reviewed by Oleg Kalnichevski


git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@635111 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Oleg Kalnichevski 2008-03-08 23:21:03 +00:00
parent 8f53912519
commit f25c8c1f77
2 changed files with 92 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
module-client/src/main/java/org/apache/http/client/methods/UrlEncodedFormEntity.java
View File

@ -30,69 +30,45 @@
package org.apache.http.client.methods;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.io.UnsupportedEncodingException;
import java.util.List;
import java.util.Map;
import org.apache.http.Header;
import org.apache.http.NameValuePair;
import org.apache.http.client.utils.URLUtils;
import org.apache.http.entity.AbstractHttpEntity;
import org.apache.http.message.BasicHeader;
import org.apache.http.entity.StringEntity;
import org.apache.http.protocol.HTTP;
import org.apache.http.util.EncodingUtils;
public class UrlEncodedFormEntity extends AbstractHttpEntity {
public class UrlEncodedFormEntity extends StringEntity {
/** The Content-Type for www-form-urlencoded. */
public static final String FORM_URL_ENCODED_CONTENT_TYPE =
"application/x-www-form-urlencoded";
private final byte[] content;
public UrlEncodedFormEntity(
final NameValuePair[] fields,
final String charset) throws UnsupportedEncodingException {
super();
String s = URLUtils.formUrlEncode(fields, charset);
this.content = EncodingUtils.getAsciiBytes(s);
super(URLUtils.formUrlEncode(fields, charset), charset);
setContentType(FORM_URL_ENCODED_CONTENT_TYPE);
}
public UrlEncodedFormEntity(final NameValuePair[] fields) {
super();
String s = URLUtils.simpleFormUrlEncode(fields, HTTP.UTF_8);
this.content = EncodingUtils.getAsciiBytes(s);
public UrlEncodedFormEntity(
final NameValuePair[] fields) throws UnsupportedEncodingException {
super(URLUtils.formUrlEncode(fields, HTTP.UTF_8), HTTP.US_ASCII);
setContentType(FORM_URL_ENCODED_CONTENT_TYPE);
}
public boolean isRepeatable() {
return true;
public UrlEncodedFormEntity (
final Map<String, List<String>> parameters,
final String charset) throws UnsupportedEncodingException {
super(URLUtils.format(parameters, charset), HTTP.US_ASCII);
setContentType(FORM_URL_ENCODED_CONTENT_TYPE);
}
public long getContentLength() {
return this.content.length;
}
public InputStream getContent() throws IOException {
return new ByteArrayInputStream(this.content);
public UrlEncodedFormEntity (
final Map<String, List<String>> parameters) throws UnsupportedEncodingException {
super(URLUtils.format(parameters, HTTP.UTF_8), HTTP.US_ASCII);
setContentType(FORM_URL_ENCODED_CONTENT_TYPE);
}
@Override
public Header getContentType() {
return new BasicHeader(HTTP.CONTENT_TYPE, FORM_URL_ENCODED_CONTENT_TYPE);
}
public boolean isStreaming() {
return false;
}
public void writeTo(final OutputStream outstream) throws IOException {
if (outstream == null) {
throw new IllegalArgumentException("Output stream may not be null");
}
outstream.write(this.content);
outstream.flush();
}
}

78
module-client/src/main/java/org/apache/http/client/utils/URLUtils.java
View File

@ -32,10 +32,18 @@ package org.apache.http.client.utils;
import java.io.UnsupportedEncodingException;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URLDecoder;
import java.net.URLEncoder;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Scanner;
import java.util.TreeMap;
import org.apache.commons.codec.net.URLCodec;
import org.apache.http.HttpHost;
import org.apache.http.NameValuePair;
import org.apache.http.protocol.HTTP;
/**
* The home for utility methods that handle various URL encoding tasks.
@ -49,6 +57,8 @@ public class URLUtils {
/** Default content encoding chatset */
private static final String DEFAULT_CHARSET = "ISO-8859-1";
private static final String PARAMETER_SEPARATOR = "&";
private static final String NAME_VALUE_SEPARATOR = "=";
/**
* Form-urlencoding routine.
@ -109,23 +119,81 @@ public class URLUtils {
final String charset) throws UnsupportedEncodingException {
StringBuilder buf = new StringBuilder();
for (int i = 0; i < pairs.length; i++) {
URLCodec codec = new URLCodec();
NameValuePair pair = pairs[i];
if (pair.getName() != null) {
if (i > 0) {
buf.append("&");
}
buf.append(codec.encode(pair.getName(), charset));
buf.append(URLEncoder.encode(pair.getName(), charset));
buf.append("=");
if (pair.getValue() != null) {
buf.append(codec.encode(pair.getValue(), charset));
buf.append(URLEncoder.encode(pair.getValue(), charset));
}
}
}
return buf.toString();
}
public static URI createURI(
public static Map <String, List <String>> parse (
final URI uri,
String charset) throws UnsupportedEncodingException {
Map <String, List <String>> result = Collections.emptyMap();
final String query = uri.getRawQuery();
if (query != null && query.length() > 0) {
result = new TreeMap <String, List <String>>();
parse(result, new Scanner(query), charset);
}
return result;
}
public static void parse (
final Map <String, List <String>> result,
final Scanner scanner, String charset) throws UnsupportedEncodingException {
if (charset == null) {
charset = HTTP.DEFAULT_CONTENT_CHARSET;
}
scanner.useDelimiter(PARAMETER_SEPARATOR);
while (scanner.hasNext()) {
final String[] nameValue = scanner.next().split(NAME_VALUE_SEPARATOR);
if (nameValue.length == 0 || nameValue.length > 2)
throw new IllegalArgumentException("bad parameter");
final String name = URLDecoder.decode(nameValue[0], charset);
if (nameValue.length == 2) {
if (!result.containsKey(name))
result.put(name, new LinkedList <String>());
String value = null;
final List <String> values = result.get(name);
value = URLDecoder.decode(nameValue[1], charset);
values.add(value);
}
}
}
public static String format (
final Map <String, List <String>> parameters,
String charset) throws UnsupportedEncodingException {
if (charset == null) {
charset = HTTP.DEFAULT_CONTENT_CHARSET;
}
final StringBuilder result = new StringBuilder(64);
for (final String name : parameters.keySet()) {
final List <? extends String> values = parameters.get(name);
if (values != null) {
final String encodedName = URLEncoder.encode(name, charset);
for (final String value : values) {
if (result.length() > 0)
result.append(PARAMETER_SEPARATOR);
final String encodedValue = URLEncoder.encode(value, charset);
result.append(encodedName);
result.append(NAME_VALUE_SEPARATOR);
result.append(encodedValue);
}
}
}
return result.toString();
}
public static URI createURI(
final String scheme,
final String host,
int port,