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 2012/12/28 15:48:59 UTC
svn commit: r1426529 [2/2] - in /httpcomponents/httpclient/trunk: ./
fluent-hc/src/examples/org/apache/http/client/fluent/
fluent-hc/src/main/java/org/apache/http/client/fluent/
httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ httpclie...
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactory.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactory.java Fri Dec 28 14:48:57 2012
@@ -39,7 +39,7 @@ import java.net.UnknownHostException;
*
* @deprecated (4.1) use {@link SchemeSocketFactory}
*/
-@Deprecated
+@Deprecated
public interface LayeredSocketFactory extends SocketFactory {
/**
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java Fri Dec 28 14:48:57 2012
@@ -119,7 +119,7 @@ public final class Scheme {
*
* @deprecated (4.1) Use {@link #Scheme(String, int, SchemeSocketFactory)}
*/
- @Deprecated
+ @Deprecated
public Scheme(final String name,
final SocketFactory factory,
final int port) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor2.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor2.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor2.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor2.java Fri Dec 28 14:48:57 2012
@@ -38,7 +38,7 @@ import org.apache.http.params.HttpParams
/**
* @deprecated (4.2) do not use
*/
-@Deprecated
+@Deprecated
class SchemeLayeredSocketFactoryAdaptor2 implements SchemeLayeredSocketFactory {
private final LayeredSchemeSocketFactory factory;
@@ -53,9 +53,9 @@ class SchemeLayeredSocketFactoryAdaptor2
}
public Socket connectSocket(
- final Socket sock,
+ final Socket sock,
final InetSocketAddress remoteAddress,
- final InetSocketAddress localAddress,
+ final InetSocketAddress localAddress,
final HttpParams params) throws IOException, UnknownHostException, ConnectTimeoutException {
return this.factory.connectSocket(sock, remoteAddress, localAddress, params);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLInitializationException.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLInitializationException.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLInitializationException.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLInitializationException.java Fri Dec 28 14:48:57 2012
@@ -32,6 +32,6 @@ public class SSLInitializationException
public SSLInitializationException(final String message, final Throwable cause) {
super(message, cause);
- }
-
+ }
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/params/CookieSpecPNames.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/params/CookieSpecPNames.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/params/CookieSpecPNames.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/params/CookieSpecPNames.java Fri Dec 28 14:48:57 2012
@@ -33,7 +33,7 @@ import org.apache.http.cookie.CookieSpec
* Parameter names for HTTP cookie management classes.
*
* @since 4.0
- *
+ *
* @deprecated (4.3) use constructor parameters of {@link CookieSpecProvider}s.
*/
@Deprecated
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/params/CookieSpecParamBean.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/params/CookieSpecParamBean.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/params/CookieSpecParamBean.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/params/CookieSpecParamBean.java Fri Dec 28 14:48:57 2012
@@ -40,7 +40,7 @@ import org.apache.http.params.HttpParams
* conventions.
*
* @since 4.0
- *
+ *
* @deprecated (4.3) use constructor parameters of {@link CookieSpecProvider}s.
*/
@Deprecated
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java Fri Dec 28 14:48:57 2012
@@ -113,7 +113,7 @@ public abstract class GGSSchemeBase exte
/**
* @deprecated (4.2) Use {@link ContextAwareAuthScheme#authenticate(Credentials, HttpRequest, org.apache.http.protocol.HttpContext)}
*/
- @Deprecated
+ @Deprecated
public Header authenticate(
final Credentials credentials,
final HttpRequest request) throws AuthenticationException {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java Fri Dec 28 14:48:57 2012
@@ -1234,7 +1234,7 @@ final class NTLMEngineImpl implements NT
// Start the response. Length includes signature and type
prepareResponse(finalLength, 3);
-
+
// LM Resp Length (twice)
addUShort(lmRespLen);
addUShort(lmRespLen);
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java Fri Dec 28 14:48:57 2012
@@ -84,7 +84,7 @@ public class NegotiateScheme extends GGS
}
@Override
- public Header authenticate(
+ public Header authenticate(
final Credentials credentials,
final HttpRequest request) throws AuthenticationException {
return authenticate(credentials, request, null);
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateSchemeFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateSchemeFactory.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateSchemeFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateSchemeFactory.java Fri Dec 28 14:48:57 2012
@@ -38,7 +38,7 @@ import org.apache.http.params.HttpParams
*
* @deprecated (4.2) use {@link SPNegoSchemeFactory} or {@link KerberosSchemeFactory}.
*/
-@Deprecated
+@Deprecated
public class NegotiateSchemeFactory implements AuthSchemeFactory {
private final SpnegoTokenGenerator spengoGenerator;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractAuthenticationHandler.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractAuthenticationHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractAuthenticationHandler.java Fri Dec 28 14:48:57 2012
@@ -61,7 +61,7 @@ import org.apache.http.util.CharArrayBuf
*
* @deprecated (4.2) use {@link AuthenticationStrategy}
*/
-@Deprecated
+@Deprecated
@Immutable
public abstract class AbstractAuthenticationHandler implements AuthenticationHandler {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java Fri Dec 28 14:48:57 2012
@@ -174,7 +174,7 @@ import org.apache.http.util.Args;
* shut down by calling {@link ClientConnectionManager#shutdown()}!
*
* @since 4.0
- *
+ *
* @deprecated (4.3) use {@link HttpClientBuilder}.
*/
@ThreadSafe
@@ -395,7 +395,7 @@ public abstract class AbstractHttpClient
/**
* @deprecated (4.1) do not use
*/
- @Deprecated
+ @Deprecated
protected RedirectHandler createRedirectHandler() {
return new DefaultRedirectHandler();
}
@@ -407,7 +407,7 @@ public abstract class AbstractHttpClient
/**
* @deprecated (4.2) do not use
*/
- @Deprecated
+ @Deprecated
protected AuthenticationHandler createTargetAuthenticationHandler() {
return new DefaultTargetAuthenticationHandler();
}
@@ -419,7 +419,7 @@ public abstract class AbstractHttpClient
/**
* @deprecated (4.2) do not use
*/
- @Deprecated
+ @Deprecated
protected AuthenticationHandler createProxyAuthenticationHandler() {
return new DefaultProxyAuthenticationHandler();
}
@@ -553,7 +553,7 @@ public abstract class AbstractHttpClient
/**
* @deprecated (4.1) do not use
*/
- @Deprecated
+ @Deprecated
public synchronized final RedirectHandler getRedirectHandler() {
return createRedirectHandler();
}
@@ -561,7 +561,7 @@ public abstract class AbstractHttpClient
/**
* @deprecated (4.1) do not use
*/
- @Deprecated
+ @Deprecated
public synchronized void setRedirectHandler(final RedirectHandler handler) {
this.redirectStrategy = new DefaultRedirectStrategyAdaptor(handler);
}
@@ -586,7 +586,7 @@ public abstract class AbstractHttpClient
/**
* @deprecated (4.2) do not use
*/
- @Deprecated
+ @Deprecated
public synchronized final AuthenticationHandler getTargetAuthenticationHandler() {
return createTargetAuthenticationHandler();
}
@@ -594,7 +594,7 @@ public abstract class AbstractHttpClient
/**
* @deprecated (4.2) do not use
*/
- @Deprecated
+ @Deprecated
public synchronized void setTargetAuthenticationHandler(final AuthenticationHandler handler) {
this.targetAuthStrategy = new AuthenticationStrategyAdaptor(handler);
}
@@ -619,7 +619,7 @@ public abstract class AbstractHttpClient
/**
* @deprecated (4.2) do not use
*/
- @Deprecated
+ @Deprecated
public synchronized final AuthenticationHandler getProxyAuthenticationHandler() {
return createProxyAuthenticationHandler();
}
@@ -627,7 +627,7 @@ public abstract class AbstractHttpClient
/**
* @deprecated (4.2) do not use
*/
- @Deprecated
+ @Deprecated
public synchronized void setProxyAuthenticationHandler(final AuthenticationHandler handler) {
this.proxyAuthStrategy = new AuthenticationStrategyAdaptor(handler);
}
@@ -777,7 +777,7 @@ public abstract class AbstractHttpClient
}
@Override
- protected final CloseableHttpResponse doExecute(HttpHost target, HttpRequest request,
+ protected final CloseableHttpResponse doExecute(HttpHost target, HttpRequest request,
HttpContext context)
throws IOException, ClientProtocolException {
@@ -894,7 +894,7 @@ public abstract class AbstractHttpClient
/**
* @deprecated (4.2) do not use
*/
- @Deprecated
+ @Deprecated
protected RequestDirector createClientRequestDirector(
final HttpRequestExecutor requestExec,
final ClientConnectionManager conman,
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AutoRetryHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AutoRetryHttpClient.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AutoRetryHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AutoRetryHttpClient.java Fri Dec 28 14:48:57 2012
@@ -52,7 +52,7 @@ import org.apache.http.util.EntityUtils;
* a non-2xx response using the {@link ServiceUnavailableRetryStrategy} interface.
*
* @since 4.2
- *
+ *
* @deprecated (4.3) use {@link HttpClientBuilder}.
*/
@Deprecated
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ClientParamsStack.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ClientParamsStack.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ClientParamsStack.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ClientParamsStack.java Fri Dec 28 14:48:57 2012
@@ -66,7 +66,7 @@ import org.apache.http.util.Args;
* when looking up parameters.
*
* @since 4.0
- *
+ *
* @deprecated (4.3) use {@link DefaultedHttpParams}
*/
@NotThreadSafe
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ContentEncodingHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ContentEncodingHttpClient.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ContentEncodingHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ContentEncodingHttpClient.java Fri Dec 28 14:48:57 2012
@@ -37,7 +37,7 @@ import org.apache.http.protocol.BasicHtt
/**
* {@link DefaultHttpClient} sub-class which includes a {@link RequestAcceptEncoding}
* for the request and response.
- *
+ *
* <b>Deprecation note:</b> due to the way this class modifies a response body
* without changing the response headers to reflect the entity changes, it cannot
* be used as the "backend" for a caching {@link HttpClient} and still
@@ -47,7 +47,7 @@ import org.apache.http.protocol.BasicHtt
* responses in compressed or uncompressed form.
*
* @since 4.1
- *
+ *
* @deprecated (4.2) use {@link HttpClientBuilder}
*/
@Deprecated
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DecompressingHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DecompressingHttpClient.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DecompressingHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DecompressingHttpClient.java Fri Dec 28 14:48:57 2012
@@ -58,20 +58,20 @@ import org.apache.http.util.EntityUtils;
* header on the response to uncompress any compressed response bodies.
* The {@link java.io.InputStream} of the entity will contain the uncompressed
* content.</p>
- *
+ *
* <p><b>N.B.</b> Any upstream clients of this class need to be aware that
* this effectively obscures visibility into the length of a server
* response body, since the <code>Content-Length</code> header will
* correspond to the compressed entity length received from the server,
* but the content length experienced by reading the response body may
* be different (hopefully higher!).</p>
- *
- * <p>That said, this decorator is compatible with the
- * <code>CachingHttpClient</code> in that the two decorators can be added
- * in either order and still have cacheable responses be cached.</p>
- *
+ *
+ * <p>That said, this decorator is compatible with the
+ * <code>CachingHttpClient</code> in that the two decorators can be added
+ * in either order and still have cacheable responses be cached.</p>
+ *
* @since 4.2
- *
+ *
* @deprecated (4.3) use {@link HttpClientBuilder}
*/
@Deprecated
@@ -80,7 +80,7 @@ public class DecompressingHttpClient imp
private final HttpClient backend;
private final HttpRequestInterceptor acceptEncodingInterceptor;
private final HttpResponseInterceptor contentEncodingInterceptor;
-
+
/**
* Constructs a decorator to ask for and handle compressed
* entities on the fly.
@@ -98,9 +98,9 @@ public class DecompressingHttpClient imp
public DecompressingHttpClient(HttpClient backend) {
this(backend, new RequestAcceptEncoding(), new ResponseContentEncoding());
}
-
- DecompressingHttpClient(HttpClient backend,
- HttpRequestInterceptor requestInterceptor,
+
+ DecompressingHttpClient(HttpClient backend,
+ HttpRequestInterceptor requestInterceptor,
HttpResponseInterceptor responseInterceptor) {
this.backend = backend;
this.acceptEncodingInterceptor = requestInterceptor;
@@ -122,7 +122,7 @@ public class DecompressingHttpClient imp
/**
* Gets the HttpClient to issue request.
- *
+ *
* @return the HttpClient to issue request
*/
public HttpClient getHttpClient() {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java Fri Dec 28 14:48:57 2012
@@ -111,7 +111,7 @@ import org.apache.http.util.VersionInfo;
* </ul>
*
* @since 4.0
- *
+ *
* @deprecated (4.3) use {@link HttpClientBuilder}.
*/
@ThreadSafe
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java Fri Dec 28 14:48:57 2012
@@ -154,11 +154,11 @@ public class DefaultHttpRequestRetryHand
/**
* @since 4.2
- *
+ *
* @deprecated (4.3)
*/
@Deprecated
- protected boolean requestIsAborted(final HttpRequest request) {
+ protected boolean requestIsAborted(final HttpRequest request) {
HttpRequest req = request;
if (request instanceof RequestWrapper) { // does not forward request to original
req = ((RequestWrapper) request).getOriginal();
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.java Fri Dec 28 14:48:57 2012
@@ -49,7 +49,7 @@ import org.apache.http.util.Args;
*
* @deprecated (4.2) use {@link ProxyAuthenticationStrategy}
*/
-@Deprecated
+@Deprecated
@Immutable
public class DefaultProxyAuthenticationHandler extends AbstractAuthenticationHandler {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategyAdaptor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategyAdaptor.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategyAdaptor.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategyAdaptor.java Fri Dec 28 14:48:57 2012
@@ -44,7 +44,7 @@ import org.apache.http.protocol.HttpCont
* @deprecated (4.1) do not use
*/
@Immutable
-@Deprecated
+@Deprecated
class DefaultRedirectStrategyAdaptor implements RedirectStrategy {
private final RedirectHandler handler;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java Fri Dec 28 14:48:57 2012
@@ -128,7 +128,7 @@ import org.apache.http.util.EntityUtils;
* </ul>
*
* @since 4.0
- *
+ *
* @deprecated (4.3)
*/
@Deprecated
@@ -1050,7 +1050,7 @@ public class DefaultRequestDirector impl
}
}
}
-
+
if (HttpClientParams.isRedirecting(params) &&
this.redirectStrategy.isRedirected(request, response, context)) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java Fri Dec 28 14:48:57 2012
@@ -48,10 +48,10 @@ import org.apache.http.protocol.HTTP;
* the state of the original request.
*
* @since 4.0
- *
+ *
* @deprecated (4.3) do not use.
*/
-@Deprecated
+@Deprecated
@NotThreadSafe // e.g. [gs]etEntity()
public class EntityEnclosingRequestWrapper extends RequestWrapper
implements HttpEntityEnclosingRequest {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java Fri Dec 28 14:48:57 2012
@@ -330,7 +330,7 @@ public class HttpClientBuilder {
this.backoffManager = backoffManager;
return this;
}
-
+
public final HttpClientBuilder setServiceUnavailableRetryStrategy(
final ServiceUnavailableRetryStrategy serviceUnavailStrategy) {
this.serviceUnavailStrategy = serviceUnavailStrategy;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/InternalHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/InternalHttpClient.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/InternalHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/InternalHttpClient.java Fri Dec 28 14:48:57 2012
@@ -152,7 +152,7 @@ class InternalHttpClient extends Closeab
}
@Override
- protected CloseableHttpResponse doExecute(
+ protected CloseableHttpResponse doExecute(
final HttpHost target,
final HttpRequest request,
final HttpContext context) throws IOException, ClientProtocolException {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/MinimalHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/MinimalHttpClient.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/MinimalHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/MinimalHttpClient.java Fri Dec 28 14:48:57 2012
@@ -86,7 +86,7 @@ class MinimalHttpClient extends Closeabl
}
@Override
- protected CloseableHttpResponse doExecute(
+ protected CloseableHttpResponse doExecute(
final HttpHost target,
final HttpRequest request,
final HttpContext context) throws IOException, ClientProtocolException {
@@ -109,7 +109,7 @@ class MinimalHttpClient extends Closeabl
}
if (config.getDefaultProxy() != null) {
throw new ClientProtocolException("Minimal HttpClient does not support" +
- " request execution via proxy");
+ " request execution via proxy");
}
localcontext.setRequestConfig(config);
return this.requestExecutor.execute(route, wrapper, localcontext, execAware);
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/RequestWrapper.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/RequestWrapper.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/RequestWrapper.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/RequestWrapper.java Fri Dec 28 14:48:57 2012
@@ -50,11 +50,11 @@ import org.apache.http.util.Args;
* the state of the original request.
*
* @since 4.0
- *
+ *
* @deprecated (4.3) do not use.
*/
@NotThreadSafe
-@Deprecated
+@Deprecated
public class RequestWrapper extends AbstractHttpMessage implements HttpUriRequest {
private final HttpRequest original;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/RoutedRequest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/RoutedRequest.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/RoutedRequest.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/RoutedRequest.java Fri Dec 28 14:48:57 2012
@@ -34,7 +34,7 @@ import org.apache.http.conn.routing.Http
* A request with the route along which it should be sent.
*
* @since 4.0
- *
+ *
* @deprecated (4.3) do not use.
*/
@Deprecated
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/SystemDefaultHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/SystemDefaultHttpClient.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/SystemDefaultHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/SystemDefaultHttpClient.java Fri Dec 28 14:48:57 2012
@@ -101,7 +101,7 @@ import org.apache.http.params.HttpParams
* </p>
*
* @since 4.2
- *
+ *
* @deprecated (4.3) use {@link HttpClientBuilder}
*/
@ThreadSafe
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/execchain/Proxies.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/execchain/Proxies.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/execchain/Proxies.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/execchain/Proxies.java Fri Dec 28 14:48:57 2012
@@ -90,4 +90,4 @@ class Proxies {
new ResponseProxyHandler(original, connReleaseTrigger));
}
-}
\ No newline at end of file
+}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/execchain/RequestEntityExecHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/execchain/RequestEntityExecHandler.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/execchain/RequestEntityExecHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/execchain/RequestEntityExecHandler.java Fri Dec 28 14:48:57 2012
@@ -85,4 +85,4 @@ class RequestEntityExecHandler implement
}
}
-}
\ No newline at end of file
+}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/execchain/ServiceUnavailableRetryExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/execchain/ServiceUnavailableRetryExec.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/execchain/ServiceUnavailableRetryExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/execchain/ServiceUnavailableRetryExec.java Fri Dec 28 14:48:57 2012
@@ -57,7 +57,7 @@ public class ServiceUnavailableRetryExec
private final ServiceUnavailableRetryStrategy retryStrategy;
public ServiceUnavailableRetryExec(
- final ClientExecChain requestExecutor,
+ final ClientExecChain requestExecutor,
final ServiceUnavailableRetryStrategy retryStrategy) {
super();
Args.notNull(requestExecutor, "HTTP request executor");
@@ -67,7 +67,7 @@ public class ServiceUnavailableRetryExec
}
public CloseableHttpResponse execute(
- final HttpRoute route,
+ final HttpRoute route,
final HttpRequestWrapper request,
final HttpClientContext context,
final HttpExecutionAware execAware) throws IOException, HttpException {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java Fri Dec 28 14:48:57 2012
@@ -129,7 +129,7 @@ public abstract class AbstractClientConn
* @deprecated (4.1) use {@link #assertValid(OperatedClientConnection)}
*/
@Deprecated
- protected final void assertNotAborted() throws InterruptedIOException {
+ protected final void assertNotAborted() throws InterruptedIOException {
if (isReleased()) {
throw new InterruptedIOException("Connection has been shut down");
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPooledConnAdapter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPooledConnAdapter.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPooledConnAdapter.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPooledConnAdapter.java Fri Dec 28 14:48:57 2012
@@ -71,11 +71,11 @@ public abstract class AbstractPooledConn
* Obtains the pool entry.
*
* @return the pool entry, or <code>null</code> if detached
- *
- * @deprecated (4.0.1)
+ *
+ * @deprecated (4.0.1)
*/
@Deprecated
- protected AbstractPoolEntry getPoolEntry() {
+ protected AbstractPoolEntry getPoolEntry() {
return this.poolEntry;
}
@@ -97,7 +97,7 @@ public abstract class AbstractPooledConn
* @deprecated (4.1) use {@link #assertValid(AbstractPoolEntry)}
*/
@Deprecated
- protected final void assertAttached() {
+ protected final void assertAttached() {
if (poolEntry == null) {
throw new ConnectionShutdownException();
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/BasicClientConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/BasicClientConnectionManager.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/BasicClientConnectionManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/BasicClientConnectionManager.java Fri Dec 28 14:48:57 2012
@@ -48,7 +48,7 @@ import org.apache.http.util.Asserts;
/**
* A connection manager for a single connection. This connection manager maintains only one active
- * connection. Even though this class is fully thread-safe it ought to be used by one execution
+ * connection. Even though this class is fully thread-safe it ought to be used by one execution
* thread only, as only one thread a time can lease the connection at a time.
* <p/>
* This connection manager will make an effort to reuse the connection for subsequent requests
@@ -186,7 +186,7 @@ public class BasicClientConnectionManage
}
}
}
-
+
public void releaseConnection(final ManagedClientConnection conn, long keepalive, TimeUnit tunit) {
Args.check(conn instanceof ManagedClientConnectionImpl, "Connection class mismatch, " +
"connection not obtained from this manager");
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionFactory.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionFactory.java Fri Dec 28 14:48:57 2012
@@ -65,7 +65,7 @@ public class DefaultClientConnectionFact
return new SocketClientConnectionImpl(8 * 1024,
chardecoder, charencoder,
cconfig.getMessageConstraints(),
- null, null, null,
+ null, null, null,
DefaultHttpResponseParserFactory.INSTANCE);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java Fri Dec 28 14:48:57 2012
@@ -142,7 +142,7 @@ public class DefaultClientConnectionOper
}
return reg;
}
-
+
public void openConnection(
final OperatedClientConnection conn,
final HttpHost target,
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParser.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParser.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParser.java Fri Dec 28 14:48:57 2012
@@ -50,7 +50,7 @@ import org.apache.http.util.Args;
import org.apache.http.util.CharArrayBuffer;
/**
- * Lenient HTTP response parser implementation that can skip malformed data until
+ * Lenient HTTP response parser implementation that can skip malformed data until
* a valid HTTP response message head is encountered.
*
* @since 4.2
@@ -79,18 +79,18 @@ public class DefaultHttpResponseParser e
this.responseFactory = responseFactory;
this.lineBuf = new CharArrayBuffer(128);
}
-
+
/**
* Creates new instance of DefaultHttpResponseParser.
*
* @param buffer the session input buffer.
* @param lineParser the line parser. If <code>null</code> {@link BasicLineParser#INSTANCE}
* will be used.
- * @param responseFactory HTTP response factory. If <code>null</code>
+ * @param responseFactory HTTP response factory. If <code>null</code>
* {@link DefaultHttpResponseFactory#INSTANCE} will be used.
* @param constraints the message constraints. If <code>null</code>
* {@link MessageConstraints#DEFAULT} will be used.
- *
+ *
* @since 4.3
*/
public DefaultHttpResponseParser(
@@ -108,7 +108,7 @@ public class DefaultHttpResponseParser e
* Creates new instance of DefaultHttpResponseParser.
*
* @param buffer the session input buffer.
- *
+ *
* @since 4.3
*/
public DefaultHttpResponseParser(final SessionInputBuffer buffer) {
@@ -151,5 +151,5 @@ public class DefaultHttpResponseParser e
protected boolean reject(CharArrayBuffer line, int count) {
return false;
}
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultResponseParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultResponseParser.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultResponseParser.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultResponseParser.java Fri Dec 28 14:48:57 2012
@@ -58,7 +58,7 @@ import org.apache.http.util.CharArrayBuf
* </ul>
*
* @since 4.0
- *
+ *
* @deprecated (4.2) use {@link DefaultHttpResponseParser}
*/
@Deprecated
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.java Fri Dec 28 14:48:57 2012
@@ -485,4 +485,4 @@ public class PoolingHttpClientConnection
}
-}
\ No newline at end of file
+}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java Fri Dec 28 14:48:57 2012
@@ -62,7 +62,7 @@ import org.apache.http.util.Asserts;
* @deprecated (4.2) use {@link BasicClientConnectionManager}
*/
@ThreadSafe
-@Deprecated
+@Deprecated
public class SingleClientConnManager implements ClientConnectionManager {
private final Log log = LogFactory.getLog(getClass());
@@ -109,7 +109,7 @@ public class SingleClientConnManager imp
* @deprecated (4.1) use {@link SingleClientConnManager#SingleClientConnManager(SchemeRegistry)}
*/
@Deprecated
- public SingleClientConnManager(HttpParams params,
+ public SingleClientConnManager(HttpParams params,
SchemeRegistry schreg) {
this(schreg);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/Wire.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/Wire.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/Wire.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/Wire.java Fri Dec 28 14:48:57 2012
@@ -141,7 +141,7 @@ public class Wire {
/**
* @deprecated (4.1) do not use
*/
- @Deprecated
+ @Deprecated
public void output(final String s)
throws IOException {
Args.notNull(s, "Output");
@@ -151,7 +151,7 @@ public class Wire {
/**
* @deprecated (4.1) do not use
*/
- @Deprecated
+ @Deprecated
public void input(final String s)
throws IOException {
Args.notNull(s, "Input");
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.java Fri Dec 28 14:48:57 2012
@@ -41,7 +41,7 @@ import org.apache.http.util.Args;
*
* @deprecated (4.2) do not use
*/
-@Deprecated
+@Deprecated
public class BasicPoolEntryRef extends WeakReference<BasicPoolEntry> {
/** The planned route of the entry. */
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.java Fri Dec 28 14:48:57 2012
@@ -39,7 +39,7 @@ import org.apache.http.impl.conn.Abstrac
*
* @deprecated (4.2) do not use
*/
-@Deprecated
+@Deprecated
public class BasicPooledConnAdapter extends AbstractPooledConnAdapter {
/**
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java Fri Dec 28 14:48:57 2012
@@ -67,7 +67,7 @@ import org.apache.http.util.Asserts;
*
* @deprecated (4.2) use {@link org.apache.http.pool.AbstractConnPool}
*/
-@Deprecated
+@Deprecated
public class ConnPoolByRoute extends AbstractConnPool {
private final Log log = LogFactory.getLog(getClass());
@@ -148,7 +148,7 @@ public class ConnPoolByRoute extends Abs
* @deprecated (4.1) use {@link ConnPoolByRoute#ConnPoolByRoute(ClientConnectionOperator, ConnPerRoute, int)}
*/
@Deprecated
- public ConnPoolByRoute(final ClientConnectionOperator operator, final HttpParams params) {
+ public ConnPoolByRoute(final ClientConnectionOperator operator, final HttpParams params) {
this(operator,
ConnManagerParams.getMaxConnectionsPerRoute(params),
ConnManagerParams.getMaxTotalConnections(params));
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/PoolEntryRequest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/PoolEntryRequest.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/PoolEntryRequest.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/PoolEntryRequest.java Fri Dec 28 14:48:57 2012
@@ -38,7 +38,7 @@ import org.apache.http.conn.ConnectionPo
*
* @deprecated (4.2) use {@link Future}
*/
-@Deprecated
+@Deprecated
public interface PoolEntryRequest {
/**
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java Fri Dec 28 14:48:57 2012
@@ -80,7 +80,7 @@ public class RouteSpecificPool {
* @deprecated (4.1) use {@link RouteSpecificPool#RouteSpecificPool(HttpRoute, ConnPerRoute)}
*/
@Deprecated
- public RouteSpecificPool(HttpRoute route, int maxEntries) {
+ public RouteSpecificPool(HttpRoute route, int maxEntries) {
this.route = route;
this.maxEntries = maxEntries;
this.connPerRoute = new ConnPerRoute() {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java Fri Dec 28 14:48:57 2012
@@ -69,7 +69,7 @@ import org.apache.http.util.Asserts;
* @deprecated (4.2) use {@link PoolingClientConnectionManager}
*/
@ThreadSafe
-@Deprecated
+@Deprecated
public class ThreadSafeClientConnManager implements ClientConnectionManager {
private final Log log;
@@ -150,7 +150,7 @@ public class ThreadSafeClientConnManager
* @deprecated (4.1) use {@link ThreadSafeClientConnManager#ThreadSafeClientConnManager(SchemeRegistry)}
*/
@Deprecated
- public ThreadSafeClientConnManager(HttpParams params,
+ public ThreadSafeClientConnManager(HttpParams params,
SchemeRegistry schreg) {
Args.notNull(schreg, "Scheme registry");
this.log = LogFactory.getLog(getClass());
@@ -178,7 +178,7 @@ public class ThreadSafeClientConnManager
* @deprecated (4.1) use #createConnectionPool(long, TimeUnit))
*/
@Deprecated
- protected AbstractConnPool createConnectionPool(final HttpParams params) {
+ protected AbstractConnPool createConnectionPool(final HttpParams params) {
return new ConnPoolByRoute(connOperator, params);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThread.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThread.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThread.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThread.java Fri Dec 28 14:48:57 2012
@@ -47,7 +47,7 @@ import org.apache.http.util.Args;
*
* @deprecated (4.2) do not use
*/
-@Deprecated
+@Deprecated
public class WaitingThread {
/** The condition on which the thread is waiting. */
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThreadAborter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThreadAborter.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThreadAborter.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThreadAborter.java Fri Dec 28 14:48:57 2012
@@ -35,7 +35,7 @@ package org.apache.http.impl.conn.tsccm;
*
* @deprecated (4.2) do not use
*/
-@Deprecated
+@Deprecated
public class WaitingThreadAborter {
private WaitingThread waitingThread;
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatVersionAttributeHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatVersionAttributeHandler.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatVersionAttributeHandler.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatVersionAttributeHandler.java Fri Dec 28 14:48:57 2012
@@ -39,28 +39,28 @@ import org.apache.http.util.Args;
*/
@Immutable
public class BrowserCompatVersionAttributeHandler extends
- AbstractCookieAttributeHandler {
+ AbstractCookieAttributeHandler {
- public BrowserCompatVersionAttributeHandler() {
- super();
- }
+ public BrowserCompatVersionAttributeHandler() {
+ super();
+ }
- /**
- * Parse cookie version attribute.
- */
- public void parse(final SetCookie cookie, final String value)
- throws MalformedCookieException {
- Args.notNull(cookie, "Cookie");
- if (value == null) {
- throw new MalformedCookieException("Missing value for version attribute");
- }
- int version = 0;
- try {
- version = Integer.parseInt(value);
- } catch (NumberFormatException e) {
- // Just ignore invalid versions
- }
- cookie.setVersion(version);
- }
+ /**
+ * Parse cookie version attribute.
+ */
+ public void parse(final SetCookie cookie, final String value)
+ throws MalformedCookieException {
+ Args.notNull(cookie, "Cookie");
+ if (value == null) {
+ throw new MalformedCookieException("Missing value for version attribute");
+ }
+ int version = 0;
+ try {
+ version = Integer.parseInt(value);
+ } catch (NumberFormatException e) {
+ // Just ignore invalid versions
+ }
+ cookie.setVersion(version);
+ }
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseAuthCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseAuthCache.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseAuthCache.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseAuthCache.java Fri Dec 28 14:48:57 2012
@@ -48,7 +48,7 @@ import org.apache.http.protocol.HttpCont
import org.junit.Before;
import org.junit.Test;
-@Deprecated
+@Deprecated
public class TestResponseAuthCache {
private HttpHost target;
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURIBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURIBuilder.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURIBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURIBuilder.java Fri Dec 28 14:48:57 2012
@@ -192,9 +192,9 @@ public class TestURIBuilder {
.build();
Assert.assertEquals(uri.getHost(), bld.getHost());
-
+
Assert.assertEquals(uri.getUserInfo(), bld.getUserInfo());
-
+
Assert.assertEquals(uri.getPath(), bld.getPath());
Assert.assertEquals(uri.getQuery(), bld.getQuery());
@@ -221,9 +221,9 @@ public class TestURIBuilder {
.build();
Assert.assertEquals(uri.getHost(), bld.getHost());
-
+
Assert.assertEquals(uri.getRawUserInfo(), bld.getRawUserInfo());
-
+
Assert.assertEquals(uri.getRawPath(), bld.getRawPath());
Assert.assertEquals(uri.getRawQuery(), bld.getRawQuery());
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestNTLMEngineImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestNTLMEngineImpl.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestNTLMEngineImpl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestNTLMEngineImpl.java Fri Dec 28 14:48:57 2012
@@ -200,7 +200,7 @@ public class TestNTLMEngineImpl {
public void testType1Message() throws Exception {
new NTLMEngineImpl().getType1Message("myhost", "mydomain");
}
-
+
@Test
public void testType3Message() throws Exception {
new NTLMEngineImpl().getType3Message("me", "mypassword", "myhost", "mydomain",
@@ -213,7 +213,7 @@ public class TestNTLMEngineImpl {
"mytarget",
toBytes("02000c0044004f004d00410049004e0001000c005300450052005600450052000400140064006f006d00610069006e002e0063006f006d00030022007300650072007600650072002e0064006f006d00610069006e002e0063006f006d0000000000"));
}
-
+
@Test
public void testRC4() throws Exception {
checkArraysMatch(toBytes("e37f97f2544f4d7e"),
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/DummyHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/DummyHttpClient.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/DummyHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/DummyHttpClient.java Fri Dec 28 14:48:57 2012
@@ -51,11 +51,11 @@ public class DummyHttpClient implements
private ClientConnectionManager connManager = new SingleClientConnManager();
private HttpRequest request;
private HttpResponse response = new BasicHttpResponse(new ProtocolVersion("HTTP",1,1), HttpStatus.SC_OK, "OK");
-
+
public void setParams(HttpParams params) {
this.params = params;
}
-
+
public HttpParams getParams() {
return params;
}
@@ -63,15 +63,15 @@ public class DummyHttpClient implements
public ClientConnectionManager getConnectionManager() {
return connManager;
}
-
+
public void setConnectionManager(ClientConnectionManager ccm) {
connManager = ccm;
}
-
+
public void setResponse(HttpResponse resp) {
response = resp;
}
-
+
public HttpRequest getCapturedRequest() {
return request;
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDecompressingHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDecompressingHttpClient.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDecompressingHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDecompressingHttpClient.java Fri Dec 28 14:48:57 2012
@@ -73,7 +73,7 @@ import org.mockito.runners.MockitoJUnitR
@Deprecated
@RunWith(MockitoJUnitRunner.class)
public class TestDecompressingHttpClient {
-
+
private DummyHttpClient backend;
@Mock private ClientConnectionManager mockConnManager;
@Mock private ResponseHandler<Object> mockHandler;
@@ -84,7 +84,7 @@ public class TestDecompressingHttpClient
@Mock private HttpResponse mockResponse;
@Mock private HttpEntity mockEntity;
private Object handled;
-
+
@Before
public void canCreate() {
handled = new Object();
@@ -95,61 +95,61 @@ public class TestDecompressingHttpClient
ctx = new BasicHttpContext();
host = new HttpHost("www.example.com");
}
-
+
@Test
public void isAnHttpClient() {
assertTrue(impl instanceof HttpClient);
}
-
+
@Test
public void usesParamsFromBackend() {
HttpParams params = new BasicHttpParams();
backend.setParams(params);
assertSame(params, impl.getParams());
}
-
+
@Test
public void extractsHostNameFromUriRequest() {
- assertEquals(new HttpHost("www.example.com"),
+ assertEquals(new HttpHost("www.example.com"),
impl.getHttpHost(new HttpGet("http://www.example.com/")));
}
-
+
@Test
public void extractsHostNameAndPortFromUriRequest() {
- assertEquals(new HttpHost("www.example.com", 8080),
+ assertEquals(new HttpHost("www.example.com", 8080),
impl.getHttpHost(new HttpGet("http://www.example.com:8080/")));
}
@Test
public void extractsIPAddressFromUriRequest() {
- assertEquals(new HttpHost("10.0.0.1"),
+ assertEquals(new HttpHost("10.0.0.1"),
impl.getHttpHost(new HttpGet("http://10.0.0.1/")));
}
@Test
public void extractsIPAddressAndPortFromUriRequest() {
- assertEquals(new HttpHost("10.0.0.1", 8080),
+ assertEquals(new HttpHost("10.0.0.1", 8080),
impl.getHttpHost(new HttpGet("http://10.0.0.1:8080/")));
}
@Test
public void extractsLocalhostFromUriRequest() {
- assertEquals(new HttpHost("localhost"),
+ assertEquals(new HttpHost("localhost"),
impl.getHttpHost(new HttpGet("http://localhost/")));
}
@Test
public void extractsLocalhostAndPortFromUriRequest() {
- assertEquals(new HttpHost("localhost", 8080),
+ assertEquals(new HttpHost("localhost", 8080),
impl.getHttpHost(new HttpGet("http://localhost:8080/")));
}
-
+
@Test
public void usesConnectionManagerFromBackend() {
backend.setConnectionManager(mockConnManager);
assertSame(mockConnManager, impl.getConnectionManager());
}
-
+
private void assertAcceptEncodingGzipAndDeflateWereAddedToRequest(HttpRequest captured) {
boolean foundGzip = false;
boolean foundDeflate = false;
@@ -162,7 +162,7 @@ public class TestDecompressingHttpClient
assertTrue(foundGzip);
assertTrue(foundDeflate);
}
-
+
@Test
public void addsAcceptEncodingHeaderToHttpUriRequest() throws Exception {
impl.execute(request);
@@ -174,19 +174,19 @@ public class TestDecompressingHttpClient
impl.execute(request, ctx);
assertAcceptEncodingGzipAndDeflateWereAddedToRequest(backend.getCapturedRequest());
}
-
+
@Test
public void addsAcceptEncodingHeaderToHostAndHttpRequest() throws Exception {
impl.execute(host, request);
assertAcceptEncodingGzipAndDeflateWereAddedToRequest(backend.getCapturedRequest());
}
-
+
@Test
public void addsAcceptEncodingHeaderToHostAndHttpRequestWithContext() throws Exception {
impl.execute(host, request, ctx);
assertAcceptEncodingGzipAndDeflateWereAddedToRequest(backend.getCapturedRequest());
}
-
+
@Test
public void addsAcceptEncodingHeaderToUriRequestWithHandler() throws Exception {
when(mockHandler.handleResponse(isA(HttpResponse.class))).thenReturn(new Object());
@@ -223,35 +223,35 @@ public class TestDecompressingHttpClient
when(mockResponse.getLastHeader("Content-Encoding")).thenReturn(null);
when(mockResponse.getEntity()).thenReturn(mockEntity);
}
-
+
@Test
public void doesNotModifyResponseBodyIfNoContentEncoding() throws Exception {
mockResponseHasNoContentEncodingHeaders();
assertSame(mockResponse, impl.execute(request));
verify(mockResponse, never()).setEntity(any(HttpEntity.class));
}
-
+
@Test
public void doesNotModifyResponseBodyIfNoContentEncodingWithContext() throws Exception {
mockResponseHasNoContentEncodingHeaders();
assertSame(mockResponse, impl.execute(request, ctx));
verify(mockResponse, never()).setEntity(any(HttpEntity.class));
}
-
+
@Test
public void doesNotModifyResponseBodyIfNoContentEncodingForHostRequest() throws Exception {
mockResponseHasNoContentEncodingHeaders();
assertSame(mockResponse, impl.execute(host, request));
verify(mockResponse, never()).setEntity(any(HttpEntity.class));
}
-
+
@Test
public void doesNotModifyResponseBodyIfNoContentEncodingForHostRequestWithContext() throws Exception {
mockResponseHasNoContentEncodingHeaders();
assertSame(mockResponse, impl.execute(host, request, ctx));
verify(mockResponse, never()).setEntity(any(HttpEntity.class));
}
-
+
@Test
public void doesNotModifyResponseBodyWithHandlerIfNoContentEncoding() throws Exception {
mockResponseHasNoContentEncodingHeaders();
@@ -259,7 +259,7 @@ public class TestDecompressingHttpClient
assertSame(handled, impl.execute(request, mockHandler));
verify(mockResponse, never()).setEntity(any(HttpEntity.class));
}
-
+
@Test
public void doesNotModifyResponseBodyWithHandlerAndContextIfNoContentEncoding() throws Exception {
mockResponseHasNoContentEncodingHeaders();
@@ -267,7 +267,7 @@ public class TestDecompressingHttpClient
assertSame(handled, impl.execute(request, mockHandler, ctx));
verify(mockResponse, never()).setEntity(any(HttpEntity.class));
}
-
+
@Test
public void doesNotModifyResponseBodyWithHostAndHandlerIfNoContentEncoding() throws Exception {
mockResponseHasNoContentEncodingHeaders();
@@ -275,7 +275,7 @@ public class TestDecompressingHttpClient
assertSame(handled, impl.execute(host, request, mockHandler));
verify(mockResponse, never()).setEntity(any(HttpEntity.class));
}
-
+
@Test
public void doesNotModifyResponseBodyWithHostAndHandlerAndContextIfNoContentEncoding() throws Exception {
mockResponseHasNoContentEncodingHeaders();
@@ -283,13 +283,13 @@ public class TestDecompressingHttpClient
assertSame(handled, impl.execute(host, request, mockHandler, ctx));
verify(mockResponse, never()).setEntity(any(HttpEntity.class));
}
-
+
@Test
public void successfullyUncompressesContent() throws Exception {
final String plainText = "hello\n";
HttpResponse response = getGzippedResponse(plainText);
backend.setResponse(response);
-
+
HttpResponse result = impl.execute(request);
ByteArrayOutputStream resultBuf = new ByteArrayOutputStream();
InputStream is = result.getEntity().getContent();
@@ -300,13 +300,13 @@ public class TestDecompressingHttpClient
is.close();
assertEquals(plainText, new String(resultBuf.toByteArray()));
}
-
+
@Test
public void uncompressedResponseHasUnknownLength() throws Exception {
final String plainText = "hello\n";
HttpResponse response = getGzippedResponse(plainText);
backend.setResponse(response);
-
+
HttpResponse result = impl.execute(request);
HttpEntity entity = result.getEntity();
assertEquals(-1, entity.getContentLength());
@@ -319,22 +319,22 @@ public class TestDecompressingHttpClient
final String plainText = "hello\n";
HttpResponse response = getGzippedResponse(plainText);
backend.setResponse(response);
-
+
HttpResponse result = impl.execute(request);
assertNull(result.getFirstHeader("Content-Encoding"));
}
-
+
@Test
public void uncompressedResponseHasContentMD5Removed() throws Exception {
final String plainText = "hello\n";
HttpResponse response = getGzippedResponse(plainText);
response.setHeader("Content-MD5","a checksum");
backend.setResponse(response);
-
+
HttpResponse result = impl.execute(request);
assertNull(result.getFirstHeader("Content-MD5"));
}
-
+
@Test
public void unencodedResponseRetainsContentMD5() throws Exception {
final String plainText = "hello\n";
@@ -342,20 +342,20 @@ public class TestDecompressingHttpClient
response.setHeader("Content-MD5","a checksum");
response.setEntity(new ByteArrayEntity(plainText.getBytes()));
backend.setResponse(response);
-
+
HttpResponse result = impl.execute(request);
assertNotNull(result.getFirstHeader("Content-MD5"));
}
-
+
@Test
public void passesThroughTheBodyOfAPOST() throws Exception {
- when(mockHandler.handleResponse(isA(HttpResponse.class))).thenReturn(new Object());
- HttpPost post = new HttpPost("http://localhost:8080/");
- post.setEntity(new ByteArrayEntity("hello".getBytes()));
- impl.execute(host, post, mockHandler, ctx);
- assertNotNull(((HttpEntityEnclosingRequest)backend.getCapturedRequest()).getEntity());
+ when(mockHandler.handleResponse(isA(HttpResponse.class))).thenReturn(new Object());
+ HttpPost post = new HttpPost("http://localhost:8080/");
+ post.setEntity(new ByteArrayEntity("hello".getBytes()));
+ impl.execute(host, post, mockHandler, ctx);
+ assertNotNull(((HttpEntityEnclosingRequest)backend.getCapturedRequest()).getEntity());
}
-
+
private HttpResponse getGzippedResponse(final String plainText)
throws IOException {
HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "OK");
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestSPNegoScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestSPNegoScheme.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestSPNegoScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestSPNegoScheme.java Fri Dec 28 14:48:57 2012
@@ -156,7 +156,7 @@ public class TestSPNegoScheme extends In
HttpHost target = new HttpHost("localhost", port);
AuthSchemeProvider nsf = new NegotiateSchemeProviderWithMockGssManager();
- CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+ CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
Credentials use_jaas_creds = new UseJaasCredentials();
credentialsProvider.setCredentials(new AuthScope(null, -1, null), use_jaas_creds);
@@ -164,7 +164,7 @@ public class TestSPNegoScheme extends In
.registerAuthScheme(AuthSchemes.SPNEGO, nsf)
.setCredentialsProvider(credentialsProvider)
.build();
-
+
String s = "/path";
HttpGet httpget = new HttpGet(s);
HttpResponse response = this.httpclient.execute(target, httpget);
@@ -186,15 +186,15 @@ public class TestSPNegoScheme extends In
AuthSchemeProvider nsf = new NegotiateSchemeProviderWithMockGssManager();
- CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
+ CredentialsProvider credentialsProvider = new BasicCredentialsProvider();
Credentials use_jaas_creds = new UseJaasCredentials();
credentialsProvider.setCredentials(new AuthScope(null, -1, null), use_jaas_creds);
-
+
this.httpclient = HttpClients.custom()
.registerAuthScheme(AuthSchemes.SPNEGO, nsf)
.setCredentialsProvider(credentialsProvider)
.build();
-
+
String s = "/path";
HttpGet httpget = new HttpGet(s);
HttpResponse response = this.httpclient.execute(target, httpget);
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestStatefulConnManagement.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestStatefulConnManagement.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestStatefulConnManagement.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestStatefulConnManagement.java Fri Dec 28 14:48:57 2012
@@ -98,7 +98,7 @@ public class TestStatefulConnManagement
}
};
-
+
this.httpclient = HttpClients.custom()
.setConnectionManager(mgr)
.setUserTokenHandler(userTokenHandler)
@@ -233,7 +233,7 @@ public class TestStatefulConnManagement
.setConnectionManager(connMngr)
.setUserTokenHandler(userTokenHandler)
.build();
-
+
// Bottom of the pool : a *keep alive* connection to Route 1.
HttpContext context1 = new BasicHttpContext();
context1.setAttribute("user", "stuff");
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/SessionInputBufferMock.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/SessionInputBufferMock.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/SessionInputBufferMock.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/SessionInputBufferMock.java Fri Dec 28 14:48:57 2012
@@ -46,8 +46,8 @@ public class SessionInputBufferMock exte
public static final int BUFFER_SIZE = 16;
public SessionInputBufferMock(
- final InputStream instream,
- int buffersize,
+ final InputStream instream,
+ int buffersize,
final MessageConstraints constrains,
final CharsetDecoder decoder) {
super(new HttpTransportMetricsImpl(), buffersize, -1, constrains, decoder);
@@ -92,7 +92,7 @@ public class SessionInputBufferMock exte
}
public SessionInputBufferMock(
- final byte[] bytes,
+ final byte[] bytes,
final CharsetDecoder decoder) {
this(bytes, BUFFER_SIZE, null, decoder);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/LocalServerTestBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/LocalServerTestBase.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/LocalServerTestBase.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/LocalServerTestBase.java Fri Dec 28 14:48:57 2012
@@ -57,7 +57,7 @@ public abstract class LocalServerTestBas
localServer.setTimeout(5000);
localServer.start();
}
-
+
/**
* Obtains the address of the local test server.
*
Modified: httpcomponents/httpclient/trunk/httpmime/pom.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/pom.xml?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/pom.xml (original)
+++ httpcomponents/httpclient/trunk/httpmime/pom.xml Fri Dec 28 14:48:57 2012
@@ -43,7 +43,8 @@
<dependencies>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
+ <artifactId>httpclient</artifactId>
+ <version>${project.version}</version>
<scope>compile</scope>
</dependency>
<!-- Not currently used
Modified: httpcomponents/httpclient/trunk/httpmime/src/examples/org/apache/http/examples/entity/mime/ClientMultipartFormPost.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/examples/org/apache/http/examples/entity/mime/ClientMultipartFormPost.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/examples/org/apache/http/examples/entity/mime/ClientMultipartFormPost.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/examples/org/apache/http/examples/entity/mime/ClientMultipartFormPost.java Fri Dec 28 14:48:57 2012
@@ -76,5 +76,5 @@ public class ClientMultipartFormPost {
try { httpclient.getConnectionManager().shutdown(); } catch (Exception ignore) {}
}
}
-
+
}
Modified: httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartContentBody.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartContentBody.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartContentBody.java (original)
+++ httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartContentBody.java Fri Dec 28 14:48:57 2012
@@ -51,7 +51,7 @@ public class TestMultipartContentBody {
Assert.assertEquals(MIME.ENC_8BIT, b1.getTransferEncoding());
- StringBody b2 = new StringBody("more text",
+ StringBody b2 = new StringBody("more text",
ContentType.create("text/other", MIME.DEFAULT_CHARSET));
Assert.assertEquals(9, b2.getContentLength());
Assert.assertEquals(MIME.DEFAULT_CHARSET.name(), b2.getCharset());