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/04/10 22:19:21 UTC
svn commit: r1311967 - in /httpcomponents/httpclient/trunk/httpclient/src:
main/java/org/apache/http/impl/client/ test/java/org/apache/http/impl/client/
Author: olegk
Date: Tue Apr 10 20:19:20 2012
New Revision: 1311967
URL: http://svn.apache.org/viewvc?rev=1311967&view=rev
Log:
Renamed CompressionDecorator to DecompressingHttpClient
Added:
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DecompressingHttpClient.java (contents, props changed)
- copied, changed from r1311952, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/CompressionDecorator.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDecompressingHttpClient.java (contents, props changed)
- copied, changed from r1311952, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestCompressionDecorator.java
Removed:
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/CompressionDecorator.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestCompressionDecorator.java
Modified:
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ContentEncodingHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestContentCodings.java
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=1311967&r1=1311966&r2=1311967&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 Tue Apr 10 20:19:20 2012
@@ -41,7 +41,7 @@ import org.apache.http.protocol.BasicHtt
* without changing the response headers to reflect the entity changes, it cannot
* be used as the "backend" for a {@link CachingHttpClient} and still
* have uncompressed responses be cached. Users are encouraged to use the
- * {@link CompressionDecorator} instead of this class, which can be wired in
+ * {@link DecompressingHttpClient} instead of this class, which can be wired in
* either before or after caching, depending on whether you want to cache
* responses in compressed or uncompressed form.
*
Copied: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DecompressingHttpClient.java (from r1311952, httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/CompressionDecorator.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DecompressingHttpClient.java?p2=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DecompressingHttpClient.java&p1=httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/CompressionDecorator.java&r1=1311952&r2=1311967&rev=1311967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/CompressionDecorator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DecompressingHttpClient.java Tue Apr 10 20:19:20 2012
@@ -47,7 +47,7 @@ import org.apache.http.protocol.BasicHtt
import org.apache.http.protocol.HttpContext;
import org.apache.http.util.EntityUtils;
-/*
+/**
* <p>Decorator adding support for compressed responses. This class sets
* the <code>Accept-Encoding</code> header on requests to indicate
* support for the <code>gzip</code> and <code>deflate</code>
@@ -63,27 +63,31 @@ import org.apache.http.util.EntityUtils;
* 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 {@link CachingHttpClient}
- * 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
*/
-public class CompressionDecorator implements HttpClient {
+public class DecompressingHttpClient implements HttpClient {
private HttpClient backend;
private HttpRequestInterceptor acceptEncodingInterceptor;
private HttpResponseInterceptor contentEncodingInterceptor;
- /*
+ /**
* Constructs a decorator to ask for and handle compressed
* entities on the fly.
* @param backend the {@link HttpClient} to use for actually
* issuing requests
*/
- public CompressionDecorator(HttpClient backend) {
+ public DecompressingHttpClient(HttpClient backend) {
this(backend, new RequestAcceptEncoding(), new ResponseContentEncoding());
}
- CompressionDecorator(HttpClient backend, HttpRequestInterceptor requestInterceptor, HttpResponseInterceptor responseInterceptor) {
+ DecompressingHttpClient(HttpClient backend,
+ HttpRequestInterceptor requestInterceptor,
+ HttpResponseInterceptor responseInterceptor) {
this.backend = backend;
this.acceptEncodingInterceptor = requestInterceptor;
this.contentEncodingInterceptor = responseInterceptor;
Propchange: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DecompressingHttpClient.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DecompressingHttpClient.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DecompressingHttpClient.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestContentCodings.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestContentCodings.java?rev=1311967&r1=1311966&r2=1311967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestContentCodings.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestContentCodings.java Tue Apr 10 20:19:20 2012
@@ -91,7 +91,7 @@ public class TestContentCodings extends
}
});
- HttpClient client = new CompressionDecorator(new DefaultHttpClient());
+ HttpClient client = new DecompressingHttpClient(new DefaultHttpClient());
HttpGet request = new HttpGet("/some-resource");
HttpResponse response = client.execute(getServerHttp(), request);
@@ -114,7 +114,7 @@ public class TestContentCodings extends
this.localServer.register("*", createDeflateEncodingRequestHandler(entityText, false));
- HttpClient client = new CompressionDecorator(new DefaultHttpClient());
+ HttpClient client = new DecompressingHttpClient(new DefaultHttpClient());
HttpGet request = new HttpGet("/some-resource");
HttpResponse response = client.execute(getServerHttp(), request);
@@ -137,7 +137,7 @@ public class TestContentCodings extends
this.localServer.register("*", createDeflateEncodingRequestHandler(entityText, true));
- HttpClient client = new CompressionDecorator(new DefaultHttpClient());
+ HttpClient client = new DecompressingHttpClient(new DefaultHttpClient());
HttpGet request = new HttpGet("/some-resource");
HttpResponse response = client.execute(getServerHttp(), request);
@@ -158,7 +158,7 @@ public class TestContentCodings extends
this.localServer.register("*", createGzipEncodingRequestHandler(entityText));
- HttpClient client = new CompressionDecorator(new DefaultHttpClient());
+ HttpClient client = new DecompressingHttpClient(new DefaultHttpClient());
HttpGet request = new HttpGet("/some-resource");
HttpResponse response = client.execute(getServerHttp(), request);
@@ -236,7 +236,7 @@ public class TestContentCodings extends
this.localServer.register("*", createGzipEncodingRequestHandler(entityText));
- HttpClient client = new CompressionDecorator(new DefaultHttpClient());
+ HttpClient client = new DecompressingHttpClient(new DefaultHttpClient());
HttpGet request = new HttpGet("/some-resource");
HttpResponse response = client.execute(getServerHttp(), request);
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -260,7 +260,7 @@ public class TestContentCodings extends
this.localServer.register("*", createDeflateEncodingRequestHandler(entityText, true));
- HttpClient client = new CompressionDecorator(new DefaultHttpClient());
+ HttpClient client = new DecompressingHttpClient(new DefaultHttpClient());
HttpGet request = new HttpGet("/some-resource");
HttpResponse response = client.execute(getServerHttp(), request);
@@ -279,7 +279,7 @@ public class TestContentCodings extends
this.localServer.register("*", createGzipEncodingRequestHandler(entityText));
- HttpClient client = new CompressionDecorator(new DefaultHttpClient());
+ HttpClient client = new DecompressingHttpClient(new DefaultHttpClient());
HttpGet request = new HttpGet("/some-resource");
String response = client.execute(getServerHttp(), request, new BasicResponseHandler());
@@ -294,7 +294,7 @@ public class TestContentCodings extends
this.localServer.register("*", createDeflateEncodingRequestHandler(entityText, false));
- HttpClient client = new CompressionDecorator(new DefaultHttpClient());
+ HttpClient client = new DecompressingHttpClient(new DefaultHttpClient());
HttpGet request = new HttpGet("/some-resource");
String response = client.execute(getServerHttp(), request, new BasicResponseHandler());
Copied: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDecompressingHttpClient.java (from r1311952, httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestCompressionDecorator.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDecompressingHttpClient.java?p2=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDecompressingHttpClient.java&p1=httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestCompressionDecorator.java&r1=1311952&r2=1311967&rev=1311967&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestCompressionDecorator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDecompressingHttpClient.java Tue Apr 10 20:19:20 2012
@@ -60,12 +60,12 @@ import org.mockito.Mock;
import org.mockito.runners.MockitoJUnitRunner;
@RunWith(MockitoJUnitRunner.class)
-public class TestCompressionDecorator {
+public class TestDecompressingHttpClient {
private DummyHttpClient backend;
@Mock private ClientConnectionManager mockConnManager;
@Mock private ResponseHandler<Object> mockHandler;
- private CompressionDecorator impl;
+ private DecompressingHttpClient impl;
private HttpUriRequest request;
private HttpContext ctx;
private HttpHost host;
@@ -77,7 +77,7 @@ public class TestCompressionDecorator {
public void canCreate() {
handled = new Object();
backend = new DummyHttpClient();
- impl = new CompressionDecorator(backend);
+ impl = new DecompressingHttpClient(backend);
request = new HttpGet("http://localhost:8080");
ctx = new BasicHttpContext();
host = new HttpHost("www.example.com");
Propchange: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDecompressingHttpClient.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDecompressingHttpClient.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDecompressingHttpClient.java
------------------------------------------------------------------------------
svn:mime-type = text/plain