You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2013/12/19 21:20:09 UTC
svn commit: r1552414 [5/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...
Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandlerHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandlerHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandlerHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java&r1=1548964&r2=1552414&rev=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandlerHC4.java Thu Dec 19 20:20:02 2013
@@ -46,9 +46,9 @@ import org.apache.http.util.Args;
* @since 3.1
*/
@Immutable
-public class RFC2965DomainAttributeHandler implements CookieAttributeHandler {
+public class RFC2965DomainAttributeHandlerHC4 implements CookieAttributeHandler {
- public RFC2965DomainAttributeHandler() {
+ public RFC2965DomainAttributeHandlerHC4() {
super();
}
Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965PortAttributeHandlerHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965PortAttributeHandlerHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965PortAttributeHandlerHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.java&r1=1548964&r2=1552414&rev=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965PortAttributeHandler.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965PortAttributeHandlerHC4.java Thu Dec 19 20:20:02 2013
@@ -46,9 +46,9 @@ import org.apache.http.util.Args;
* @since 4.0
*/
@Immutable
-public class RFC2965PortAttributeHandler implements CookieAttributeHandler {
+public class RFC2965PortAttributeHandlerHC4 implements CookieAttributeHandler {
- public RFC2965PortAttributeHandler() {
+ public RFC2965PortAttributeHandlerHC4() {
super();
}
Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965SpecFactoryHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965SpecFactory.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965SpecFactoryHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965SpecFactoryHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965SpecFactory.java&r1=1548964&r2=1552414&rev=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965SpecFactory.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965SpecFactoryHC4.java Thu Dec 19 20:20:02 2013
@@ -45,18 +45,18 @@ import org.apache.http.protocol.HttpCont
*/
@Immutable
@SuppressWarnings("deprecation")
-public class RFC2965SpecFactory implements CookieSpecFactory, CookieSpecProvider {
+public class RFC2965SpecFactoryHC4 implements CookieSpecFactory, CookieSpecProvider {
private final String[] datepatterns;
private final boolean oneHeader;
- public RFC2965SpecFactory(final String[] datepatterns, final boolean oneHeader) {
+ public RFC2965SpecFactoryHC4(final String[] datepatterns, final boolean oneHeader) {
super();
this.datepatterns = datepatterns;
this.oneHeader = oneHeader;
}
- public RFC2965SpecFactory() {
+ public RFC2965SpecFactoryHC4() {
this(null, false);
}
@@ -73,14 +73,14 @@ public class RFC2965SpecFactory implemen
final boolean singleHeader = params.getBooleanParameter(
CookieSpecPNames.SINGLE_COOKIE_HEADER, false);
- return new RFC2965Spec(patterns, singleHeader);
+ return new RFC2965SpecHC4(patterns, singleHeader);
} else {
- return new RFC2965Spec();
+ return new RFC2965SpecHC4();
}
}
public CookieSpec create(final HttpContext context) {
- return new RFC2965Spec(this.datepatterns, this.oneHeader);
+ return new RFC2965SpecHC4(this.datepatterns, this.oneHeader);
}
}
Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965SpecHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965Spec.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965SpecHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965SpecHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965Spec.java&r1=1548964&r2=1552414&rev=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965Spec.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965SpecHC4.java Thu Dec 19 20:20:02 2013
@@ -52,23 +52,23 @@ import org.apache.http.util.CharArrayBuf
* @since 4.0
*/
@NotThreadSafe // superclass is @NotThreadSafe
-public class RFC2965Spec extends RFC2109Spec {
+public class RFC2965SpecHC4 extends RFC2109SpecHC4 {
/**
* Default constructor
*
*/
- public RFC2965Spec() {
+ public RFC2965SpecHC4() {
this(null, false);
}
- public RFC2965Spec(final String[] datepatterns, final boolean oneHeader) {
+ public RFC2965SpecHC4(final String[] datepatterns, final boolean oneHeader) {
super(datepatterns, oneHeader);
- registerAttribHandler(ClientCookie.DOMAIN_ATTR, new RFC2965DomainAttributeHandler());
- registerAttribHandler(ClientCookie.PORT_ATTR, new RFC2965PortAttributeHandler());
- registerAttribHandler(ClientCookie.COMMENTURL_ATTR, new RFC2965CommentUrlAttributeHandler());
- registerAttribHandler(ClientCookie.DISCARD_ATTR, new RFC2965DiscardAttributeHandler());
- registerAttribHandler(ClientCookie.VERSION_ATTR, new RFC2965VersionAttributeHandler());
+ registerAttribHandler(ClientCookie.DOMAIN_ATTR, new RFC2965DomainAttributeHandlerHC4());
+ registerAttribHandler(ClientCookie.PORT_ATTR, new RFC2965PortAttributeHandlerHC4());
+ registerAttribHandler(ClientCookie.COMMENTURL_ATTR, new RFC2965CommentUrlAttributeHandlerHC4());
+ registerAttribHandler(ClientCookie.DISCARD_ATTR, new RFC2965DiscardAttributeHandlerHC4());
+ registerAttribHandler(ClientCookie.VERSION_ATTR, new RFC2965VersionAttributeHandlerHC4());
}
@Override
@@ -103,7 +103,7 @@ public class RFC2965Spec extends RFC2109
throw new MalformedCookieException("Cookie name may not be empty");
}
- final BasicClientCookie2 cookie = new BasicClientCookie2(name, value);
+ final BasicClientCookie2HC4 cookie = new BasicClientCookie2HC4(name, value);
cookie.setPath(getDefaultPath(origin));
cookie.setDomain(getDefaultDomain(origin));
cookie.setPorts(new int [] { origin.getPort() });
Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965VersionAttributeHandlerHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965VersionAttributeHandler.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965VersionAttributeHandlerHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965VersionAttributeHandlerHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965VersionAttributeHandler.java&r1=1548964&r2=1552414&rev=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965VersionAttributeHandler.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/RFC2965VersionAttributeHandlerHC4.java Thu Dec 19 20:20:02 2013
@@ -44,9 +44,9 @@ import org.apache.http.util.Args;
* @since 4.0
*/
@Immutable
-public class RFC2965VersionAttributeHandler implements CookieAttributeHandler {
+public class RFC2965VersionAttributeHandlerHC4 implements CookieAttributeHandler {
- public RFC2965VersionAttributeHandler() {
+ public RFC2965VersionAttributeHandlerHC4() {
super();
}
Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/entity/DisallowIdentityContentLengthStrategy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/entity/DisallowIdentityContentLengthStrategy.java?rev=1552414&r1=1552413&r2=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/entity/DisallowIdentityContentLengthStrategy.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/entity/DisallowIdentityContentLengthStrategy.java Thu Dec 19 20:20:02 2013
@@ -43,7 +43,7 @@ import org.apache.http.entity.ContentLen
public class DisallowIdentityContentLengthStrategy implements ContentLengthStrategy {
public static final DisallowIdentityContentLengthStrategy INSTANCE =
- new DisallowIdentityContentLengthStrategy(new LaxContentLengthStrategy(0));
+ new DisallowIdentityContentLengthStrategy(new LaxContentLengthStrategyHC4(0));
private final ContentLengthStrategy contentLengthStrategy;
Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/entity/LaxContentLengthStrategyHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/entity/LaxContentLengthStrategy.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/entity/LaxContentLengthStrategyHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/entity/LaxContentLengthStrategyHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/entity/LaxContentLengthStrategy.java&r1=1548964&r2=1552414&rev=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/entity/LaxContentLengthStrategy.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/entity/LaxContentLengthStrategyHC4.java Thu Dec 19 20:20:02 2013
@@ -48,9 +48,9 @@ import org.apache.http.util.Args;
* @since 4.0
*/
@Immutable
-public class LaxContentLengthStrategy implements ContentLengthStrategy {
+public class LaxContentLengthStrategyHC4 implements ContentLengthStrategy {
- public static final LaxContentLengthStrategy INSTANCE = new LaxContentLengthStrategy();
+ public static final LaxContentLengthStrategyHC4 INSTANCE = new LaxContentLengthStrategyHC4();
private final int implicitLen;
@@ -62,7 +62,7 @@ public class LaxContentLengthStrategy im
*
* @since 4.2
*/
- public LaxContentLengthStrategy(final int implicitLen) {
+ public LaxContentLengthStrategyHC4(final int implicitLen) {
super();
this.implicitLen = implicitLen;
}
@@ -71,7 +71,7 @@ public class LaxContentLengthStrategy im
* Creates <tt>LaxContentLengthStrategy</tt> instance. {@link ContentLengthStrategy#IDENTITY}
* is used per default when content length is not explicitly specified in the message.
*/
- public LaxContentLengthStrategy() {
+ public LaxContentLengthStrategyHC4() {
this(IDENTITY);
}
Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/entity/StrictContentLengthStrategyHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/entity/StrictContentLengthStrategy.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/entity/StrictContentLengthStrategyHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/entity/StrictContentLengthStrategyHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/entity/StrictContentLengthStrategy.java&r1=1548964&r2=1552414&rev=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/entity/StrictContentLengthStrategy.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/entity/StrictContentLengthStrategyHC4.java Thu Dec 19 20:20:02 2013
@@ -48,9 +48,9 @@ import org.apache.http.util.Args;
* @since 4.0
*/
@Immutable
-public class StrictContentLengthStrategy implements ContentLengthStrategy {
+public class StrictContentLengthStrategyHC4 implements ContentLengthStrategy {
- public static final StrictContentLengthStrategy INSTANCE = new StrictContentLengthStrategy();
+ public static final StrictContentLengthStrategyHC4 INSTANCE = new StrictContentLengthStrategyHC4();
private final int implicitLen;
@@ -62,7 +62,7 @@ public class StrictContentLengthStrategy
*
* @since 4.2
*/
- public StrictContentLengthStrategy(final int implicitLen) {
+ public StrictContentLengthStrategyHC4(final int implicitLen) {
super();
this.implicitLen = implicitLen;
}
@@ -71,7 +71,7 @@ public class StrictContentLengthStrategy
* Creates <tt>StrictContentLengthStrategy</tt> instance. {@link ContentLengthStrategy#IDENTITY}
* is used per default when content length is not explicitly specified in the message.
*/
- public StrictContentLengthStrategy() {
+ public StrictContentLengthStrategyHC4() {
this(IDENTITY);
}
Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/execchain/MainClientExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/execchain/MainClientExec.java?rev=1552414&r1=1552413&r2=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/execchain/MainClientExec.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/execchain/MainClientExec.java Thu Dec 19 20:20:02 2013
@@ -45,7 +45,7 @@ import org.apache.http.HttpResponse;
import org.apache.http.annotation.Immutable;
import org.apache.http.auth.AUTH;
import org.apache.http.auth.AuthProtocolState;
-import org.apache.http.auth.AuthState;
+import org.apache.http.auth.AuthStateHC4;
import org.apache.http.client.AuthenticationStrategy;
import org.apache.http.client.NonRepeatableRequestException;
import org.apache.http.client.UserTokenHandler;
@@ -62,16 +62,16 @@ import org.apache.http.conn.routing.Basi
import org.apache.http.conn.routing.HttpRoute;
import org.apache.http.conn.routing.HttpRouteDirector;
import org.apache.http.conn.routing.RouteTracker;
-import org.apache.http.entity.BufferedHttpEntity;
+import org.apache.http.entity.BufferedHttpEntityHC4;
import org.apache.http.impl.auth.HttpAuthenticator;
import org.apache.http.impl.conn.ConnectionShutdownException;
import org.apache.http.message.BasicHttpRequest;
import org.apache.http.protocol.HttpProcessor;
import org.apache.http.protocol.HttpRequestExecutor;
import org.apache.http.protocol.ImmutableHttpProcessor;
-import org.apache.http.protocol.RequestTargetHost;
+import org.apache.http.protocol.RequestTargetHostHC4;
import org.apache.http.util.Args;
-import org.apache.http.util.EntityUtils;
+import org.apache.http.util.EntityUtilsHC4;
/**
* The last request executor in the HTTP request execution chain
@@ -117,7 +117,7 @@ public class MainClientExec implements C
Args.notNull(userTokenHandler, "User token handler");
this.authenticator = new HttpAuthenticator();
this.proxyHttpProcessor = new ImmutableHttpProcessor(
- new RequestTargetHost(), new RequestClientConnControl());
+ new RequestTargetHostHC4(), new RequestClientConnControl());
this.routeDirector = new BasicRouteDirector();
this.requestExecutor = requestExecutor;
this.connManager = connManager;
@@ -137,14 +137,14 @@ public class MainClientExec implements C
Args.notNull(request, "HTTP request");
Args.notNull(context, "HTTP context");
- AuthState targetAuthState = context.getTargetAuthState();
+ AuthStateHC4 targetAuthState = context.getTargetAuthState();
if (targetAuthState == null) {
- targetAuthState = new AuthState();
+ targetAuthState = new AuthStateHC4();
context.setAttribute(HttpClientContext.TARGET_AUTH_STATE, targetAuthState);
}
- AuthState proxyAuthState = context.getProxyAuthState();
+ AuthStateHC4 proxyAuthState = context.getProxyAuthState();
if (proxyAuthState == null) {
- proxyAuthState = new AuthState();
+ proxyAuthState = new AuthStateHC4();
context.setAttribute(HttpClientContext.PROXY_AUTH_STATE, proxyAuthState);
}
@@ -276,7 +276,7 @@ public class MainClientExec implements C
// Make sure the response body is fully consumed, if present
final HttpEntity entity = response.getEntity();
if (connHolder.isReusable()) {
- EntityUtils.consume(entity);
+ EntityUtilsHC4.consume(entity);
} else {
managedConn.close();
if (proxyAuthState.getState() == AuthProtocolState.SUCCESS
@@ -338,7 +338,7 @@ public class MainClientExec implements C
* Establishes the target route.
*/
void establishRoute(
- final AuthState proxyAuthState,
+ final AuthStateHC4 proxyAuthState,
final HttpClientConnection managedConn,
final HttpRoute route,
final HttpRequest request,
@@ -416,7 +416,7 @@ public class MainClientExec implements C
* information about the tunnel, that is left to the caller.
*/
private boolean createTunnelToTarget(
- final AuthState proxyAuthState,
+ final AuthStateHC4 proxyAuthState,
final HttpClientConnection managedConn,
final HttpRoute route,
final HttpRequest request,
@@ -464,7 +464,7 @@ public class MainClientExec implements C
this.log.debug("Connection kept alive");
// Consume response content
final HttpEntity entity = response.getEntity();
- EntityUtils.consume(entity);
+ EntityUtilsHC4.consume(entity);
} else {
managedConn.close();
}
@@ -484,7 +484,7 @@ public class MainClientExec implements C
// Buffer response content
final HttpEntity entity = response.getEntity();
if (entity != null) {
- response.setEntity(new BufferedHttpEntity(entity));
+ response.setEntity(new BufferedHttpEntityHC4(entity));
}
managedConn.close();
@@ -522,8 +522,8 @@ public class MainClientExec implements C
}
private boolean needAuthentication(
- final AuthState targetAuthState,
- final AuthState proxyAuthState,
+ final AuthStateHC4 targetAuthState,
+ final AuthStateHC4 proxyAuthState,
final HttpRoute route,
final HttpResponse response,
final HttpClientContext context) {
Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/execchain/MinimalClientExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/execchain/MinimalClientExec.java?rev=1552414&r1=1552413&r2=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/execchain/MinimalClientExec.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/execchain/MinimalClientExec.java Thu Dec 19 20:20:02 2013
@@ -58,11 +58,11 @@ import org.apache.http.impl.conn.Connect
import org.apache.http.protocol.HttpProcessor;
import org.apache.http.protocol.HttpRequestExecutor;
import org.apache.http.protocol.ImmutableHttpProcessor;
-import org.apache.http.protocol.RequestContent;
-import org.apache.http.protocol.RequestTargetHost;
-import org.apache.http.protocol.RequestUserAgent;
+import org.apache.http.protocol.RequestContentHC4;
+import org.apache.http.protocol.RequestTargetHostHC4;
+import org.apache.http.protocol.RequestUserAgentHC4;
import org.apache.http.util.Args;
-import org.apache.http.util.VersionInfo;
+import org.apache.http.util.VersionInfoHC4;
/**
* Request executor that implements the most fundamental aspects of
@@ -94,10 +94,10 @@ public class MinimalClientExec implement
Args.notNull(reuseStrategy, "Connection reuse strategy");
Args.notNull(keepAliveStrategy, "Connection keep alive strategy");
this.httpProcessor = new ImmutableHttpProcessor(
- new RequestContent(),
- new RequestTargetHost(),
+ new RequestContentHC4(),
+ new RequestTargetHostHC4(),
new RequestClientConnControl(),
- new RequestUserAgent(VersionInfo.getUserAgent(
+ new RequestUserAgentHC4(VersionInfoHC4.getUserAgent(
"Apache-HttpClient", "org.apache.http.client", getClass())));
this.requestExecutor = requestExecutor;
this.connManager = connManager;
Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/execchain/ProtocolExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/execchain/ProtocolExec.java?rev=1552414&r1=1552413&r2=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/execchain/ProtocolExec.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/execchain/ProtocolExec.java Thu Dec 19 20:20:02 2013
@@ -47,9 +47,9 @@ import org.apache.http.client.methods.Ht
import org.apache.http.client.methods.HttpUriRequest;
import org.apache.http.client.params.ClientPNames;
import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.client.utils.URIUtils;
+import org.apache.http.client.utils.URIUtilsHC4;
import org.apache.http.conn.routing.HttpRoute;
-import org.apache.http.impl.client.BasicCredentialsProvider;
+import org.apache.http.impl.client.BasicCredentialsProviderHC4;
import org.apache.http.params.HttpParams;
import org.apache.http.protocol.HttpProcessor;
import org.apache.http.util.Args;
@@ -93,16 +93,16 @@ public class ProtocolExec implements Cli
// Make sure the request URI is absolute
if (!uri.isAbsolute()) {
final HttpHost target = route.getTargetHost();
- uri = URIUtils.rewriteURI(uri, target, true);
+ uri = URIUtilsHC4.rewriteURI(uri, target, true);
} else {
- uri = URIUtils.rewriteURI(uri);
+ uri = URIUtilsHC4.rewriteURI(uri);
}
} else {
// Make sure the request URI is relative
if (uri.isAbsolute()) {
- uri = URIUtils.rewriteURI(uri, null, true);
+ uri = URIUtilsHC4.rewriteURI(uri, null, true);
} else {
- uri = URIUtils.rewriteURI(uri);
+ uri = URIUtilsHC4.rewriteURI(uri);
}
}
request.setURI(uri);
@@ -175,11 +175,11 @@ public class ProtocolExec implements Cli
if (userinfo != null) {
CredentialsProvider credsProvider = context.getCredentialsProvider();
if (credsProvider == null) {
- credsProvider = new BasicCredentialsProvider();
+ credsProvider = new BasicCredentialsProviderHC4();
context.setCredentialsProvider(credsProvider);
}
credsProvider.setCredentials(
- new AuthScope(target),
+ new AuthScope(target.getHostName(), target.getPort()),
new UsernamePasswordCredentials(userinfo));
}
}
Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/execchain/RedirectExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/execchain/RedirectExec.java?rev=1552414&r1=1552413&r2=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/execchain/RedirectExec.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/execchain/RedirectExec.java Thu Dec 19 20:20:02 2013
@@ -40,7 +40,7 @@ import org.apache.http.HttpRequest;
import org.apache.http.ProtocolException;
import org.apache.http.annotation.ThreadSafe;
import org.apache.http.auth.AuthScheme;
-import org.apache.http.auth.AuthState;
+import org.apache.http.auth.AuthStateHC4;
import org.apache.http.client.RedirectException;
import org.apache.http.client.RedirectStrategy;
import org.apache.http.client.config.RequestConfig;
@@ -48,11 +48,11 @@ import org.apache.http.client.methods.Cl
import org.apache.http.client.methods.HttpExecutionAware;
import org.apache.http.client.methods.HttpRequestWrapper;
import org.apache.http.client.protocol.HttpClientContext;
-import org.apache.http.client.utils.URIUtils;
+import org.apache.http.client.utils.URIUtilsHC4;
import org.apache.http.conn.routing.HttpRoute;
import org.apache.http.conn.routing.HttpRoutePlanner;
import org.apache.http.util.Args;
-import org.apache.http.util.EntityUtils;
+import org.apache.http.util.EntityUtilsHC4;
/**
* Request executor in the request execution chain that is responsible
@@ -129,7 +129,7 @@ public class RedirectExec implements Cli
}
final URI uri = currentRequest.getURI();
- final HttpHost newTarget = URIUtils.extractHost(uri);
+ final HttpHost newTarget = URIUtilsHC4.extractHost(uri);
if (newTarget == null) {
throw new ProtocolException("Redirect URI does not specify a valid host name: " +
uri);
@@ -137,12 +137,12 @@ public class RedirectExec implements Cli
// Reset virtual host and auth states if redirecting to another host
if (!currentRoute.getTargetHost().equals(newTarget)) {
- final AuthState targetAuthState = context.getTargetAuthState();
+ final AuthStateHC4 targetAuthState = context.getTargetAuthState();
if (targetAuthState != null) {
this.log.debug("Resetting target auth state");
targetAuthState.reset();
}
- final AuthState proxyAuthState = context.getProxyAuthState();
+ final AuthStateHC4 proxyAuthState = context.getProxyAuthState();
if (proxyAuthState != null) {
final AuthScheme authScheme = proxyAuthState.getAuthScheme();
if (authScheme != null && authScheme.isConnectionBased()) {
@@ -156,7 +156,7 @@ public class RedirectExec implements Cli
if (this.log.isDebugEnabled()) {
this.log.debug("Redirecting to '" + uri + "' via " + currentRoute);
}
- EntityUtils.consume(response.getEntity());
+ EntityUtilsHC4.consume(response.getEntity());
response.close();
} else {
return response;
@@ -171,7 +171,7 @@ public class RedirectExec implements Cli
// Protocol exception related to a direct.
// The underlying connection may still be salvaged.
try {
- EntityUtils.consume(response.getEntity());
+ EntityUtilsHC4.consume(response.getEntity());
} catch (final IOException ioex) {
this.log.debug("I/O error while releasing connection", ioex);
} finally {
Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/execchain/ResponseEntityWrapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/execchain/ResponseEntityWrapper.java?rev=1552414&r1=1552413&r2=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/execchain/ResponseEntityWrapper.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/execchain/ResponseEntityWrapper.java Thu Dec 19 20:20:02 2013
@@ -34,9 +34,9 @@ import java.net.SocketException;
import org.apache.http.HttpEntity;
import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.conn.EofSensorInputStream;
+import org.apache.http.conn.EofSensorInputStreamHC4;
import org.apache.http.conn.EofSensorWatcher;
-import org.apache.http.entity.HttpEntityWrapper;
+import org.apache.http.entity.HttpEntityWrapperHC4;
/**
* A wrapper class for {@link HttpEntity} enclosed in a response message.
@@ -44,7 +44,7 @@ import org.apache.http.entity.HttpEntity
* @since 4.3
*/
@NotThreadSafe
-class ResponseEntityWrapper extends HttpEntityWrapper implements EofSensorWatcher {
+class ResponseEntityWrapper extends HttpEntityWrapperHC4 implements EofSensorWatcher {
private final ConnectionHolder connReleaseTrigger;
@@ -80,7 +80,7 @@ class ResponseEntityWrapper extends Http
@Override
public InputStream getContent() throws IOException {
- return new EofSensorInputStream(this.wrappedEntity.getContent(), this);
+ return new EofSensorInputStreamHC4(this.wrappedEntity.getContent(), this);
}
@Deprecated
Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/execchain/RetryExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/execchain/RetryExec.java?rev=1552414&r1=1552413&r2=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/execchain/RetryExec.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/execchain/RetryExec.java Thu Dec 19 20:20:02 2013
@@ -99,8 +99,10 @@ public class RetryExec implements Client
}
if (!Proxies.isRepeatable(request)) {
this.log.debug("Cannot retry non-repeatable request");
- throw new NonRepeatableRequestException("Cannot retry request " +
- "with a non-repeatable request entity", ex);
+ final NonRepeatableRequestException nreex = new NonRepeatableRequestException(
+ "Cannot retry request with a non-repeatable request entity");
+ nreex.initCause(ex);
+ throw nreex;
}
request.setHeaders(origheaders);
this.log.info("Retrying request");
Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/AbstractMessageParserHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/AbstractMessageParser.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/AbstractMessageParserHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/AbstractMessageParserHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/AbstractMessageParser.java&r1=1548964&r2=1552414&rev=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/AbstractMessageParser.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/AbstractMessageParserHC4.java Thu Dec 19 20:20:02 2013
@@ -41,7 +41,7 @@ import org.apache.http.annotation.NotThr
import org.apache.http.config.MessageConstraints;
import org.apache.http.io.HttpMessageParser;
import org.apache.http.io.SessionInputBuffer;
-import org.apache.http.message.BasicLineParser;
+import org.apache.http.message.BasicLineParserHC4;
import org.apache.http.message.LineParser;
import org.apache.http.params.HttpParamConfig;
import org.apache.http.params.HttpParams;
@@ -56,7 +56,7 @@ import org.apache.http.util.CharArrayBuf
*/
@SuppressWarnings("deprecation")
@NotThreadSafe
-public abstract class AbstractMessageParser<T extends HttpMessage> implements HttpMessageParser<T> {
+public abstract class AbstractMessageParserHC4<T extends HttpMessage> implements HttpMessageParser {
private static final int HEAD_LINE = 0;
private static final int HEADERS = 1;
@@ -70,17 +70,17 @@ public abstract class AbstractMessagePar
private T message;
/**
- * Creates an instance of AbstractMessageParser.
+ * Creates an instance of AbstractMessageParserHC4.
*
* @param buffer the session input buffer.
* @param parser the line parser.
* @param params HTTP parameters.
*
- * @deprecated (4.3) use {@link AbstractMessageParser#AbstractMessageParser(SessionInputBuffer,
+ * @deprecated (4.3) use {@link AbstractMessageParserHC4#AbstractMessageParser(SessionInputBuffer,
* LineParser, MessageConstraints)}
*/
@Deprecated
- public AbstractMessageParser(
+ public AbstractMessageParserHC4(
final SessionInputBuffer buffer,
final LineParser parser,
final HttpParams params) {
@@ -89,29 +89,29 @@ public abstract class AbstractMessagePar
Args.notNull(params, "HTTP parameters");
this.sessionBuffer = buffer;
this.messageConstraints = HttpParamConfig.getMessageConstraints(params);
- this.lineParser = (parser != null) ? parser : BasicLineParser.INSTANCE;
+ this.lineParser = (parser != null) ? parser : BasicLineParserHC4.INSTANCE;
this.headerLines = new ArrayList<CharArrayBuffer>();
this.state = HEAD_LINE;
}
/**
- * Creates new instance of AbstractMessageParser.
+ * Creates new instance of AbstractMessageParserHC4.
*
* @param buffer the session input buffer.
- * @param lineParser the line parser. If <code>null</code> {@link BasicLineParser#INSTANCE}
+ * @param lineParser the line parser. If <code>null</code> {@link BasicLineParserHC4#INSTANCE}
* will be used.
* @param constraints the message constraints. If <code>null</code>
* {@link MessageConstraints#DEFAULT} will be used.
*
* @since 4.3
*/
- public AbstractMessageParser(
+ public AbstractMessageParserHC4(
final SessionInputBuffer buffer,
final LineParser lineParser,
final MessageConstraints constraints) {
super();
this.sessionBuffer = Args.notNull(buffer, "Session input buffer");
- this.lineParser = lineParser != null ? lineParser : BasicLineParser.INSTANCE;
+ this.lineParser = lineParser != null ? lineParser : BasicLineParserHC4.INSTANCE;
this.messageConstraints = constraints != null ? constraints : MessageConstraints.DEFAULT;
this.headerLines = new ArrayList<CharArrayBuffer>();
this.state = HEAD_LINE;
@@ -143,7 +143,7 @@ public abstract class AbstractMessagePar
final LineParser parser) throws HttpException, IOException {
final List<CharArrayBuffer> headerLines = new ArrayList<CharArrayBuffer>();
return parseHeaders(inbuffer, maxHeaderCount, maxLineLen,
- parser != null ? parser : BasicLineParser.INSTANCE,
+ parser != null ? parser : BasicLineParserHC4.INSTANCE,
headerLines);
}
@@ -264,7 +264,7 @@ public abstract class AbstractMessagePar
this.state = HEADERS;
//$FALL-THROUGH$
case HEADERS:
- final Header[] headers = AbstractMessageParser.parseHeaders(
+ final Header[] headers = AbstractMessageParserHC4.parseHeaders(
this.sessionBuffer,
this.messageConstraints.getMaxHeaderCount(),
this.messageConstraints.getMaxLineLength(),
Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/AbstractMessageWriterHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/AbstractMessageWriter.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/AbstractMessageWriterHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/AbstractMessageWriterHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/AbstractMessageWriter.java&r1=1548964&r2=1552414&rev=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/AbstractMessageWriter.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/AbstractMessageWriterHC4.java Thu Dec 19 20:20:02 2013
@@ -36,7 +36,7 @@ import org.apache.http.HttpMessage;
import org.apache.http.annotation.NotThreadSafe;
import org.apache.http.io.HttpMessageWriter;
import org.apache.http.io.SessionOutputBuffer;
-import org.apache.http.message.BasicLineFormatter;
+import org.apache.http.message.BasicLineFormatterHC4;
import org.apache.http.message.LineFormatter;
import org.apache.http.params.HttpParams;
import org.apache.http.util.Args;
@@ -50,48 +50,48 @@ import org.apache.http.util.CharArrayBuf
*/
@SuppressWarnings("deprecation")
@NotThreadSafe
-public abstract class AbstractMessageWriter<T extends HttpMessage> implements HttpMessageWriter<T> {
+public abstract class AbstractMessageWriterHC4 implements HttpMessageWriter {
protected final SessionOutputBuffer sessionBuffer;
protected final CharArrayBuffer lineBuf;
protected final LineFormatter lineFormatter;
/**
- * Creates an instance of AbstractMessageWriter.
+ * Creates an instance of AbstractMessageWriterHC4.
*
* @param buffer the session output buffer.
* @param formatter the line formatter.
* @param params HTTP parameters.
*
* @deprecated (4.3) use
- * {@link AbstractMessageWriter#AbstractMessageWriter(SessionOutputBuffer, LineFormatter)}
+ * {@link AbstractMessageWriterHC4#AbstractMessageWriterHC4(SessionOutputBuffer, LineFormatter)}
*/
@Deprecated
- public AbstractMessageWriter(final SessionOutputBuffer buffer,
+ public AbstractMessageWriterHC4(final SessionOutputBuffer buffer,
final LineFormatter formatter,
final HttpParams params) {
super();
Args.notNull(buffer, "Session input buffer");
this.sessionBuffer = buffer;
this.lineBuf = new CharArrayBuffer(128);
- this.lineFormatter = (formatter != null) ? formatter : BasicLineFormatter.INSTANCE;
+ this.lineFormatter = (formatter != null) ? formatter : BasicLineFormatterHC4.INSTANCE;
}
/**
- * Creates an instance of AbstractMessageWriter.
+ * Creates an instance of AbstractMessageWriterHC4.
*
* @param buffer the session output buffer.
- * @param formatter the line formatter If <code>null</code> {@link BasicLineFormatter#INSTANCE}
+ * @param formatter the line formatter If <code>null</code> {@link BasicLineFormatterHC4#INSTANCE}
* will be used.
*
* @since 4.3
*/
- public AbstractMessageWriter(
+ public AbstractMessageWriterHC4(
final SessionOutputBuffer buffer,
final LineFormatter formatter) {
super();
this.sessionBuffer = Args.notNull(buffer, "Session input buffer");
- this.lineFormatter = (formatter != null) ? formatter : BasicLineFormatter.INSTANCE;
+ this.lineFormatter = (formatter != null) ? formatter : BasicLineFormatterHC4.INSTANCE;
this.lineBuf = new CharArrayBuffer(128);
}
@@ -102,9 +102,9 @@ public abstract class AbstractMessageWri
* @param message the message whose first line is to be written out.
* @throws IOException in case of an I/O error.
*/
- protected abstract void writeHeadLine(T message) throws IOException;
+ protected abstract void writeHeadLine(HttpMessage message) throws IOException;
- public void write(final T message) throws IOException, HttpException {
+ public void write(final HttpMessage message) throws IOException, HttpException {
Args.notNull(message, "HTTP message");
writeHeadLine(message);
for (final HeaderIterator it = message.headerIterator(); it.hasNext(); ) {
Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ChunkedInputStreamHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ChunkedInputStream.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ChunkedInputStreamHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ChunkedInputStreamHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ChunkedInputStream.java&r1=1548964&r2=1552414&rev=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ChunkedInputStream.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ChunkedInputStreamHC4.java Thu Dec 19 20:20:02 2013
@@ -57,7 +57,7 @@ import org.apache.http.util.CharArrayBuf
*
*/
@NotThreadSafe
-public class ChunkedInputStream extends InputStream {
+public class ChunkedInputStreamHC4 extends InputStream {
private static final int CHUNK_LEN = 1;
private static final int CHUNK_DATA = 2;
@@ -91,7 +91,7 @@ public class ChunkedInputStream extends
*
* @param in The session input buffer
*/
- public ChunkedInputStream(final SessionInputBuffer in) {
+ public ChunkedInputStreamHC4(final SessionInputBuffer in) {
super();
this.in = Args.notNull(in, "Session input buffer");
this.pos = 0;
@@ -261,7 +261,7 @@ public class ChunkedInputStream extends
*/
private void parseTrailerHeaders() throws IOException {
try {
- this.footers = AbstractMessageParser.parseHeaders
+ this.footers = AbstractMessageParserHC4.parseHeaders
(in, -1, -1, null);
} catch (final HttpException ex) {
final IOException ioe = new MalformedChunkCodingException("Invalid footer: "
Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ChunkedOutputStreamHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ChunkedOutputStream.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ChunkedOutputStreamHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ChunkedOutputStreamHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ChunkedOutputStream.java&r1=1548964&r2=1552414&rev=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ChunkedOutputStream.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ChunkedOutputStreamHC4.java Thu Dec 19 20:20:02 2013
@@ -46,7 +46,7 @@ import org.apache.http.io.SessionOutputB
* @since 4.0
*/
@NotThreadSafe
-public class ChunkedOutputStream extends OutputStream {
+public class ChunkedOutputStreamHC4 extends OutputStream {
// ----------------------------------------------------- Instance Variables
private final SessionOutputBuffer out;
@@ -67,10 +67,10 @@ public class ChunkedOutputStream extends
* @param bufferSize The minimum chunk size (excluding last chunk)
* @throws IOException not thrown
*
- * @deprecated (4.3) use {@link ChunkedOutputStream#ChunkedOutputStream(int, SessionOutputBuffer)}
+ * @deprecated (4.3) use {@link ChunkedOutputStreamHC4#ChunkedOutputStream(int, SessionOutputBuffer)}
*/
@Deprecated
- public ChunkedOutputStream(final SessionOutputBuffer out, final int bufferSize)
+ public ChunkedOutputStreamHC4(final SessionOutputBuffer out, final int bufferSize)
throws IOException {
this(bufferSize, out);
}
@@ -82,10 +82,10 @@ public class ChunkedOutputStream extends
* @param out the output buffer to wrap
* @throws IOException not thrown
*
- * @deprecated (4.3) use {@link ChunkedOutputStream#ChunkedOutputStream(int, SessionOutputBuffer)}
+ * @deprecated (4.3) use {@link ChunkedOutputStreamHC4#ChunkedOutputStream(int, SessionOutputBuffer)}
*/
@Deprecated
- public ChunkedOutputStream(final SessionOutputBuffer out)
+ public ChunkedOutputStreamHC4(final SessionOutputBuffer out)
throws IOException {
this(2048, out);
}
@@ -96,7 +96,7 @@ public class ChunkedOutputStream extends
* @param bufferSize The minimum chunk size (excluding last chunk)
* @param out The session output buffer
*/
- public ChunkedOutputStream(final int bufferSize, final SessionOutputBuffer out) {
+ public ChunkedOutputStreamHC4(final int bufferSize, final SessionOutputBuffer out) {
super();
this.cache = new byte[bufferSize];
this.out = out;
Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ContentLengthInputStreamHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ContentLengthInputStream.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ContentLengthInputStreamHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ContentLengthInputStreamHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ContentLengthInputStream.java&r1=1548964&r2=1552414&rev=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ContentLengthInputStream.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ContentLengthInputStreamHC4.java Thu Dec 19 20:20:02 2013
@@ -53,7 +53,7 @@ import org.apache.http.util.Args;
* @since 4.0
*/
@NotThreadSafe
-public class ContentLengthInputStream extends InputStream {
+public class ContentLengthInputStreamHC4 extends InputStream {
private static final int BUFFER_SIZE = 2048;
/**
@@ -81,7 +81,7 @@ public class ContentLengthInputStream ex
* @param contentLength The maximum number of bytes that can be read from
* the stream. Subsequent read operations will return -1.
*/
- public ContentLengthInputStream(final SessionInputBuffer in, final long contentLength) {
+ public ContentLengthInputStreamHC4(final SessionInputBuffer in, final long contentLength) {
super();
this.in = Args.notNull(in, "Session input buffer");
this.contentLength = Args.notNegative(contentLength, "Content length");
Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ContentLengthOutputStreamHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ContentLengthOutputStream.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ContentLengthOutputStreamHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ContentLengthOutputStreamHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ContentLengthOutputStream.java&r1=1548964&r2=1552414&rev=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ContentLengthOutputStream.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ContentLengthOutputStreamHC4.java Thu Dec 19 20:20:02 2013
@@ -48,7 +48,7 @@ import org.apache.http.util.Args;
* @since 4.0
*/
@NotThreadSafe
-public class ContentLengthOutputStream extends OutputStream {
+public class ContentLengthOutputStreamHC4 extends OutputStream {
/**
* Wrapped session output buffer.
@@ -77,7 +77,7 @@ public class ContentLengthOutputStream e
*
* @since 4.0
*/
- public ContentLengthOutputStream(final SessionOutputBuffer out, final long contentLength) {
+ public ContentLengthOutputStreamHC4(final SessionOutputBuffer out, final long contentLength) {
super();
this.out = Args.notNull(out, "Session output buffer");
this.contentLength = Args.notNegative(contentLength, "Content length");
Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpRequestParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpRequestParser.java?rev=1552414&r1=1552413&r2=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpRequestParser.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpRequestParser.java Thu Dec 19 20:20:02 2013
@@ -37,7 +37,7 @@ import org.apache.http.ParseException;
import org.apache.http.RequestLine;
import org.apache.http.annotation.NotThreadSafe;
import org.apache.http.config.MessageConstraints;
-import org.apache.http.impl.DefaultHttpRequestFactory;
+import org.apache.http.impl.DefaultHttpRequestFactoryHC4;
import org.apache.http.io.SessionInputBuffer;
import org.apache.http.message.LineParser;
import org.apache.http.message.ParserCursor;
@@ -53,7 +53,7 @@ import org.apache.http.util.CharArrayBuf
*/
@SuppressWarnings("deprecation")
@NotThreadSafe
-public class DefaultHttpRequestParser extends AbstractMessageParser<HttpRequest> {
+public class DefaultHttpRequestParser extends AbstractMessageParserHC4<HttpRequest> {
private final HttpRequestFactory requestFactory;
private final CharArrayBuffer lineBuf;
@@ -87,9 +87,9 @@ public class DefaultHttpRequestParser ex
*
* @param buffer the session input buffer.
* @param lineParser the line parser. If <code>null</code>
- * {@link org.apache.http.message.BasicLineParser#INSTANCE} will be used.
+ * {@link org.apache.http.message.BasicLineParserHC4#INSTANCE} will be used.
* @param requestFactory the response factory. If <code>null</code>
- * {@link DefaultHttpRequestFactory#INSTANCE} will be used.
+ * {@link DefaultHttpRequestFactoryHC4#INSTANCE} will be used.
* @param constraints the message constraints. If <code>null</code>
* {@link MessageConstraints#DEFAULT} will be used.
*
@@ -102,7 +102,7 @@ public class DefaultHttpRequestParser ex
final MessageConstraints constraints) {
super(buffer, lineParser, constraints);
this.requestFactory = requestFactory != null ? requestFactory :
- DefaultHttpRequestFactory.INSTANCE;
+ DefaultHttpRequestFactoryHC4.INSTANCE;
this.lineBuf = new CharArrayBuffer(128);
}
Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpRequestParserFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpRequestParserFactory.java?rev=1552414&r1=1552413&r2=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpRequestParserFactory.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpRequestParserFactory.java Thu Dec 19 20:20:02 2013
@@ -31,11 +31,11 @@ import org.apache.http.HttpRequest;
import org.apache.http.HttpRequestFactory;
import org.apache.http.annotation.Immutable;
import org.apache.http.config.MessageConstraints;
-import org.apache.http.impl.DefaultHttpRequestFactory;
+import org.apache.http.impl.DefaultHttpRequestFactoryHC4;
import org.apache.http.io.HttpMessageParser;
import org.apache.http.io.HttpMessageParserFactory;
import org.apache.http.io.SessionInputBuffer;
-import org.apache.http.message.BasicLineParser;
+import org.apache.http.message.BasicLineParserHC4;
import org.apache.http.message.LineParser;
/**
@@ -54,16 +54,16 @@ public class DefaultHttpRequestParserFac
public DefaultHttpRequestParserFactory(final LineParser lineParser,
final HttpRequestFactory requestFactory) {
super();
- this.lineParser = lineParser != null ? lineParser : BasicLineParser.INSTANCE;
+ this.lineParser = lineParser != null ? lineParser : BasicLineParserHC4.INSTANCE;
this.requestFactory = requestFactory != null ? requestFactory
- : DefaultHttpRequestFactory.INSTANCE;
+ : DefaultHttpRequestFactoryHC4.INSTANCE;
}
public DefaultHttpRequestParserFactory() {
this(null, null);
}
- public HttpMessageParser<HttpRequest> create(final SessionInputBuffer buffer,
+ public HttpMessageParser create(final SessionInputBuffer buffer,
final MessageConstraints constraints) {
return new DefaultHttpRequestParser(buffer, lineParser, requestFactory, constraints);
}
Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpRequestWriter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpRequestWriter.java?rev=1552414&r1=1552413&r2=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpRequestWriter.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpRequestWriter.java Thu Dec 19 20:20:02 2013
@@ -29,6 +29,7 @@ package org.apache.http.impl.io;
import java.io.IOException;
+import org.apache.http.HttpMessage;
import org.apache.http.HttpRequest;
import org.apache.http.annotation.NotThreadSafe;
import org.apache.http.io.SessionOutputBuffer;
@@ -40,14 +41,14 @@ import org.apache.http.message.LineForma
* @since 4.3
*/
@NotThreadSafe
-public class DefaultHttpRequestWriter extends AbstractMessageWriter<HttpRequest> {
+public class DefaultHttpRequestWriter extends AbstractMessageWriterHC4 {
/**
* Creates an instance of DefaultHttpRequestWriter.
*
* @param buffer the session output buffer.
* @param formatter the line formatter If <code>null</code>
- * {@link org.apache.http.message.BasicLineFormatter#INSTANCE}
+ * {@link org.apache.http.message.BasicLineFormatterHC4#INSTANCE}
* will be used.
*/
public DefaultHttpRequestWriter(
@@ -61,8 +62,8 @@ public class DefaultHttpRequestWriter ex
}
@Override
- protected void writeHeadLine(final HttpRequest message) throws IOException {
- lineFormatter.formatRequestLine(this.lineBuf, message.getRequestLine());
+ protected void writeHeadLine(final HttpMessage message) throws IOException {
+ lineFormatter.formatRequestLine(this.lineBuf, ((HttpRequest) message).getRequestLine());
this.sessionBuffer.writeLine(this.lineBuf);
}
Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpRequestWriterFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpRequestWriterFactory.java?rev=1552414&r1=1552413&r2=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpRequestWriterFactory.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpRequestWriterFactory.java Thu Dec 19 20:20:02 2013
@@ -32,7 +32,7 @@ import org.apache.http.annotation.Immuta
import org.apache.http.io.HttpMessageWriter;
import org.apache.http.io.HttpMessageWriterFactory;
import org.apache.http.io.SessionOutputBuffer;
-import org.apache.http.message.BasicLineFormatter;
+import org.apache.http.message.BasicLineFormatterHC4;
import org.apache.http.message.LineFormatter;
/**
@@ -49,14 +49,14 @@ public class DefaultHttpRequestWriterFac
public DefaultHttpRequestWriterFactory(final LineFormatter lineFormatter) {
super();
- this.lineFormatter = lineFormatter != null ? lineFormatter : BasicLineFormatter.INSTANCE;
+ this.lineFormatter = lineFormatter != null ? lineFormatter : BasicLineFormatterHC4.INSTANCE;
}
public DefaultHttpRequestWriterFactory() {
this(null);
}
- public HttpMessageWriter<HttpRequest> create(final SessionOutputBuffer buffer) {
+ public HttpMessageWriter create(final SessionOutputBuffer buffer) {
return new DefaultHttpRequestWriter(buffer, lineFormatter);
}
Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpResponseParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpResponseParser.java?rev=1552414&r1=1552413&r2=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpResponseParser.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpResponseParser.java Thu Dec 19 20:20:02 2013
@@ -37,7 +37,7 @@ import org.apache.http.ParseException;
import org.apache.http.StatusLine;
import org.apache.http.annotation.NotThreadSafe;
import org.apache.http.config.MessageConstraints;
-import org.apache.http.impl.DefaultHttpResponseFactory;
+import org.apache.http.impl.DefaultHttpResponseFactoryHC4;
import org.apache.http.io.SessionInputBuffer;
import org.apache.http.message.LineParser;
import org.apache.http.message.ParserCursor;
@@ -53,7 +53,7 @@ import org.apache.http.util.CharArrayBuf
*/
@SuppressWarnings("deprecation")
@NotThreadSafe
-public class DefaultHttpResponseParser extends AbstractMessageParser<HttpResponse> {
+public class DefaultHttpResponseParser extends AbstractMessageParserHC4<HttpResponse> {
private final HttpResponseFactory responseFactory;
private final CharArrayBuffer lineBuf;
@@ -87,9 +87,9 @@ public class DefaultHttpResponseParser e
*
* @param buffer the session input buffer.
* @param lineParser the line parser. If <code>null</code>
- * {@link org.apache.http.message.BasicLineParser#INSTANCE} will be used
+ * {@link org.apache.http.message.BasicLineParserHC4#INSTANCE} will be used
* @param responseFactory the response factory. If <code>null</code>
- * {@link DefaultHttpResponseFactory#INSTANCE} will be used.
+ * {@link DefaultHttpResponseFactoryHC4#INSTANCE} will be used.
* @param constraints the message constraints. If <code>null</code>
* {@link MessageConstraints#DEFAULT} will be used.
*
@@ -102,7 +102,7 @@ public class DefaultHttpResponseParser e
final MessageConstraints constraints) {
super(buffer, lineParser, constraints);
this.responseFactory = responseFactory != null ? responseFactory :
- DefaultHttpResponseFactory.INSTANCE;
+ DefaultHttpResponseFactoryHC4.INSTANCE;
this.lineBuf = new CharArrayBuffer(128);
}
Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpResponseParserFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpResponseParserFactory.java?rev=1552414&r1=1552413&r2=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpResponseParserFactory.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpResponseParserFactory.java Thu Dec 19 20:20:02 2013
@@ -31,11 +31,11 @@ import org.apache.http.HttpResponse;
import org.apache.http.HttpResponseFactory;
import org.apache.http.annotation.Immutable;
import org.apache.http.config.MessageConstraints;
-import org.apache.http.impl.DefaultHttpResponseFactory;
+import org.apache.http.impl.DefaultHttpResponseFactoryHC4;
import org.apache.http.io.HttpMessageParser;
import org.apache.http.io.HttpMessageParserFactory;
import org.apache.http.io.SessionInputBuffer;
-import org.apache.http.message.BasicLineParser;
+import org.apache.http.message.BasicLineParserHC4;
import org.apache.http.message.LineParser;
/**
@@ -54,16 +54,16 @@ public class DefaultHttpResponseParserFa
public DefaultHttpResponseParserFactory(final LineParser lineParser,
final HttpResponseFactory responseFactory) {
super();
- this.lineParser = lineParser != null ? lineParser : BasicLineParser.INSTANCE;
+ this.lineParser = lineParser != null ? lineParser : BasicLineParserHC4.INSTANCE;
this.responseFactory = responseFactory != null ? responseFactory
- : DefaultHttpResponseFactory.INSTANCE;
+ : DefaultHttpResponseFactoryHC4.INSTANCE;
}
public DefaultHttpResponseParserFactory() {
this(null, null);
}
- public HttpMessageParser<HttpResponse> create(final SessionInputBuffer buffer,
+ public HttpMessageParser create(final SessionInputBuffer buffer,
final MessageConstraints constraints) {
return new DefaultHttpResponseParser(buffer, lineParser, responseFactory, constraints);
}
Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpResponseWriter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpResponseWriter.java?rev=1552414&r1=1552413&r2=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpResponseWriter.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpResponseWriter.java Thu Dec 19 20:20:02 2013
@@ -29,6 +29,7 @@ package org.apache.http.impl.io;
import java.io.IOException;
+import org.apache.http.HttpMessage;
import org.apache.http.HttpResponse;
import org.apache.http.annotation.NotThreadSafe;
import org.apache.http.io.SessionOutputBuffer;
@@ -40,14 +41,14 @@ import org.apache.http.message.LineForma
* @since 4.3
*/
@NotThreadSafe
-public class DefaultHttpResponseWriter extends AbstractMessageWriter<HttpResponse> {
+public class DefaultHttpResponseWriter extends AbstractMessageWriterHC4 {
/**
* Creates an instance of DefaultHttpResponseWriter.
*
* @param buffer the session output buffer.
* @param formatter the line formatter If <code>null</code>
- * {@link org.apache.http.message.BasicLineFormatter#INSTANCE}
+ * {@link org.apache.http.message.BasicLineFormatterHC4#INSTANCE}
* will be used.
*/
public DefaultHttpResponseWriter(
@@ -61,8 +62,8 @@ public class DefaultHttpResponseWriter e
}
@Override
- protected void writeHeadLine(final HttpResponse message) throws IOException {
- lineFormatter.formatStatusLine(this.lineBuf, message.getStatusLine());
+ protected void writeHeadLine(final HttpMessage message) throws IOException {
+ lineFormatter.formatStatusLine(this.lineBuf, ((HttpResponse) message).getStatusLine());
this.sessionBuffer.writeLine(this.lineBuf);
}
Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpResponseWriterFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpResponseWriterFactory.java?rev=1552414&r1=1552413&r2=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpResponseWriterFactory.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/DefaultHttpResponseWriterFactory.java Thu Dec 19 20:20:02 2013
@@ -32,7 +32,7 @@ import org.apache.http.annotation.Immuta
import org.apache.http.io.HttpMessageWriter;
import org.apache.http.io.HttpMessageWriterFactory;
import org.apache.http.io.SessionOutputBuffer;
-import org.apache.http.message.BasicLineFormatter;
+import org.apache.http.message.BasicLineFormatterHC4;
import org.apache.http.message.LineFormatter;
/**
@@ -49,14 +49,14 @@ public class DefaultHttpResponseWriterFa
public DefaultHttpResponseWriterFactory(final LineFormatter lineFormatter) {
super();
- this.lineFormatter = lineFormatter != null ? lineFormatter : BasicLineFormatter.INSTANCE;
+ this.lineFormatter = lineFormatter != null ? lineFormatter : BasicLineFormatterHC4.INSTANCE;
}
public DefaultHttpResponseWriterFactory() {
this(null);
}
- public HttpMessageWriter<HttpResponse> create(final SessionOutputBuffer buffer) {
+ public HttpMessageWriter create(final SessionOutputBuffer buffer) {
return new DefaultHttpResponseWriter(buffer, lineFormatter);
}
Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/IdentityInputStreamHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/IdentityInputStream.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/IdentityInputStreamHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/IdentityInputStreamHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/IdentityInputStream.java&r1=1548964&r2=1552414&rev=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/IdentityInputStream.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/IdentityInputStreamHC4.java Thu Dec 19 20:20:02 2013
@@ -48,7 +48,7 @@ import org.apache.http.util.Args;
* @since 4.0
*/
@NotThreadSafe
-public class IdentityInputStream extends InputStream {
+public class IdentityInputStreamHC4 extends InputStream {
private final SessionInputBuffer in;
@@ -59,7 +59,7 @@ public class IdentityInputStream extends
*
* @param in The session input buffer
*/
- public IdentityInputStream(final SessionInputBuffer in) {
+ public IdentityInputStreamHC4(final SessionInputBuffer in) {
super();
this.in = Args.notNull(in, "Session input buffer");
}
Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/IdentityOutputStreamHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/IdentityOutputStream.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/IdentityOutputStreamHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/IdentityOutputStreamHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/IdentityOutputStream.java&r1=1548964&r2=1552414&rev=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/IdentityOutputStream.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/IdentityOutputStreamHC4.java Thu Dec 19 20:20:02 2013
@@ -47,7 +47,7 @@ import org.apache.http.util.Args;
* @since 4.0
*/
@NotThreadSafe
-public class IdentityOutputStream extends OutputStream {
+public class IdentityOutputStreamHC4 extends OutputStream {
/**
* Wrapped session output buffer.
@@ -57,7 +57,7 @@ public class IdentityOutputStream extend
/** True if the stream is closed. */
private boolean closed = false;
- public IdentityOutputStream(final SessionOutputBuffer out) {
+ public IdentityOutputStreamHC4(final SessionOutputBuffer out) {
super();
this.out = Args.notNull(out, "Session output buffer");
}
Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/package.html
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/package.html?rev=1552414&r1=1552413&r2=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/package.html (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/package.html Thu Dec 19 20:20:02 2013
@@ -37,8 +37,8 @@ Default implementations for interfaces i
There are implementations of the transport encodings used by HTTP,
in particular the chunked coding for
-{@link org.apache.http.impl.io.ChunkedOutputStream sending} and
-{@link org.apache.http.impl.io.ChunkedInputStream receiving} entities.
+{@link org.apache.http.impl.io.ChunkedOutputStreamHC4 sending} and
+{@link org.apache.http.impl.io.ChunkedInputStreamHC4 receiving} entities.
</body>
</html>
Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/io/HttpMessageParserFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/io/HttpMessageParserFactory.java?rev=1552414&r1=1552413&r2=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/io/HttpMessageParserFactory.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/io/HttpMessageParserFactory.java Thu Dec 19 20:20:02 2013
@@ -37,6 +37,6 @@ import org.apache.http.config.MessageCon
*/
public interface HttpMessageParserFactory<T extends HttpMessage> {
- HttpMessageParser<T> create(SessionInputBuffer buffer, MessageConstraints constraints);
+ HttpMessageParser create(SessionInputBuffer buffer, MessageConstraints constraints);
}
Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/io/HttpMessageWriterFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/io/HttpMessageWriterFactory.java?rev=1552414&r1=1552413&r2=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/io/HttpMessageWriterFactory.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/io/HttpMessageWriterFactory.java Thu Dec 19 20:20:02 2013
@@ -36,6 +36,6 @@ import org.apache.http.HttpMessage;
*/
public interface HttpMessageWriterFactory<T extends HttpMessage> {
- HttpMessageWriter<T> create(SessionOutputBuffer buffer);
+ HttpMessageWriter create(SessionOutputBuffer buffer);
}
Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/message/BasicHeaderValueFormatterHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/message/BasicHeaderValueFormatter.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/message/BasicHeaderValueFormatterHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/message/BasicHeaderValueFormatterHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/message/BasicHeaderValueFormatter.java&r1=1548964&r2=1552414&rev=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/message/BasicHeaderValueFormatter.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/message/BasicHeaderValueFormatterHC4.java Thu Dec 19 20:20:02 2013
@@ -41,7 +41,7 @@ import org.apache.http.util.CharArrayBuf
* @since 4.0
*/
@Immutable
-public class BasicHeaderValueFormatter implements HeaderValueFormatter {
+public class BasicHeaderValueFormatterHC4 implements HeaderValueFormatter {
/**
* A default instance of this class, for use as default or fallback.
@@ -53,9 +53,9 @@ public class BasicHeaderValueFormatter i
*/
@Deprecated
public final static
- BasicHeaderValueFormatter DEFAULT = new BasicHeaderValueFormatter();
+ BasicHeaderValueFormatterHC4 DEFAULT = new BasicHeaderValueFormatterHC4();
- public final static BasicHeaderValueFormatter INSTANCE = new BasicHeaderValueFormatter();
+ public final static BasicHeaderValueFormatterHC4 INSTANCE = new BasicHeaderValueFormatterHC4();
/**
* Special characters that can be used as separators in HTTP parameters.
@@ -70,7 +70,7 @@ public class BasicHeaderValueFormatter i
*/
public final static String UNSAFE_CHARS = "\"\\";
- public BasicHeaderValueFormatter() {
+ public BasicHeaderValueFormatterHC4() {
super();
}
@@ -89,7 +89,7 @@ public class BasicHeaderValueFormatter i
String formatElements(final HeaderElement[] elems,
final boolean quote,
final HeaderValueFormatter formatter) {
- return (formatter != null ? formatter : BasicHeaderValueFormatter.INSTANCE)
+ return (formatter != null ? formatter : BasicHeaderValueFormatterHC4.INSTANCE)
.formatElements(null, elems, quote).toString();
}
@@ -155,7 +155,7 @@ public class BasicHeaderValueFormatter i
String formatHeaderElement(final HeaderElement elem,
final boolean quote,
final HeaderValueFormatter formatter) {
- return (formatter != null ? formatter : BasicHeaderValueFormatter.INSTANCE)
+ return (formatter != null ? formatter : BasicHeaderValueFormatterHC4.INSTANCE)
.formatHeaderElement(null, elem, quote).toString();
}
@@ -240,7 +240,7 @@ public class BasicHeaderValueFormatter i
String formatParameters(final NameValuePair[] nvps,
final boolean quote,
final HeaderValueFormatter formatter) {
- return (formatter != null ? formatter : BasicHeaderValueFormatter.INSTANCE)
+ return (formatter != null ? formatter : BasicHeaderValueFormatterHC4.INSTANCE)
.formatParameters(null, nvps, quote).toString();
}
@@ -305,7 +305,7 @@ public class BasicHeaderValueFormatter i
String formatNameValuePair(final NameValuePair nvp,
final boolean quote,
final HeaderValueFormatter formatter) {
- return (formatter != null ? formatter : BasicHeaderValueFormatter.INSTANCE)
+ return (formatter != null ? formatter : BasicHeaderValueFormatterHC4.INSTANCE)
.formatNameValuePair(null, nvp, quote).toString();
}
@@ -419,4 +419,4 @@ public class BasicHeaderValueFormatter i
}
-} // class BasicHeaderValueFormatter
+} // class BasicHeaderValueFormatterHC4
Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/message/BasicHeaderValueParserHC4.java (from r1548964, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/message/BasicHeaderValueParser.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/message/BasicHeaderValueParserHC4.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/message/BasicHeaderValueParserHC4.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/message/BasicHeaderValueParser.java&r1=1548964&r2=1552414&rev=1552414&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/message/BasicHeaderValueParser.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/message/BasicHeaderValueParserHC4.java Thu Dec 19 20:20:02 2013
@@ -46,7 +46,7 @@ import org.apache.http.util.CharArrayBuf
* @since 4.0
*/
@Immutable
-public class BasicHeaderValueParser implements HeaderValueParser {
+public class BasicHeaderValueParserHC4 implements HeaderValueParser {
/**
* A default instance of this class, for use as default or fallback.
@@ -58,9 +58,9 @@ public class BasicHeaderValueParser impl
*/
@Deprecated
public final static
- BasicHeaderValueParser DEFAULT = new BasicHeaderValueParser();
+ BasicHeaderValueParserHC4 DEFAULT = new BasicHeaderValueParserHC4();
- public final static BasicHeaderValueParser INSTANCE = new BasicHeaderValueParser();
+ public final static BasicHeaderValueParserHC4 INSTANCE = new BasicHeaderValueParserHC4();
private final static char PARAM_DELIMITER = ';';
private final static char ELEM_DELIMITER = ',';
@@ -69,7 +69,7 @@ public class BasicHeaderValueParser impl
ELEM_DELIMITER
};
- public BasicHeaderValueParser() {
+ public BasicHeaderValueParserHC4() {
super();
}
@@ -89,7 +89,7 @@ public class BasicHeaderValueParser impl
final CharArrayBuffer buffer = new CharArrayBuffer(value.length());
buffer.append(value);
final ParserCursor cursor = new ParserCursor(0, value.length());
- return (parser != null ? parser : BasicHeaderValueParser.INSTANCE)
+ return (parser != null ? parser : BasicHeaderValueParserHC4.INSTANCE)
.parseElements(buffer, cursor);
}
@@ -126,7 +126,7 @@ public class BasicHeaderValueParser impl
final CharArrayBuffer buffer = new CharArrayBuffer(value.length());
buffer.append(value);
final ParserCursor cursor = new ParserCursor(0, value.length());
- return (parser != null ? parser : BasicHeaderValueParser.INSTANCE)
+ return (parser != null ? parser : BasicHeaderValueParserHC4.INSTANCE)
.parseHeaderElement(buffer, cursor);
}
@@ -178,7 +178,7 @@ public class BasicHeaderValueParser impl
final CharArrayBuffer buffer = new CharArrayBuffer(value.length());
buffer.append(value);
final ParserCursor cursor = new ParserCursor(0, value.length());
- return (parser != null ? parser : BasicHeaderValueParser.INSTANCE)
+ return (parser != null ? parser : BasicHeaderValueParserHC4.INSTANCE)
.parseParameters(buffer, cursor);
}
@@ -234,7 +234,7 @@ public class BasicHeaderValueParser impl
final CharArrayBuffer buffer = new CharArrayBuffer(value.length());
buffer.append(value);
final ParserCursor cursor = new ParserCursor(0, value.length());
- return (parser != null ? parser : BasicHeaderValueParser.INSTANCE)
+ return (parser != null ? parser : BasicHeaderValueParserHC4.INSTANCE)
.parseNameValuePair(buffer, cursor);
}