Skip to content

Introduce getURI(String) method to convert a String to a URI. #779

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

Merged
merged 1 commit into from
Jan 4, 2015
Merged

Introduce getURI(String) method to convert a String to a URI. #779

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
28 changes: 19 additions & 9 deletions library/src/main/java/com/loopj/android/http/AsyncHttpClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,7 +954,7 @@ public RequestHandle post(Context context, String url, RequestParams params, Res
* @return RequestHandle of future request process
*/
public RequestHandle post(Context context, String url, HttpEntity entity, String contentType, ResponseHandlerInterface responseHandler) {
return sendRequest(httpClient, httpContext, addEntityToRequestBase(new HttpPost(URI.create(url).normalize()), entity), contentType, responseHandler, context);
return sendRequest(httpClient, httpContext, addEntityToRequestBase(new HttpPost(getURI(url)), entity), contentType, responseHandler, context);
}

/**
Expand All @@ -972,7 +972,7 @@ public RequestHandle post(Context context, String url, HttpEntity entity, String
*/
public RequestHandle post(Context context, String url, Header[] headers, RequestParams params, String contentType,
ResponseHandlerInterface responseHandler) {
HttpEntityEnclosingRequestBase request = new HttpPost(URI.create(url).normalize());
HttpEntityEnclosingRequestBase request = new HttpPost(getURI(url));
if (params != null) request.setEntity(paramsToEntity(params, responseHandler));
if (headers != null) request.setHeaders(headers);
return sendRequest(httpClient, httpContext, request, contentType,
Expand All @@ -996,7 +996,7 @@ public RequestHandle post(Context context, String url, Header[] headers, Request
*/
public RequestHandle post(Context context, String url, Header[] headers, HttpEntity entity, String contentType,
ResponseHandlerInterface responseHandler) {
HttpEntityEnclosingRequestBase request = addEntityToRequestBase(new HttpPost(URI.create(url).normalize()), entity);
HttpEntityEnclosingRequestBase request = addEntityToRequestBase(new HttpPost(getURI(url)), entity);
if (headers != null) request.setHeaders(headers);
return sendRequest(httpClient, httpContext, request, contentType, responseHandler, context);
}
Expand Down Expand Up @@ -1055,7 +1055,7 @@ public RequestHandle put(Context context, String url, RequestParams params, Resp
* @return RequestHandle of future request process
*/
public RequestHandle put(Context context, String url, HttpEntity entity, String contentType, ResponseHandlerInterface responseHandler) {
return sendRequest(httpClient, httpContext, addEntityToRequestBase(new HttpPut(URI.create(url).normalize()), entity), contentType, responseHandler, context);
return sendRequest(httpClient, httpContext, addEntityToRequestBase(new HttpPut(getURI(url)), entity), contentType, responseHandler, context);
}

/**
Expand All @@ -1074,7 +1074,7 @@ public RequestHandle put(Context context, String url, HttpEntity entity, String
* @return RequestHandle of future request process
*/
public RequestHandle put(Context context, String url, Header[] headers, HttpEntity entity, String contentType, ResponseHandlerInterface responseHandler) {
HttpEntityEnclosingRequestBase request = addEntityToRequestBase(new HttpPut(URI.create(url).normalize()), entity);
HttpEntityEnclosingRequestBase request = addEntityToRequestBase(new HttpPut(getURI(url)), entity);
if (headers != null) request.setHeaders(headers);
return sendRequest(httpClient, httpContext, request, contentType, responseHandler, context);
}
Expand Down Expand Up @@ -1124,7 +1124,7 @@ public RequestHandle patch(Context context, String url, RequestParams params, Re
* @return RequestHandle of future request process
*/
public RequestHandle patch(Context context, String url, HttpEntity entity, String contentType, ResponseHandlerInterface responseHandler) {
return sendRequest(httpClient, httpContext, addEntityToRequestBase(new HttpPatch(URI.create(url).normalize()), entity), contentType, responseHandler, context);
return sendRequest(httpClient, httpContext, addEntityToRequestBase(new HttpPatch(getURI(url)), entity), contentType, responseHandler, context);
}

/**
Expand All @@ -1143,7 +1143,7 @@ public RequestHandle patch(Context context, String url, HttpEntity entity, Strin
* @return RequestHandle of future request process
*/
public RequestHandle patch(Context context, String url, Header[] headers, HttpEntity entity, String contentType, ResponseHandlerInterface responseHandler) {
HttpEntityEnclosingRequestBase request = addEntityToRequestBase(new HttpPatch(URI.create(url).normalize()), entity);
HttpEntityEnclosingRequestBase request = addEntityToRequestBase(new HttpPatch(getURI(url)), entity);
if (headers != null) request.setHeaders(headers);
return sendRequest(httpClient, httpContext, request, contentType, responseHandler, context);
}
Expand Down Expand Up @@ -1171,7 +1171,7 @@ public RequestHandle delete(String url, ResponseHandlerInterface responseHandler
* @return RequestHandle of future request process
*/
public RequestHandle delete(Context context, String url, ResponseHandlerInterface responseHandler) {
final HttpDelete delete = new HttpDelete(URI.create(url).normalize());
final HttpDelete delete = new HttpDelete(getURI(url));
return sendRequest(httpClient, httpContext, delete, null, responseHandler, context);
}

Expand All @@ -1185,7 +1185,7 @@ public RequestHandle delete(Context context, String url, ResponseHandlerInterfac
* @return RequestHandle of future request process
*/
public RequestHandle delete(Context context, String url, Header[] headers, ResponseHandlerInterface responseHandler) {
final HttpDelete delete = new HttpDelete(URI.create(url).normalize());
final HttpDelete delete = new HttpDelete(getURI(url));
if (headers != null) delete.setHeaders(headers);
return sendRequest(httpClient, httpContext, delete, null, responseHandler, context);
}
Expand Down Expand Up @@ -1299,6 +1299,16 @@ protected RequestHandle sendRequest(DefaultHttpClient client, HttpContext httpCo
return requestHandle;
}

/**
* Returns a {@link URI} instance for the specified, absolute URL string.
*
* @param url absolute URL string, containing scheme, host and path
* @return URI instance for the URL string
*/
protected URI getURI(String url) {
return URI.create(url).normalize();
}

/**
* Sets state of URL encoding feature, see bug #227, this method allows you to turn off and on
* this auto-magic feature on-demand.
Expand Down