Return-Path: X-Original-To: apmail-hc-commits-archive@www.apache.org Delivered-To: apmail-hc-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B6A9910461 for ; Thu, 19 Dec 2013 20:20:42 +0000 (UTC) Received: (qmail 88318 invoked by uid 500); 19 Dec 2013 20:20:42 -0000 Delivered-To: apmail-hc-commits-archive@hc.apache.org Received: (qmail 88235 invoked by uid 500); 19 Dec 2013 20:20:42 -0000 Mailing-List: contact commits-help@hc.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "HttpComponents Project" Delivered-To: mailing list commits@hc.apache.org Received: (qmail 88226 invoked by uid 99); 19 Dec 2013 20:20:42 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Dec 2013 20:20:42 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Dec 2013 20:20:36 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9D0F8238890B for ; Thu, 19 Dec 2013 20:20:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1552414 [2/6] - in /httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http: ./ auth/ auth/params/ client/ client/entity/ client/methods/ client/params/ client/protocol/ client/utils/ conn/ conn/params/ conn/ro... Date: Thu, 19 Dec 2013 20:20:09 -0000 To: commits@hc.apache.org From: olegk@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131219202016.9D0F8238890B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpDeleteHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpDelete.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpDeleteHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpDeleteHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpDelete.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpDelete.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpDeleteHC4.java Thu Dec 19 20:20:02 2013 @@ -46,17 +46,17 @@ import org.apache.http.annotation.NotThr * * @since 4.0 */ -@NotThreadSafe // HttpRequestBase is @NotThreadSafe -public class HttpDelete extends HttpRequestBase { +@NotThreadSafe // HttpRequestBaseHC4 is @NotThreadSafe +public class HttpDeleteHC4 extends HttpRequestBaseHC4 { public final static String METHOD_NAME = "DELETE"; - public HttpDelete() { + public HttpDeleteHC4() { super(); } - public HttpDelete(final URI uri) { + public HttpDeleteHC4(final URI uri) { super(); setURI(uri); } @@ -64,7 +64,7 @@ public class HttpDelete extends HttpRequ /** * @throws IllegalArgumentException if the uri is invalid. */ - public HttpDelete(final String uri) { + public HttpDeleteHC4(final String uri) { super(); setURI(URI.create(uri)); } Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBaseHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBaseHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBaseHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBaseHC4.java Thu Dec 19 20:20:02 2013 @@ -31,7 +31,7 @@ import org.apache.http.Header; import org.apache.http.HttpEntity; import org.apache.http.HttpEntityEnclosingRequest; import org.apache.http.annotation.NotThreadSafe; -import org.apache.http.client.utils.CloneUtils; +import org.apache.http.client.utils.CloneUtilsHC4; import org.apache.http.protocol.HTTP; /** @@ -40,13 +40,13 @@ import org.apache.http.protocol.HTTP; * * @since 4.0 */ -@NotThreadSafe // HttpRequestBase is @NotThreadSafe -public abstract class HttpEntityEnclosingRequestBase - extends HttpRequestBase implements HttpEntityEnclosingRequest { +@NotThreadSafe // HttpRequestBaseHC4 is @NotThreadSafe +public abstract class HttpEntityEnclosingRequestBaseHC4 + extends HttpRequestBaseHC4 implements HttpEntityEnclosingRequest { private HttpEntity entity; - public HttpEntityEnclosingRequestBase() { + public HttpEntityEnclosingRequestBaseHC4() { super(); } @@ -65,10 +65,10 @@ public abstract class HttpEntityEnclosin @Override public Object clone() throws CloneNotSupportedException { - final HttpEntityEnclosingRequestBase clone = - (HttpEntityEnclosingRequestBase) super.clone(); + final HttpEntityEnclosingRequestBaseHC4 clone = + (HttpEntityEnclosingRequestBaseHC4) super.clone(); if (this.entity != null) { - clone.entity = CloneUtils.cloneObject(this.entity); + clone.entity = CloneUtilsHC4.cloneObject(this.entity); } return clone; } Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpGetHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpGet.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpGetHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpGetHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpGet.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpGet.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpGetHC4.java Thu Dec 19 20:20:02 2013 @@ -48,15 +48,15 @@ import org.apache.http.annotation.NotThr * @since 4.0 */ @NotThreadSafe -public class HttpGet extends HttpRequestBase { +public class HttpGetHC4 extends HttpRequestBaseHC4 { public final static String METHOD_NAME = "GET"; - public HttpGet() { + public HttpGetHC4() { super(); } - public HttpGet(final URI uri) { + public HttpGetHC4(final URI uri) { super(); setURI(uri); } @@ -64,7 +64,7 @@ public class HttpGet extends HttpRequest /** * @throws IllegalArgumentException if the uri is invalid. */ - public HttpGet(final String uri) { + public HttpGetHC4(final String uri) { super(); setURI(URI.create(uri)); } Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpHeadHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpHead.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpHeadHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpHeadHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpHead.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpHead.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpHeadHC4.java Thu Dec 19 20:20:02 2013 @@ -51,15 +51,15 @@ import org.apache.http.annotation.NotThr * @since 4.0 */ @NotThreadSafe -public class HttpHead extends HttpRequestBase { +public class HttpHeadHC4 extends HttpRequestBaseHC4 { public final static String METHOD_NAME = "HEAD"; - public HttpHead() { + public HttpHeadHC4() { super(); } - public HttpHead(final URI uri) { + public HttpHeadHC4(final URI uri) { super(); setURI(uri); } @@ -67,7 +67,7 @@ public class HttpHead extends HttpReques /** * @throws IllegalArgumentException if the uri is invalid. */ - public HttpHead(final String uri) { + public HttpHeadHC4(final String uri) { super(); setURI(URI.create(uri)); } Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpOptionsHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpOptions.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpOptionsHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpOptionsHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpOptions.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpOptions.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpOptionsHC4.java Thu Dec 19 20:20:02 2013 @@ -56,15 +56,15 @@ import org.apache.http.util.Args; * @since 4.0 */ @NotThreadSafe -public class HttpOptions extends HttpRequestBase { +public class HttpOptionsHC4 extends HttpRequestBaseHC4 { public final static String METHOD_NAME = "OPTIONS"; - public HttpOptions() { + public HttpOptionsHC4() { super(); } - public HttpOptions(final URI uri) { + public HttpOptionsHC4(final URI uri) { super(); setURI(uri); } @@ -72,7 +72,7 @@ public class HttpOptions extends HttpReq /** * @throws IllegalArgumentException if the uri is invalid. */ - public HttpOptions(final String uri) { + public HttpOptionsHC4(final String uri) { super(); setURI(URI.create(uri)); } Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpPatch.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpPatch.java?rev=1552414&r1=1552413&r2=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpPatch.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpPatch.java Thu Dec 19 20:20:02 2013 @@ -49,7 +49,7 @@ import org.apache.http.annotation.NotThr * @since 4.2 */ @NotThreadSafe -public class HttpPatch extends HttpEntityEnclosingRequestBase { +public class HttpPatch extends HttpEntityEnclosingRequestBaseHC4 { public final static String METHOD_NAME = "PATCH"; Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpPostHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpPost.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpPostHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpPostHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpPost.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpPost.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpPostHC4.java Thu Dec 19 20:20:02 2013 @@ -55,15 +55,15 @@ import org.apache.http.annotation.NotThr * @since 4.0 */ @NotThreadSafe -public class HttpPost extends HttpEntityEnclosingRequestBase { +public class HttpPostHC4 extends HttpEntityEnclosingRequestBaseHC4 { public final static String METHOD_NAME = "POST"; - public HttpPost() { + public HttpPostHC4() { super(); } - public HttpPost(final URI uri) { + public HttpPostHC4(final URI uri) { super(); setURI(uri); } @@ -71,7 +71,7 @@ public class HttpPost extends HttpEntity /** * @throws IllegalArgumentException if the uri is invalid. */ - public HttpPost(final String uri) { + public HttpPostHC4(final String uri) { super(); setURI(URI.create(uri)); } Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpPutHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpPut.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpPutHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpPutHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpPut.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpPut.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpPutHC4.java Thu Dec 19 20:20:02 2013 @@ -47,15 +47,15 @@ import org.apache.http.annotation.NotThr * @since 4.0 */ @NotThreadSafe -public class HttpPut extends HttpEntityEnclosingRequestBase { +public class HttpPutHC4 extends HttpEntityEnclosingRequestBaseHC4 { public final static String METHOD_NAME = "PUT"; - public HttpPut() { + public HttpPutHC4() { super(); } - public HttpPut(final URI uri) { + public HttpPutHC4(final URI uri) { super(); setURI(uri); } @@ -63,7 +63,7 @@ public class HttpPut extends HttpEntityE /** * @throws IllegalArgumentException if the uri is invalid. */ - public HttpPut(final String uri) { + public HttpPutHC4(final String uri) { super(); setURI(URI.create(uri)); } Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpRequestBaseHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpRequestBase.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpRequestBaseHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpRequestBaseHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpRequestBase.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpRequestBase.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpRequestBaseHC4.java Thu Dec 19 20:20:02 2013 @@ -43,7 +43,7 @@ import org.apache.http.params.HttpProtoc */ @SuppressWarnings("deprecation") @NotThreadSafe -public abstract class HttpRequestBase extends AbstractExecutionAwareRequest +public abstract class HttpRequestBaseHC4 extends AbstractExecutionAwareRequest implements HttpUriRequest, Configurable { private ProtocolVersion version; Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpTraceHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpTrace.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpTraceHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpTraceHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpTrace.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpTrace.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/HttpTraceHC4.java Thu Dec 19 20:20:02 2013 @@ -50,15 +50,15 @@ import org.apache.http.annotation.NotThr * @since 4.0 */ @NotThreadSafe -public class HttpTrace extends HttpRequestBase { +public class HttpTraceHC4 extends HttpRequestBaseHC4 { public final static String METHOD_NAME = "TRACE"; - public HttpTrace() { + public HttpTraceHC4() { super(); } - public HttpTrace(final URI uri) { + public HttpTraceHC4(final URI uri) { super(); setURI(uri); } @@ -66,7 +66,7 @@ public class HttpTrace extends HttpReque /** * @throws IllegalArgumentException if the uri is invalid. */ - public HttpTrace(final String uri) { + public HttpTraceHC4(final String uri) { super(); setURI(URI.create(uri)); } Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/RequestBuilder.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/RequestBuilder.java?rev=1552414&r1=1552413&r2=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/RequestBuilder.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/methods/RequestBuilder.java Thu Dec 19 20:20:02 2013 @@ -29,6 +29,7 @@ package org.apache.http.client.methods; import java.net.URI; import java.net.URISyntaxException; +import java.nio.charset.Charset; import java.util.ArrayList; import java.util.LinkedList; import java.util.List; @@ -42,7 +43,7 @@ import org.apache.http.NameValuePair; import org.apache.http.ProtocolVersion; import org.apache.http.annotation.NotThreadSafe; import org.apache.http.client.config.RequestConfig; -import org.apache.http.client.entity.UrlEncodedFormEntity; +import org.apache.http.client.entity.UrlEncodedFormEntityHC4; import org.apache.http.client.utils.URIBuilder; import org.apache.http.message.BasicHeader; import org.apache.http.message.BasicNameValuePair; @@ -57,7 +58,7 @@ import org.apache.http.util.Args; * of the request: if the request has a content entity explicitly set with * {@link #setEntity(org.apache.http.HttpEntity)} or it is not an entity enclosing method * (such as POST or PUT), parameters will be added to the query component of the request URI. - * Otherwise, parameters will be added as a URL encoded {@link UrlEncodedFormEntity entity}. + * Otherwise, parameters will be added as a URL encoded {@link UrlEncodedFormEntityHC4 entity}. * * @since 4.3 */ @@ -87,31 +88,31 @@ public class RequestBuilder { } public static RequestBuilder get() { - return new RequestBuilder(HttpGet.METHOD_NAME); + return new RequestBuilder(HttpGetHC4.METHOD_NAME); } public static RequestBuilder head() { - return new RequestBuilder(HttpHead.METHOD_NAME); + return new RequestBuilder(HttpHeadHC4.METHOD_NAME); } public static RequestBuilder post() { - return new RequestBuilder(HttpPost.METHOD_NAME); + return new RequestBuilder(HttpPostHC4.METHOD_NAME); } public static RequestBuilder put() { - return new RequestBuilder(HttpPut.METHOD_NAME); + return new RequestBuilder(HttpPutHC4.METHOD_NAME); } public static RequestBuilder delete() { - return new RequestBuilder(HttpDelete.METHOD_NAME); + return new RequestBuilder(HttpDeleteHC4.METHOD_NAME); } public static RequestBuilder trace() { - return new RequestBuilder(HttpTrace.METHOD_NAME); + return new RequestBuilder(HttpTraceHC4.METHOD_NAME); } public static RequestBuilder options() { - return new RequestBuilder(HttpOptions.METHOD_NAME); + return new RequestBuilder(HttpOptionsHC4.METHOD_NAME); } public static RequestBuilder copy(final HttpRequest request) { @@ -285,13 +286,13 @@ public class RequestBuilder { } public HttpUriRequest build() { - final HttpRequestBase result; + final HttpRequestBaseHC4 result; URI uri = this.uri != null ? this.uri : URI.create("/"); HttpEntity entity = this.entity; if (parameters != null && !parameters.isEmpty()) { - if (entity == null && (HttpPost.METHOD_NAME.equalsIgnoreCase(method) - || HttpPut.METHOD_NAME.equalsIgnoreCase(method))) { - entity = new UrlEncodedFormEntity(parameters, HTTP.DEF_CONTENT_CHARSET); + if (entity == null && (HttpPostHC4.METHOD_NAME.equalsIgnoreCase(method) + || HttpPutHC4.METHOD_NAME.equalsIgnoreCase(method))) { + entity = new UrlEncodedFormEntityHC4(parameters, Charset.forName(HTTP.DEFAULT_CONTENT_CHARSET)); } else { try { uri = new URIBuilder(uri).addParameters(parameters).build(); @@ -316,7 +317,7 @@ public class RequestBuilder { return result; } - static class InternalRequest extends HttpRequestBase { + static class InternalRequest extends HttpRequestBaseHC4 { private final String method; @@ -332,7 +333,7 @@ public class RequestBuilder { } - static class InternalEntityEclosingRequest extends HttpEntityEnclosingRequestBase { + static class InternalEntityEclosingRequest extends HttpEntityEnclosingRequestBaseHC4 { private final String method; Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/params/HttpClientParamConfig.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/params/HttpClientParamConfig.java?rev=1552414&r1=1552413&r2=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/params/HttpClientParamConfig.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/params/HttpClientParamConfig.java Thu Dec 19 20:20:02 2013 @@ -64,16 +64,10 @@ public final class HttpClientParamConfig ConnRoutePNames.DEFAULT_PROXY)) .setLocalAddress((InetAddress) params.getParameter( ConnRoutePNames.LOCAL_ADDRESS)) - .setProxyPreferredAuthSchemes((Collection) params.getParameter( - AuthPNames.PROXY_AUTH_PREF)) - .setTargetPreferredAuthSchemes((Collection) params.getParameter( - AuthPNames.TARGET_AUTH_PREF)) .setAuthenticationEnabled(params.getBooleanParameter( ClientPNames.HANDLE_AUTHENTICATION, true)) .setCircularRedirectsAllowed(params.getBooleanParameter( ClientPNames.ALLOW_CIRCULAR_REDIRECTS, false)) - .setConnectionRequestTimeout(params.getIntParameter( - ClientPNames.CONN_MANAGER_TIMEOUT, 0)) .setCookieSpec((String) params.getParameter( ClientPNames.COOKIE_POLICY)) .setMaxRedirects(params.getIntParameter( Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/protocol/HttpClientContext.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/protocol/HttpClientContext.java?rev=1552414&r1=1552413&r2=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/protocol/HttpClientContext.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/protocol/HttpClientContext.java Thu Dec 19 20:20:02 2013 @@ -32,7 +32,7 @@ import java.util.List; import org.apache.http.annotation.NotThreadSafe; import org.apache.http.auth.AuthSchemeProvider; -import org.apache.http.auth.AuthState; +import org.apache.http.auth.AuthStateHC4; import org.apache.http.client.AuthCache; import org.apache.http.client.CookieStore; import org.apache.http.client.CredentialsProvider; @@ -43,7 +43,7 @@ import org.apache.http.conn.routing.Rout import org.apache.http.cookie.CookieOrigin; import org.apache.http.cookie.CookieSpec; import org.apache.http.cookie.CookieSpecProvider; -import org.apache.http.protocol.BasicHttpContext; +import org.apache.http.protocol.BasicHttpContextHC4; import org.apache.http.protocol.HttpContext; import org.apache.http.protocol.HttpCoreContext; @@ -144,7 +144,7 @@ public class HttpClientContext extends H } public static HttpClientContext create() { - return new HttpClientContext(new BasicHttpContext()); + return new HttpClientContext(new BasicHttpContextHC4()); } public HttpClientContext(final HttpContext context) { @@ -217,12 +217,12 @@ public class HttpClientContext extends H setAttribute(AUTH_CACHE, authCache); } - public AuthState getTargetAuthState() { - return getAttribute(TARGET_AUTH_STATE, AuthState.class); + public AuthStateHC4 getTargetAuthState() { + return getAttribute(TARGET_AUTH_STATE, AuthStateHC4.class); } - public AuthState getProxyAuthState() { - return getAttribute(PROXY_AUTH_STATE, AuthState.class); + public AuthStateHC4 getProxyAuthState() { + return getAttribute(PROXY_AUTH_STATE, AuthStateHC4.class); } public T getUserToken(final Class clazz) { Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/protocol/RequestAddCookiesHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/protocol/RequestAddCookiesHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/protocol/RequestAddCookiesHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/protocol/RequestAddCookiesHC4.java Thu Dec 19 20:20:02 2013 @@ -65,11 +65,11 @@ import org.apache.http.util.TextUtils; * @since 4.0 */ @Immutable -public class RequestAddCookies implements HttpRequestInterceptor { +public class RequestAddCookiesHC4 implements HttpRequestInterceptor { private final Log log = LogFactory.getLog(getClass()); - public RequestAddCookies() { + public RequestAddCookiesHC4() { super(); } Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/protocol/RequestAuthCache.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/protocol/RequestAuthCache.java?rev=1552414&r1=1552413&r2=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/protocol/RequestAuthCache.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/protocol/RequestAuthCache.java Thu Dec 19 20:20:02 2013 @@ -39,7 +39,7 @@ import org.apache.http.annotation.Immuta import org.apache.http.auth.AuthProtocolState; import org.apache.http.auth.AuthScheme; import org.apache.http.auth.AuthScope; -import org.apache.http.auth.AuthState; +import org.apache.http.auth.AuthStateHC4; import org.apache.http.auth.Credentials; import org.apache.http.client.AuthCache; import org.apache.http.client.CredentialsProvider; @@ -91,7 +91,7 @@ public class RequestAuthCache implements target.getSchemeName()); } - final AuthState targetState = clientContext.getTargetAuthState(); + final AuthStateHC4 targetState = clientContext.getTargetAuthState(); if (targetState != null && targetState.getState() == AuthProtocolState.UNCHALLENGED) { final AuthScheme authScheme = authCache.get(target); if (authScheme != null) { @@ -100,7 +100,7 @@ public class RequestAuthCache implements } final HttpHost proxy = route.getProxyHost(); - final AuthState proxyState = clientContext.getProxyAuthState(); + final AuthStateHC4 proxyState = clientContext.getProxyAuthState(); if (proxy != null && proxyState != null && proxyState.getState() == AuthProtocolState.UNCHALLENGED) { final AuthScheme authScheme = authCache.get(proxy); if (authScheme != null) { @@ -112,14 +112,14 @@ public class RequestAuthCache implements private void doPreemptiveAuth( final HttpHost host, final AuthScheme authScheme, - final AuthState authState, + final AuthStateHC4 authState, final CredentialsProvider credsProvider) { final String schemeName = authScheme.getSchemeName(); if (this.log.isDebugEnabled()) { this.log.debug("Re-using cached '" + schemeName + "' auth scheme for " + host); } - final AuthScope authScope = new AuthScope(host, AuthScope.ANY_REALM, schemeName); + final AuthScope authScope = new AuthScope(host.getHostName(), host.getPort(), AuthScope.ANY_REALM, schemeName); final Credentials creds = credsProvider.getCredentials(authScope); if (creds != null) { Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/protocol/RequestDefaultHeadersHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/protocol/RequestDefaultHeadersHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/protocol/RequestDefaultHeadersHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/protocol/RequestDefaultHeadersHC4.java Thu Dec 19 20:20:02 2013 @@ -46,19 +46,19 @@ import org.apache.http.util.Args; */ @SuppressWarnings("deprecation") @Immutable -public class RequestDefaultHeaders implements HttpRequestInterceptor { +public class RequestDefaultHeadersHC4 implements HttpRequestInterceptor { private final Collection defaultHeaders; /** * @since 4.3 */ - public RequestDefaultHeaders(final Collection defaultHeaders) { + public RequestDefaultHeadersHC4(final Collection defaultHeaders) { super(); this.defaultHeaders = defaultHeaders; } - public RequestDefaultHeaders() { + public RequestDefaultHeadersHC4() { this(null); } Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/protocol/ResponseProcessCookiesHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/protocol/ResponseProcessCookiesHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/protocol/ResponseProcessCookiesHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/protocol/ResponseProcessCookiesHC4.java Thu Dec 19 20:20:02 2013 @@ -54,11 +54,11 @@ import org.apache.http.util.Args; * @since 4.0 */ @Immutable -public class ResponseProcessCookies implements HttpResponseInterceptor { +public class ResponseProcessCookiesHC4 implements HttpResponseInterceptor { private final Log log = LogFactory.getLog(getClass()); - public ResponseProcessCookies() { + public ResponseProcessCookiesHC4() { super(); } Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/CloneUtilsHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/CloneUtils.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/CloneUtilsHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/CloneUtilsHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/CloneUtils.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/CloneUtils.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/CloneUtilsHC4.java Thu Dec 19 20:20:02 2013 @@ -37,7 +37,7 @@ import org.apache.http.annotation.Immuta * @since 4.0 */ @Immutable -public class CloneUtils { +public class CloneUtilsHC4 { /** * @since 4.3 @@ -80,7 +80,7 @@ public class CloneUtils { /** * This class should not be instantiated. */ - private CloneUtils() { + private CloneUtilsHC4() { } } Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/HttpClientUtils.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/HttpClientUtils.java?rev=1552414&r1=1552413&r2=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/HttpClientUtils.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/HttpClientUtils.java Thu Dec 19 20:20:02 2013 @@ -33,7 +33,7 @@ import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; import org.apache.http.client.HttpClient; import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.util.EntityUtils; +import org.apache.http.util.EntityUtilsHC4; /** * Convenience methods for closing response and client objects. @@ -72,7 +72,7 @@ public class HttpClientUtils { final HttpEntity entity = response.getEntity(); if (entity != null) { try { - EntityUtils.consume(entity); + EntityUtilsHC4.consume(entity); } catch (final IOException ex) { } } @@ -105,7 +105,7 @@ public class HttpClientUtils { if (response != null) { try { try { - EntityUtils.consume(response.getEntity()); + EntityUtilsHC4.consume(response.getEntity()); } finally { response.close(); } Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/JdkIdnHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/JdkIdn.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/JdkIdnHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/JdkIdnHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/JdkIdn.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/JdkIdn.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/JdkIdnHC4.java Thu Dec 19 20:20:02 2013 @@ -37,14 +37,14 @@ import org.apache.http.annotation.Immuta * @since 4.0 */ @Immutable -public class JdkIdn implements Idn { +public class JdkIdnHC4 implements Idn { private final Method toUnicode; /** * * @throws ClassNotFoundException if java.net.IDN is not available */ - public JdkIdn() throws ClassNotFoundException { + public JdkIdnHC4() throws ClassNotFoundException { final Class clazz = Class.forName("java.net.IDN"); try { toUnicode = clazz.getMethod("toUnicode", String.class); Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/PunycodeHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/Punycode.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/PunycodeHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/PunycodeHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/Punycode.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/Punycode.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/PunycodeHC4.java Thu Dec 19 20:20:02 2013 @@ -29,20 +29,20 @@ package org.apache.http.client.utils; import org.apache.http.annotation.Immutable; /** - * Facade that provides conversion between Unicode and Punycode domain names. + * Facade that provides conversion between Unicode and PunycodeHC4 domain names. * It will use an appropriate implementation. * * @since 4.0 */ @Immutable -public class Punycode { +public class PunycodeHC4 { private static final Idn impl; static { Idn _impl; try { - _impl = new JdkIdn(); + _impl = new JdkIdnHC4(); } catch (final Exception e) { - _impl = new Rfc3492Idn(); + _impl = new Rfc3492IdnHC4(); } impl = _impl; } Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/Rfc3492IdnHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/Rfc3492IdnHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/Rfc3492IdnHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/Rfc3492IdnHC4.java Thu Dec 19 20:20:02 2013 @@ -36,7 +36,7 @@ import org.apache.http.annotation.Immuta * @since 4.0 */ @Immutable -public class Rfc3492Idn implements Idn { +public class Rfc3492IdnHC4 implements Idn { private static final int base = 36; private static final int tmin = 1; private static final int tmax = 26; Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/URIBuilder.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/URIBuilder.java?rev=1552414&r1=1552413&r2=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/URIBuilder.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/URIBuilder.java Thu Dec 19 20:20:02 2013 @@ -36,7 +36,7 @@ import java.util.List; import org.apache.http.Consts; import org.apache.http.NameValuePair; import org.apache.http.annotation.NotThreadSafe; -import org.apache.http.conn.util.InetAddressUtils; +import org.apache.http.conn.util.InetAddressUtilsHC4; import org.apache.http.message.BasicNameValuePair; /** @@ -92,7 +92,7 @@ public class URIBuilder { private List parseQuery(final String query, final Charset charset) { if (query != null && query.length() > 0) { - return URLEncodedUtils.parse(query, charset); + return URLEncodedUtilsHC4.parse(query, charset); } return null; } @@ -121,7 +121,7 @@ public class URIBuilder { } else if (this.userInfo != null) { sb.append(encodeUserInfo(this.userInfo)).append("@"); } - if (InetAddressUtils.isIPv6Address(this.host)) { + if (InetAddressUtilsHC4.isIPv6Address(this.host)) { sb.append("[").append(this.host).append("]"); } else { sb.append(this.host); @@ -168,19 +168,19 @@ public class URIBuilder { } private String encodeUserInfo(final String userInfo) { - return URLEncodedUtils.encUserInfo(userInfo, Consts.UTF_8); + return URLEncodedUtilsHC4.encUserInfo(userInfo, Consts.UTF_8); } private String encodePath(final String path) { - return URLEncodedUtils.encPath(path, Consts.UTF_8); + return URLEncodedUtilsHC4.encPath(path, Consts.UTF_8); } private String encodeUrlForm(final List params) { - return URLEncodedUtils.format(params, Consts.UTF_8); + return URLEncodedUtilsHC4.format(params, Consts.UTF_8); } private String encodeUric(final String fragment) { - return URLEncodedUtils.encUric(fragment, Consts.UTF_8); + return URLEncodedUtilsHC4.encUric(fragment, Consts.UTF_8); } /** @@ -259,7 +259,7 @@ public class URIBuilder { * * @deprecated (4.3) use {@link #setParameters(List)} or {@link #setParameters(NameValuePair...)} * - * @see URLEncodedUtils#parse + * @see URLEncodedUtilsHC4#parse */ @Deprecated public URIBuilder setQuery(final String query) { Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/URIUtilsHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/URIUtils.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/URIUtilsHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/URIUtilsHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/URIUtils.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/URIUtils.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/URIUtilsHC4.java Thu Dec 19 20:20:02 2013 @@ -44,7 +44,7 @@ import org.apache.http.util.TextUtils; * @since 4.0 */ @Immutable -public class URIUtils { +public class URIUtilsHC4 { /** * Constructs a {@link URI} using all the parameters. This should be @@ -156,7 +156,7 @@ public class URIUtils { /** * A convenience method for - * {@link URIUtils#rewriteURI(URI, HttpHost, boolean)} that always keeps the + * {@link URIUtilsHC4#rewriteURI(URI, HttpHost, boolean)} that always keeps the * fragment. */ public static URI rewriteURI( @@ -204,7 +204,7 @@ public class URIUtils { * @return the resulting URI */ public static URI resolve(final URI baseURI, final String reference) { - return URIUtils.resolve(baseURI, URI.create(reference)); + return URIUtilsHC4.resolve(baseURI, URI.create(reference)); } /** @@ -421,7 +421,7 @@ public class URIUtils { /** * This class should not be instantiated. */ - private URIUtils() { + private URIUtilsHC4() { } } Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/URLEncodedUtilsHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/URLEncodedUtilsHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/URLEncodedUtilsHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/URLEncodedUtilsHC4.java Thu Dec 19 20:20:02 2013 @@ -45,12 +45,12 @@ import org.apache.http.HttpEntity; import org.apache.http.NameValuePair; import org.apache.http.annotation.Immutable; import org.apache.http.entity.ContentType; -import org.apache.http.message.BasicHeaderValueParser; +import org.apache.http.message.BasicHeaderValueParserHC4; import org.apache.http.message.BasicNameValuePair; import org.apache.http.message.ParserCursor; import org.apache.http.protocol.HTTP; import org.apache.http.util.CharArrayBuffer; -import org.apache.http.util.EntityUtils; +import org.apache.http.util.EntityUtilsHC4; /** * A collection of utilities for encoding URLs. @@ -58,7 +58,7 @@ import org.apache.http.util.EntityUtils; * @since 4.0 */ @Immutable -public class URLEncodedUtils { +public class URLEncodedUtilsHC4 { /** * The default HTML form content type. @@ -111,11 +111,11 @@ public class URLEncodedUtils { final HttpEntity entity) throws IOException { final ContentType contentType = ContentType.get(entity); if (contentType != null && contentType.getMimeType().equalsIgnoreCase(CONTENT_TYPE)) { - final String content = EntityUtils.toString(entity, Consts.ASCII); + final String content = EntityUtilsHC4.toString(entity, Consts.ASCII); if (content != null && content.length() > 0) { Charset charset = contentType.getCharset(); if (charset == null) { - charset = HTTP.DEF_CONTENT_CHARSET; + charset = Charset.forName(HTTP.DEFAULT_CONTENT_CHARSET); } return parse(content, charset, QP_SEPS); } @@ -243,7 +243,7 @@ public class URLEncodedUtils { if (s == null) { return Collections.emptyList(); } - final BasicHeaderValueParser parser = BasicHeaderValueParser.INSTANCE; + final BasicHeaderValueParserHC4 parser = BasicHeaderValueParserHC4.INSTANCE; final CharArrayBuffer buffer = new CharArrayBuffer(s.length()); buffer.append(s); final ParserCursor cursor = new ParserCursor(0, buffer.length()); Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/EofSensorInputStreamHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/EofSensorInputStream.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/EofSensorInputStreamHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/EofSensorInputStreamHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/EofSensorInputStream.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/EofSensorInputStream.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/EofSensorInputStreamHC4.java Thu Dec 19 20:20:02 2013 @@ -44,7 +44,7 @@ import org.apache.http.util.Args; // don't use FilterInputStream as the base class, we'd have to // override markSupported(), mark(), and reset() to disable them @NotThreadSafe -public class EofSensorInputStream extends InputStream implements ConnectionReleaseTrigger { +public class EofSensorInputStreamHC4 extends InputStream implements ConnectionReleaseTrigger { /** * The wrapped input stream, while accessible. @@ -79,7 +79,7 @@ public class EofSensorInputStream extend * @param watcher the watcher for events, or null for * auto-close behavior without notification */ - public EofSensorInputStream(final InputStream in, + public EofSensorInputStreamHC4(final InputStream in, final EofSensorWatcher watcher) { Args.notNull(in, "Wrapped stream"); wrappedStream = in; Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/AbstractVerifierHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/AbstractVerifierHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/AbstractVerifierHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/AbstractVerifierHC4.java Thu Dec 19 20:20:02 2013 @@ -49,7 +49,7 @@ import javax.net.ssl.SSLSocket; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.http.annotation.Immutable; -import org.apache.http.conn.util.InetAddressUtils; +import org.apache.http.conn.util.InetAddressUtilsHC4; /** * Abstract base class for all standard {@link X509HostnameVerifier} @@ -58,7 +58,7 @@ import org.apache.http.conn.util.InetAdd * @since 4.0 */ @Immutable -public abstract class AbstractVerifier implements X509HostnameVerifier { +public abstract class AbstractVerifierHC4 implements X509HostnameVerifier { /** * This contains a list of 2nd-level domains that aren't allowed to @@ -81,7 +81,7 @@ public abstract class AbstractVerifier i private final Log log = LogFactory.getLog(getClass()); - public AbstractVerifier() { + public AbstractVerifierHC4() { super(); } @@ -374,15 +374,15 @@ public abstract class AbstractVerifier i private static boolean isIPAddress(final String hostname) { return hostname != null && - (InetAddressUtils.isIPv4Address(hostname) || - InetAddressUtils.isIPv6Address(hostname)); + (InetAddressUtilsHC4.isIPv4Address(hostname) || + InetAddressUtilsHC4.isIPv6Address(hostname)); } /* * Check if hostname is IPv6, and if so, convert to standard format. */ private String normaliseIPv6Address(final String hostname) { - if (hostname == null || !InetAddressUtils.isIPv6Address(hostname)) { + if (hostname == null || !InetAddressUtilsHC4.isIPv6Address(hostname)) { return hostname; } try { Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifierHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifierHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifierHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifierHC4.java Thu Dec 19 20:20:02 2013 @@ -37,7 +37,7 @@ import org.apache.http.annotation.Immuta * @since 4.0 */ @Immutable -public class AllowAllHostnameVerifier extends AbstractVerifier { +public class AllowAllHostnameVerifierHC4 extends AbstractVerifierHC4 { public final void verify( final String host, Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifierHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifierHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifierHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifierHC4.java Thu Dec 19 20:20:02 2013 @@ -45,7 +45,7 @@ import org.apache.http.annotation.Immuta * @since 4.0 */ @Immutable -public class BrowserCompatHostnameVerifier extends AbstractVerifier { +public class BrowserCompatHostnameVerifierHC4 extends AbstractVerifierHC4 { public final void verify( final String host, Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java?rev=1552414&r1=1552413&r2=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/SSLConnectionSocketFactory.java Thu Dec 19 20:20:02 2013 @@ -121,13 +121,13 @@ public class SSLConnectionSocketFactory public static final String SSLV2 = "SSLv2"; public static final X509HostnameVerifier ALLOW_ALL_HOSTNAME_VERIFIER - = new AllowAllHostnameVerifier(); + = new AllowAllHostnameVerifierHC4(); public static final X509HostnameVerifier BROWSER_COMPATIBLE_HOSTNAME_VERIFIER - = new BrowserCompatHostnameVerifier(); + = new BrowserCompatHostnameVerifierHC4(); public static final X509HostnameVerifier STRICT_HOSTNAME_VERIFIER - = new StrictHostnameVerifier(); + = new StrictHostnameVerifierHC4(); /** * Obtains default SSL socket factory with an SSL context based on the standard JSSE Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifierHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifierHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifierHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifierHC4.java Thu Dec 19 20:20:02 2013 @@ -52,7 +52,7 @@ import org.apache.http.annotation.Immuta * @since 4.0 */ @Immutable -public class StrictHostnameVerifier extends AbstractVerifier { +public class StrictHostnameVerifierHC4 extends AbstractVerifierHC4 { public final void verify( final String host, Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/util/InetAddressUtilsHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/util/InetAddressUtils.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/util/InetAddressUtilsHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/util/InetAddressUtilsHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/util/InetAddressUtils.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/util/InetAddressUtils.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/conn/util/InetAddressUtilsHC4.java Thu Dec 19 20:20:02 2013 @@ -37,9 +37,9 @@ import org.apache.http.annotation.Immuta * @since 4.0 */ @Immutable -public class InetAddressUtils { +public class InetAddressUtilsHC4 { - private InetAddressUtils() { + private InetAddressUtilsHC4() { } private static final String IPV4_BASIC_PATTERN_STRING = Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/AbstractHttpEntityHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/AbstractHttpEntity.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/AbstractHttpEntityHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/AbstractHttpEntityHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/AbstractHttpEntity.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/AbstractHttpEntity.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/AbstractHttpEntityHC4.java Thu Dec 19 20:20:02 2013 @@ -43,7 +43,7 @@ import org.apache.http.protocol.HTTP; * @since 4.0 */ @NotThreadSafe -public abstract class AbstractHttpEntity implements HttpEntity { +public abstract class AbstractHttpEntityHC4 implements HttpEntity { /** * Buffer size for output stream processing. @@ -61,7 +61,7 @@ public abstract class AbstractHttpEntity * The contentType, contentEncoding and chunked attributes of the created object are set to * null, null and false, respectively. */ - protected AbstractHttpEntity() { + protected AbstractHttpEntityHC4() { super(); } Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/BasicHttpEntityHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/BasicHttpEntity.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/BasicHttpEntityHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/BasicHttpEntityHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/BasicHttpEntity.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/BasicHttpEntity.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/BasicHttpEntityHC4.java Thu Dec 19 20:20:02 2013 @@ -42,7 +42,7 @@ import org.apache.http.util.Asserts; * @since 4.0 */ @NotThreadSafe -public class BasicHttpEntity extends AbstractHttpEntity { +public class BasicHttpEntityHC4 extends AbstractHttpEntityHC4 { private InputStream content; private long length; @@ -52,7 +52,7 @@ public class BasicHttpEntity extends Abs * The content is initially missing, the content length * is set to a negative number. */ - public BasicHttpEntity() { + public BasicHttpEntityHC4() { super(); this.length = -1; } Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/BufferedHttpEntityHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/BufferedHttpEntity.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/BufferedHttpEntityHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/BufferedHttpEntityHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/BufferedHttpEntity.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/BufferedHttpEntity.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/BufferedHttpEntityHC4.java Thu Dec 19 20:20:02 2013 @@ -35,7 +35,7 @@ import java.io.OutputStream; import org.apache.http.HttpEntity; import org.apache.http.annotation.NotThreadSafe; import org.apache.http.util.Args; -import org.apache.http.util.EntityUtils; +import org.apache.http.util.EntityUtilsHC4; /** * A wrapping entity that buffers it content if necessary. @@ -47,7 +47,7 @@ import org.apache.http.util.EntityUtils; * @since 4.0 */ @NotThreadSafe -public class BufferedHttpEntity extends HttpEntityWrapper { +public class BufferedHttpEntityHC4 extends HttpEntityWrapperHC4 { private final byte[] buffer; @@ -57,10 +57,10 @@ public class BufferedHttpEntity extends * @param entity the entity to wrap, not null * @throws IllegalArgumentException if wrapped is null */ - public BufferedHttpEntity(final HttpEntity entity) throws IOException { + public BufferedHttpEntityHC4(final HttpEntity entity) throws IOException { super(entity); if (!entity.isRepeatable() || entity.getContentLength() < 0) { - this.buffer = EntityUtils.toByteArray(entity); + this.buffer = EntityUtilsHC4.toByteArray(entity); } else { this.buffer = null; } @@ -122,4 +122,4 @@ public class BufferedHttpEntity extends return (buffer == null) && super.isStreaming(); } -} // class BufferedHttpEntity +} // class BufferedHttpEntityHC4 Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/ByteArrayEntityHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/ByteArrayEntity.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/ByteArrayEntityHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/ByteArrayEntityHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/ByteArrayEntity.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/ByteArrayEntity.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/ByteArrayEntityHC4.java Thu Dec 19 20:20:02 2013 @@ -41,7 +41,7 @@ import org.apache.http.util.Args; * @since 4.0 */ @NotThreadSafe -public class ByteArrayEntity extends AbstractHttpEntity implements Cloneable { +public class ByteArrayEntityHC4 extends AbstractHttpEntityHC4 implements Cloneable { /** * @deprecated (4.2) @@ -54,7 +54,7 @@ public class ByteArrayEntity extends Abs /** * @since 4.2 */ - public ByteArrayEntity(final byte[] b, final ContentType contentType) { + public ByteArrayEntityHC4(final byte[] b, final ContentType contentType) { super(); Args.notNull(b, "Source byte array"); this.content = b; @@ -69,7 +69,7 @@ public class ByteArrayEntity extends Abs /** * @since 4.2 */ - public ByteArrayEntity(final byte[] b, final int off, final int len, final ContentType contentType) { + public ByteArrayEntityHC4(final byte[] b, final int off, final int len, final ContentType contentType) { super(); Args.notNull(b, "Source byte array"); if ((off < 0) || (off > b.length) || (len < 0) || @@ -85,11 +85,11 @@ public class ByteArrayEntity extends Abs } } - public ByteArrayEntity(final byte[] b) { + public ByteArrayEntityHC4(final byte[] b) { this(b, null); } - public ByteArrayEntity(final byte[] b, final int off, final int len) { + public ByteArrayEntityHC4(final byte[] b, final int off, final int len) { this(b, off, len, null); } @@ -126,4 +126,4 @@ public class ByteArrayEntity extends Abs return super.clone(); } -} // class ByteArrayEntity +} // class ByteArrayEntityHC4 Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/ContentType.java URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/ContentType.java?rev=1552414&r1=1552413&r2=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/ContentType.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/ContentType.java Thu Dec 19 20:20:02 2013 @@ -39,8 +39,8 @@ import org.apache.http.HttpEntity; import org.apache.http.NameValuePair; import org.apache.http.ParseException; import org.apache.http.annotation.Immutable; -import org.apache.http.message.BasicHeaderValueFormatter; -import org.apache.http.message.BasicHeaderValueParser; +import org.apache.http.message.BasicHeaderValueFormatterHC4; +import org.apache.http.message.BasicHeaderValueParserHC4; import org.apache.http.message.ParserCursor; import org.apache.http.util.Args; import org.apache.http.util.CharArrayBuffer; @@ -145,7 +145,7 @@ public final class ContentType implement buf.append(this.mimeType); if (this.params != null) { buf.append("; "); - BasicHeaderValueFormatter.INSTANCE.formatParameters(buf, this.params, false); + BasicHeaderValueFormatterHC4.INSTANCE.formatParameters(buf, this.params, false); } else if (this.charset != null) { buf.append("; charset="); buf.append(this.charset.name()); @@ -226,7 +226,7 @@ public final class ContentType implement final CharArrayBuffer buf = new CharArrayBuffer(s.length()); buf.append(s); final ParserCursor cursor = new ParserCursor(0, s.length()); - final HeaderElement[] elements = BasicHeaderValueParser.INSTANCE.parseElements(buf, cursor); + final HeaderElement[] elements = BasicHeaderValueParserHC4.INSTANCE.parseElements(buf, cursor); if (elements.length > 0) { return create(elements[0]); } else { Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/FileEntityHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/FileEntity.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/FileEntityHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/FileEntityHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/FileEntity.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/FileEntity.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/FileEntityHC4.java Thu Dec 19 20:20:02 2013 @@ -42,15 +42,15 @@ import org.apache.http.util.Args; * @since 4.0 */ @NotThreadSafe -public class FileEntity extends AbstractHttpEntity implements Cloneable { +public class FileEntityHC4 extends AbstractHttpEntityHC4 implements Cloneable { protected final File file; /** - * @deprecated (4.1.3) {@link #FileEntity(File, ContentType)} + * @deprecated (4.1.3) {@link #FileEntityHC4(File, ContentType)} */ @Deprecated - public FileEntity(final File file, final String contentType) { + public FileEntityHC4(final File file, final String contentType) { super(); this.file = Args.notNull(file, "File"); setContentType(contentType); @@ -59,7 +59,7 @@ public class FileEntity extends Abstract /** * @since 4.2 */ - public FileEntity(final File file, final ContentType contentType) { + public FileEntityHC4(final File file, final ContentType contentType) { super(); this.file = Args.notNull(file, "File"); if (contentType != null) { @@ -70,7 +70,7 @@ public class FileEntity extends Abstract /** * @since 4.2 */ - public FileEntity(final File file) { + public FileEntityHC4(final File file) { super(); this.file = Args.notNull(file, "File"); } @@ -118,4 +118,4 @@ public class FileEntity extends Abstract return super.clone(); } -} // class FileEntity +} // class FileEntityHC4 Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/HttpEntityWrapperHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/HttpEntityWrapper.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/HttpEntityWrapperHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/HttpEntityWrapperHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/HttpEntityWrapper.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/HttpEntityWrapper.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/HttpEntityWrapperHC4.java Thu Dec 19 20:20:02 2013 @@ -46,7 +46,7 @@ import org.apache.http.util.Args; * @since 4.0 */ @NotThreadSafe -public class HttpEntityWrapper implements HttpEntity { +public class HttpEntityWrapperHC4 implements HttpEntity { /** The wrapped entity. */ protected HttpEntity wrappedEntity; @@ -54,7 +54,7 @@ public class HttpEntityWrapper implement /** * Creates a new entity wrapper. */ - public HttpEntityWrapper(final HttpEntity wrappedEntity) { + public HttpEntityWrapperHC4(final HttpEntity wrappedEntity) { super(); this.wrappedEntity = Args.notNull(wrappedEntity, "Wrapped entity"); } // constructor Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/InputStreamEntityHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/InputStreamEntity.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/InputStreamEntityHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/InputStreamEntityHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/InputStreamEntity.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/InputStreamEntity.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/InputStreamEntityHC4.java Thu Dec 19 20:20:02 2013 @@ -41,20 +41,20 @@ import org.apache.http.util.Args; * @since 4.0 */ @NotThreadSafe -public class InputStreamEntity extends AbstractHttpEntity { +public class InputStreamEntityHC4 extends AbstractHttpEntityHC4 { private final InputStream content; private final long length; /** * Creates an entity with an unknown length. - * Equivalent to {@code new InputStreamEntity(instream, -1)}. + * Equivalent to {@code new InputStreamEntityHC4(instream, -1)}. * * @param instream input stream * @throws IllegalArgumentException if {@code instream} is {@code null} * @since 4.3 */ - public InputStreamEntity(final InputStream instream) { + public InputStreamEntityHC4(final InputStream instream) { this(instream, -1); } @@ -65,20 +65,20 @@ public class InputStreamEntity extends A * @param length of the input stream, {@code -1} if unknown * @throws IllegalArgumentException if {@code instream} is {@code null} */ - public InputStreamEntity(final InputStream instream, final long length) { + public InputStreamEntityHC4(final InputStream instream, final long length) { this(instream, length, null); } /** * Creates an entity with a content type and unknown length. - * Equivalent to {@code new InputStreamEntity(instream, -1, contentType)}. + * Equivalent to {@code new InputStreamEntityHC4(instream, -1, contentType)}. * * @param instream input stream * @param contentType content type * @throws IllegalArgumentException if {@code instream} is {@code null} * @since 4.3 */ - public InputStreamEntity(final InputStream instream, final ContentType contentType) { + public InputStreamEntityHC4(final InputStream instream, final ContentType contentType) { this(instream, -1, contentType); } @@ -89,7 +89,7 @@ public class InputStreamEntity extends A * @throws IllegalArgumentException if {@code instream} is {@code null} * @since 4.2 */ - public InputStreamEntity(final InputStream instream, final long length, final ContentType contentType) { + public InputStreamEntityHC4(final InputStream instream, final long length, final ContentType contentType) { super(); this.content = Args.notNull(instream, "Source input stream"); this.length = length; Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/SerializableEntityHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/SerializableEntity.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/SerializableEntityHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/SerializableEntityHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/SerializableEntity.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/SerializableEntity.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/SerializableEntityHC4.java Thu Dec 19 20:20:02 2013 @@ -47,7 +47,7 @@ import org.apache.http.util.Args; * @since 4.0 */ @NotThreadSafe -public class SerializableEntity extends AbstractHttpEntity { +public class SerializableEntityHC4 extends AbstractHttpEntityHC4 { private byte[] objSer; @@ -61,7 +61,7 @@ public class SerializableEntity extends * stored in an internal buffer * @throws IOException in case of an I/O error */ - public SerializableEntity(final Serializable ser, final boolean bufferize) throws IOException { + public SerializableEntityHC4(final Serializable ser, final boolean bufferize) throws IOException { super(); Args.notNull(ser, "Source object"); if (bufferize) { @@ -74,7 +74,7 @@ public class SerializableEntity extends /** * @since 4.3 */ - public SerializableEntity(final Serializable ser) { + public SerializableEntityHC4(final Serializable ser) { super(); Args.notNull(ser, "Source object"); this.objRef = ser; Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/StringEntityHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/StringEntity.java) URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/StringEntityHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/StringEntityHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/StringEntity.java&r1=1548964&r2=1552414&rev=1552414&view=diff ============================================================================== --- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/StringEntity.java (original) +++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/entity/StringEntityHC4.java Thu Dec 19 20:20:02 2013 @@ -46,12 +46,12 @@ import org.apache.http.util.Args; * @since 4.0 */ @NotThreadSafe -public class StringEntity extends AbstractHttpEntity implements Cloneable { +public class StringEntityHC4 extends AbstractHttpEntityHC4 implements Cloneable { protected final byte[] content; /** - * Creates a StringEntity with the specified content and content type. + * Creates a StringEntityHC4 with the specified content and content type. * * @param string content to be used. Not {@code null}. * @param contentType content type to be used. May be {@code null}, in which case the default @@ -61,12 +61,12 @@ public class StringEntity extends Abstra * * @since 4.2 */ - public StringEntity(final String string, final ContentType contentType) { + public StringEntityHC4(final String string, final ContentType contentType) { super(); Args.notNull(string, "Source string"); Charset charset = contentType != null ? contentType.getCharset() : null; if (charset == null) { - charset = HTTP.DEF_CONTENT_CHARSET; + charset = Charset.forName(HTTP.DEFAULT_CONTENT_CHARSET); } try { this.content = string.getBytes(charset.name()); @@ -80,21 +80,21 @@ public class StringEntity extends Abstra } /** - * Creates a StringEntity with the specified content, MIME type and charset + * Creates a StringEntityHC4 with the specified content, MIME type and charset * * @param string content to be used. Not {@code null}. * @param mimeType MIME type to be used. May be {@code null}, in which case the default * is {@link HTTP#PLAIN_TEXT_TYPE} i.e. "text/plain" * @param charset character set to be used. May be {@code null}, in which case the default - * is {@link HTTP#DEF_CONTENT_CHARSET} i.e. "ISO-8859-1" + * is {@link HTTP#DEFAULT_CONTENT_CHARSET} i.e. "ISO-8859-1" * * @since 4.1 * @throws IllegalArgumentException if the string parameter is null * - * @deprecated (4.1.3) use {@link #StringEntity(String, ContentType)} + * @deprecated (4.1.3) use {@link #StringEntityHC4(String, ContentType)} */ @Deprecated - public StringEntity( + public StringEntityHC4( final String string, final String mimeType, final String charset) throws UnsupportedEncodingException { super(); Args.notNull(string, "Source string"); @@ -105,40 +105,40 @@ public class StringEntity extends Abstra } /** - * Creates a StringEntity with the specified content and charset. The MIME type defaults + * Creates a StringEntityHC4 with the specified content and charset. The MIME type defaults * to "text/plain". * * @param string content to be used. Not {@code null}. * @param charset character set to be used. May be {@code null}, in which case the default - * is {@link HTTP#DEF_CONTENT_CHARSET} is assumed + * is {@link HTTP#DEFAULT_CONTENT_CHARSET} is assumed * * @throws IllegalArgumentException if the string parameter is null * @throws UnsupportedCharsetException Thrown when the named charset is not available in * this instance of the Java virtual machine */ - public StringEntity(final String string, final String charset) + public StringEntityHC4(final String string, final String charset) throws UnsupportedEncodingException { this(string, ContentType.create(ContentType.TEXT_PLAIN.getMimeType(), charset)); } /** - * Creates a StringEntity with the specified content and charset. The MIME type defaults + * Creates a StringEntityHC4 with the specified content and charset. The MIME type defaults * to "text/plain". * * @param string content to be used. Not {@code null}. * @param charset character set to be used. May be {@code null}, in which case the default - * is {@link HTTP#DEF_CONTENT_CHARSET} is assumed + * is {@link HTTP#DEFAULT_CONTENT_CHARSET} is assumed * * @throws IllegalArgumentException if the string parameter is null * * @since 4.2 */ - public StringEntity(final String string, final Charset charset) { + public StringEntityHC4(final String string, final Charset charset) { this(string, ContentType.create(ContentType.TEXT_PLAIN.getMimeType(), charset)); } /** - * Creates a StringEntity with the specified content. The content type defaults to + * Creates a StringEntityHC4 with the specified content. The content type defaults to * {@link ContentType#TEXT_PLAIN}. * * @param string content to be used. Not {@code null}. @@ -146,7 +146,7 @@ public class StringEntity extends Abstra * @throws IllegalArgumentException if the string parameter is null * @throws UnsupportedEncodingException if the default HTTP charset is not supported. */ - public StringEntity(final String string) + public StringEntityHC4(final String string) throws UnsupportedEncodingException { this(string, ContentType.DEFAULT_TEXT); } @@ -183,4 +183,4 @@ public class StringEntity extends Abstra return super.clone(); } -} // class StringEntity +} // class StringEntityHC4