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 [1/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...
Author: olegk
Date: Fri Dec 28 14:48:57 2012
New Revision: 1426529
URL: http://svn.apache.org/viewvc?rev=1426529&view=rev
Log:
tabs -> spaces; removed trailing whilespaces; updated stylecheck definitions
Modified:
httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/http/client/fluent/FluentAsync.java
httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/http/client/fluent/FluentQuickStart.java
httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Async.java
httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Content.java
httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Executor.java
httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Request.java
httpcomponents/httpclient/trunk/hc-checkstyle.xml
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntity.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheInvalidator.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachedResponseSuitabilityChecker.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingExec.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClient.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/Proxies.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseCachingPolicy.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntry.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactory.java
httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/SHA256KeyHashingScheme.java
httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingExec.java
httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestHttpCacheJiraNumber1147.java
httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseCachingPolicy.java
httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestMemcachedCacheEntryImpl.java
httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestPrefixKeyHashingScheme.java
httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestSHA256HashingScheme.java
httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java
httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteSOCKS.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/AbortableHttpRequest.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/CloseableHttpResponse.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/ClientParamBean.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAcceptEncoding.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseAuthCache.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseContentEncoding.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicEofSensorWatcher.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicManagedEntity.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionPNames.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionParamBean.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerPNames.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParamBean.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/HostNameResolver.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSchemeSocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/Scheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/SchemeLayeredSocketFactoryAdaptor2.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/ssl/SSLInitializationException.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/params/CookieSpecPNames.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/cookie/params/CookieSpecParamBean.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/NegotiateSchemeFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractAuthenticationHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/AutoRetryHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ClientParamsStack.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/ContentEncodingHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DecompressingHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRedirectStrategyAdaptor.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/InternalHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/MinimalHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/RequestWrapper.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/RoutedRequest.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/SystemDefaultHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/execchain/Proxies.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/execchain/RequestEntityExecHandler.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/client/execchain/ServiceUnavailableRetryExec.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/AbstractPooledConnAdapter.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/BasicClientConnectionManager.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionFactory.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultHttpResponseParser.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/DefaultResponseParser.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/PoolingHttpClientConnectionManager.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/Wire.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/BasicPooledConnAdapter.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/PoolEntryRequest.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/RouteSpecificPool.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThread.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThreadAborter.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/cookie/BrowserCompatVersionAttributeHandler.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/protocol/TestResponseAuthCache.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/client/utils/TestURIBuilder.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/auth/TestNTLMEngineImpl.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/DummyHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/TestDecompressingHttpClient.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestSPNegoScheme.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/client/integration/TestStatefulConnManagement.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/impl/conn/SessionInputBufferMock.java
httpcomponents/httpclient/trunk/httpclient/src/test/java/org/apache/http/localserver/LocalServerTestBase.java
httpcomponents/httpclient/trunk/httpmime/pom.xml
httpcomponents/httpclient/trunk/httpmime/src/examples/org/apache/http/examples/entity/mime/ClientMultipartFormPost.java
httpcomponents/httpclient/trunk/httpmime/src/test/java/org/apache/http/entity/mime/TestMultipartContentBody.java
Modified: httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/http/client/fluent/FluentAsync.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/http/client/fluent/FluentAsync.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/http/client/fluent/FluentAsync.java (original)
+++ httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/http/client/fluent/FluentAsync.java Fri Dec 28 14:48:57 2012
@@ -45,7 +45,7 @@ public class FluentAsync {
// Use pool of two threads
ExecutorService threadpool = Executors.newFixedThreadPool(2);
Async async = Async.newInstance().use(threadpool);
-
+
Request[] requests = new Request[] {
Request.Get("http://www.google.com/"),
Request.Get("http://www.yahoo.com/"),
@@ -53,23 +53,23 @@ public class FluentAsync {
Request.Get("http://www.apple.com/")
};
-
+
Queue<Future<Content>> queue = new LinkedList<Future<Content>>();
// Execute requests asynchronously
for (final Request request: requests) {
Future<Content> future = async.execute(request, new FutureCallback<Content>() {
-
+
public void failed(final Exception ex) {
System.out.println(ex.getMessage() + ": " + request);
}
-
+
public void completed(final Content content) {
System.out.println("Request completed: " + request);
}
-
+
public void cancelled() {
}
-
+
});
queue.add(future);
}
Modified: httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/http/client/fluent/FluentQuickStart.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/http/client/fluent/FluentQuickStart.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/http/client/fluent/FluentQuickStart.java (original)
+++ httpcomponents/httpclient/trunk/fluent-hc/src/examples/org/apache/http/client/fluent/FluentQuickStart.java Fri Dec 28 14:48:57 2012
@@ -29,10 +29,10 @@ package org.apache.http.client.fluent;
public class FluentQuickStart {
public static void main(String[] args) throws Exception {
- // The fluent API relieves the user from having to deal with manual
- // deallocation of system resources at the cost of having to buffer
+ // The fluent API relieves the user from having to deal with manual
+ // deallocation of system resources at the cost of having to buffer
// response content in memory in some cases.
-
+
Request.Get("http://targethost/homepage")
.execute().returnContent();
Request.Post("http://targethost/login")
Modified: httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Async.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Async.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Async.java (original)
+++ httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Async.java Fri Dec 28 14:48:57 2012
@@ -49,23 +49,23 @@ public class Async {
this.executor = executor;
return this;
}
-
+
public Async use(final java.util.concurrent.Executor concurrentExec) {
this.concurrentExec = concurrentExec;
return this;
}
-
+
static class ExecRunnable<T> implements Runnable {
-
+
private final BasicFuture<T> future;
private final Request request;
private final Executor executor;
private final ResponseHandler<T> handler;
-
+
ExecRunnable(
- final BasicFuture<T> future,
- final Request request,
- final Executor executor,
+ final BasicFuture<T> future,
+ final Request request,
+ final Executor executor,
final ResponseHandler<T> handler) {
super();
this.future = future;
@@ -83,9 +83,9 @@ public class Async {
this.future.failed(ex);
}
}
-
+
}
-
+
public <T> Future<T> execute(
final Request request, final ResponseHandler<T> handler, final FutureCallback<T> callback) {
BasicFuture<T> future = new BasicFuture<T>(callback);
@@ -103,7 +103,7 @@ public class Async {
}
return future;
}
-
+
public <T> Future<T> execute(final Request request, final ResponseHandler<T> handler) {
return execute(request, handler, null);
}
@@ -111,9 +111,9 @@ public class Async {
public Future<Content> execute(final Request request, final FutureCallback<Content> callback) {
return execute(request, new ContentResponseHandler(), callback);
}
-
+
public Future<Content> execute(final Request request) {
return execute(request, new ContentResponseHandler(), null);
}
-
+
}
Modified: httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Content.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Content.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Content.java (original)
+++ httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Content.java Fri Dec 28 14:48:57 2012
@@ -36,8 +36,8 @@ import org.apache.http.protocol.HTTP;
public class Content {
- public static final Content NO_CONTENT = new Content(new byte[] {}, ContentType.DEFAULT_BINARY);
-
+ public static final Content NO_CONTENT = new Content(new byte[] {}, ContentType.DEFAULT_BINARY);
+
private final byte[] raw;
private final ContentType type;
@@ -75,5 +75,5 @@ public class Content {
public String toString() {
return asString();
}
-
+
}
Modified: httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Executor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Executor.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Executor.java (original)
+++ httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Executor.java Fri Dec 28 14:48:57 2012
@@ -198,10 +198,10 @@ public class Executor {
}
/**
- * Executes the request. Please Note that response content must be processed
+ * Executes the request. Please Note that response content must be processed
* or discarded using {@link Response#discardContent()}, otherwise the
* connection used for the request might not be released to the pool.
- *
+ *
* @see Response#handleResponse(org.apache.http.client.ResponseHandler)
* @see Response#discardContent()
*/
Modified: httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Request.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Request.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Request.java (original)
+++ httpcomponents/httpclient/trunk/fluent-hc/src/main/java/org/apache/http/client/fluent/Request.java Fri Dec 28 14:48:57 2012
@@ -317,5 +317,5 @@ public class Request {
public String toString() {
return this.request.getRequestLine().toString();
}
-
+
}
Modified: httpcomponents/httpclient/trunk/hc-checkstyle.xml
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/hc-checkstyle.xml?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/hc-checkstyle.xml (original)
+++ httpcomponents/httpclient/trunk/hc-checkstyle.xml Fri Dec 28 14:48:57 2012
@@ -33,11 +33,11 @@
<module name="FileLength">
<property name="max" value="10000" />
</module>
- <!-- <module name="FileTabCharacter">
+ <module name="FileTabCharacter">
<property name="eachLine" value="true"/>
</module>
<module name="RegexpSingleline">
<property name="format" value="[ \t]+$"/>
<property name="message" value="Trailing whitespace"/>
- </module> -->
+ </module>
</module>
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntity.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntity.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntity.java Fri Dec 28 14:48:57 2012
@@ -67,7 +67,7 @@ class CacheEntity implements HttpEntity,
}
public long getContentLength() {
- return this.cacheEntry.getResource().length();
+ return this.cacheEntry.getResource().length();
}
public InputStream getContent() throws IOException {
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheInvalidator.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheInvalidator.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheInvalidator.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheInvalidator.java Fri Dec 28 14:48:57 2012
@@ -201,7 +201,7 @@ class CacheInvalidator {
// do not invalidate if response is strictly older than entry
// or if the etags match
-
+
if (responseDateOlderThanEntryDate(response, entry)) return;
if (!responseAndEntryEtagsDiffer(response, entry)) return;
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachedResponseSuitabilityChecker.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachedResponseSuitabilityChecker.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachedResponseSuitabilityChecker.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachedResponseSuitabilityChecker.java Fri Dec 28 14:48:57 2012
@@ -148,7 +148,7 @@ class CachedResponseSuitabilityChecker {
}
if (!isConditional(request) && entry.getStatusCode() == HttpStatus.SC_NOT_MODIFIED) {
- return false;
+ return false;
}
if (isConditional(request) && !allConditionalsMatch(request, entry, now)) {
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingExec.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingExec.java Fri Dec 28 14:48:57 2012
@@ -281,8 +281,8 @@ public class CachingExec implements Clie
} else if (!mayCallBackend(request)) {
log.debug("Cache entry not suitable but only-if-cached requested");
out = Proxies.enhanceResponse(generateGatewayTimeout(context));
- } else if (validityPolicy.isRevalidatable(entry)
- && !(entry.getStatusCode() == HttpStatus.SC_NOT_MODIFIED
+ } else if (validityPolicy.isRevalidatable(entry)
+ && !(entry.getStatusCode() == HttpStatus.SC_NOT_MODIFIED
&& !suitabilityChecker.isConditional(request))) {
log.debug("Revalidating cache entry");
return revalidateCacheEntry(route, request, context, execAware, entry, now);
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClient.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClient.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CachingHttpClient.java Fri Dec 28 14:48:57 2012
@@ -470,13 +470,13 @@ public class CachingHttpClient implement
return revalidateCacheEntry(target, request, context, entry, now);
} else {
log.debug("Cache entry not usable; calling backend");
- return callBackend(target, request, context);
+ return callBackend(target, request, context);
}
if (context != null) {
- context.setAttribute(ExecutionContext.HTTP_TARGET_HOST, target);
- context.setAttribute(ExecutionContext.HTTP_REQUEST, request);
- context.setAttribute(ExecutionContext.HTTP_RESPONSE, out);
- context.setAttribute(ExecutionContext.HTTP_REQ_SENT, Boolean.TRUE);
+ context.setAttribute(ExecutionContext.HTTP_TARGET_HOST, target);
+ context.setAttribute(ExecutionContext.HTTP_REQUEST, request);
+ context.setAttribute(ExecutionContext.HTTP_RESPONSE, out);
+ context.setAttribute(ExecutionContext.HTTP_REQ_SENT, Boolean.TRUE);
}
return out;
}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/Proxies.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/Proxies.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/Proxies.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/Proxies.java Fri Dec 28 14:48:57 2012
@@ -53,4 +53,4 @@ class Proxies {
}
}
-}
\ No newline at end of file
+}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseCachingPolicy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseCachingPolicy.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseCachingPolicy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/ResponseCachingPolicy.java Fri Dec 28 14:48:57 2012
@@ -58,15 +58,15 @@ class ResponseCachingPolicy {
private final boolean sharedCache;
private final boolean neverCache1_0ResponsesWithQueryString;
private final Log log = LogFactory.getLog(getClass());
- private static final Set<Integer> cacheableStatuses =
- new HashSet<Integer>(Arrays.asList(HttpStatus.SC_OK,
- HttpStatus.SC_NON_AUTHORITATIVE_INFORMATION,
- HttpStatus.SC_MULTIPLE_CHOICES,
- HttpStatus.SC_MOVED_PERMANENTLY,
- HttpStatus.SC_GONE));
+ private static final Set<Integer> cacheableStatuses =
+ new HashSet<Integer>(Arrays.asList(HttpStatus.SC_OK,
+ HttpStatus.SC_NON_AUTHORITATIVE_INFORMATION,
+ HttpStatus.SC_MULTIPLE_CHOICES,
+ HttpStatus.SC_MOVED_PERMANENTLY,
+ HttpStatus.SC_GONE));
private static final Set<Integer> uncacheableStatuses =
- new HashSet<Integer>(Arrays.asList(HttpStatus.SC_PARTIAL_CONTENT,
- HttpStatus.SC_SEE_OTHER));
+ new HashSet<Integer>(Arrays.asList(HttpStatus.SC_PARTIAL_CONTENT,
+ HttpStatus.SC_SEE_OTHER));
/**
* Define a cache policy that limits the size of things that should be stored
* in the cache to a maximum of {@link HttpResponse} bytes in size.
@@ -99,19 +99,19 @@ class ResponseCachingPolicy {
log.debug("Response was not cacheable.");
return false;
}
-
+
int status = response.getStatusLine().getStatusCode();
if (cacheableStatuses.contains(status)) {
- // these response codes MAY be cached
- cacheable = true;
+ // these response codes MAY be cached
+ cacheable = true;
} else if (uncacheableStatuses.contains(status)) {
- return false;
+ return false;
} else if (unknownStatusCode(status)) {
- // a response with an unknown status code MUST NOT be
- // cached
- return false;
+ // a response with an unknown status code MUST NOT be
+ // cached
+ return false;
}
-
+
Header contentLength = response.getFirstHeader(HTTP.CONTENT_LEN);
if (contentLength != null) {
int contentLengthValue = Integer.parseInt(contentLength.getValue());
@@ -155,15 +155,15 @@ class ResponseCachingPolicy {
}
private boolean unknownStatusCode(int status) {
- if (status >= 100 && status <= 101) return false;
- if (status >= 200 && status <= 206) return false;
- if (status >= 300 && status <= 307) return false;
- if (status >= 400 && status <= 417) return false;
- if (status >= 500 && status <= 505) return false;
- return true;
- }
+ if (status >= 100 && status <= 101) return false;
+ if (status >= 200 && status <= 206) return false;
+ if (status >= 300 && status <= 307) return false;
+ if (status >= 400 && status <= 417) return false;
+ if (status >= 500 && status <= 505) return false;
+ return true;
+ }
- protected boolean isExplicitlyNonCacheable(HttpResponse response) {
+ protected boolean isExplicitlyNonCacheable(HttpResponse response) {
Header[] cacheControlHeaders = response.getHeaders(HeaderConstants.CACHE_CONTROL);
for (Header header : cacheControlHeaders) {
for (HeaderElement elem : header.getElements()) {
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntry.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntry.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntry.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntry.java Fri Dec 28 14:48:57 2012
@@ -72,4 +72,4 @@ public interface MemcachedCacheEntry {
*/
void set(byte[] bytes);
-}
\ No newline at end of file
+}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactory.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/MemcachedCacheEntryFactory.java Fri Dec 28 14:48:57 2012
@@ -43,14 +43,14 @@ public interface MemcachedCacheEntryFact
* cache collisions. Therefore, we store the storage key along
* with the <code>HttpCacheEntry</code> so it can be compared
* on retrieval and thus detect collisions.
- * @param storageKey storage key under which the entry will
+ * @param storageKey storage key under which the entry will
* be logically stored
* @param entry the cache entry to store
* @return a {@link MemcachedCacheEntry} ready to provide
* a serialized representation
*/
MemcachedCacheEntry getMemcachedCacheEntry(String storageKey, HttpCacheEntry entry);
-
+
/**
* Creates an "unset" {@link MemcachedCacheEntry} ready to accept
* a serialized representation via {@link MemcachedCacheEntry#set(byte[])}
@@ -59,4 +59,4 @@ public interface MemcachedCacheEntryFact
*/
MemcachedCacheEntry getUnsetCacheEntry();
-}
\ No newline at end of file
+}
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/SHA256KeyHashingScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/SHA256KeyHashingScheme.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/SHA256KeyHashingScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/memcached/SHA256KeyHashingScheme.java Fri Dec 28 14:48:57 2012
@@ -43,7 +43,7 @@ import org.apache.commons.logging.LogFac
public class SHA256KeyHashingScheme implements KeyHashingScheme {
private static final Log log = LogFactory.getLog(SHA256KeyHashingScheme.class);
-
+
public String hash(String key) {
MessageDigest md = getDigest();
md.update(key.getBytes());
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingExec.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingExec.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingExec.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestCachingExec.java Fri Dec 28 14:48:57 2012
@@ -1574,152 +1574,152 @@ public class TestCachingExec {
assertEquals(1, backend.getExecutions());
}
- @Test
- public void testNoEntityForIfNoneMatchRequestNotYetInCache() throws Exception {
+ @Test
+ public void testNoEntityForIfNoneMatchRequestNotYetInCache() throws Exception {
- Date now = new Date();
- Date tenSecondsAgo = new Date(now.getTime() - 10 * 1000L);
+ Date now = new Date();
+ Date tenSecondsAgo = new Date(now.getTime() - 10 * 1000L);
- impl = new CachingExec(mockBackend, new BasicHttpCache(),
- CacheConfig.DEFAULT);
- HttpRequestWrapper req1 = HttpRequestWrapper.wrap(new HttpGet(
- "http://foo.example.com/"));
- req1.addHeader("If-None-Match", "\"etag\"");
-
- HttpResponse resp1 = new BasicHttpResponse(HttpVersion.HTTP_1_1,
- HttpStatus.SC_NOT_MODIFIED, "Not modified");
- resp1.setHeader("Content-Length", "128");
- resp1.setHeader("ETag", "\"etag\"");
- resp1.setHeader("Date", DateUtils.formatDate(tenSecondsAgo));
- resp1.setHeader("Cache-Control", "public, max-age=5");
-
- backendExpectsAnyRequestAndReturn(resp1);
- replayMocks();
- HttpResponse result = impl.execute(route, req1);
- verifyMocks();
-
- assertEquals(HttpStatus.SC_NOT_MODIFIED, result.getStatusLine()
- .getStatusCode());
- assertNull("The 304 response messages MUST NOT contain a message-body",
- result.getEntity());
- }
-
- @Test
- public void testNotModifiedResponseUpdatesCacheEntryWhenNoEntity() throws Exception {
-
- Date now = new Date();
-
- impl = new CachingExec(mockBackend, new BasicHttpCache(),CacheConfig.DEFAULT);
-
- HttpRequestWrapper req1 = HttpRequestWrapper.wrap(new HttpGet("http://foo.example.com/"));
- req1.addHeader("If-None-Match", "etag");
-
- HttpRequestWrapper req2 = HttpRequestWrapper.wrap(new HttpGet("http://foo.example.com/"));
- req2.addHeader("If-None-Match", "etag");
-
- HttpResponse resp1 = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_NOT_MODIFIED, "Not modified");
- resp1.setHeader("Date", DateUtils.formatDate(now));
- resp1.setHeader("Cache-Control","max-age=0");
- resp1.setHeader("Etag", "etag");
-
- HttpResponse resp2 = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_NOT_MODIFIED, "Not modified");
- resp2.setHeader("Date", DateUtils.formatDate(now));
- resp2.setHeader("Cache-Control","max-age=0");
- resp1.setHeader("Etag", "etag");
-
- backendExpectsAnyRequestAndReturn(resp1);
- backendExpectsAnyRequestAndReturn(resp2);
- replayMocks();
- HttpResponse result1 = impl.execute(route, req1);
- HttpResponse result2 = impl.execute(route, req2);
- verifyMocks();
-
- assertEquals(HttpStatus.SC_NOT_MODIFIED, result1.getStatusLine().getStatusCode());
- assertEquals("etag", result1.getFirstHeader("Etag").getValue());
- assertEquals(HttpStatus.SC_NOT_MODIFIED, result2.getStatusLine().getStatusCode());
- assertEquals("etag", result2.getFirstHeader("Etag").getValue());
- }
-
- @Test
- public void testNotModifiedResponseWithVaryUpdatesCacheEntryWhenNoEntity() throws Exception {
-
- Date now = new Date();
-
- impl = new CachingExec(mockBackend, new BasicHttpCache(),CacheConfig.DEFAULT);
-
- HttpRequestWrapper req1 = HttpRequestWrapper.wrap(new HttpGet("http://foo.example.com/"));
- req1.addHeader("If-None-Match", "etag");
-
- HttpRequestWrapper req2 = HttpRequestWrapper.wrap(new HttpGet("http://foo.example.com/"));
- req2.addHeader("If-None-Match", "etag");
-
- HttpResponse resp1 = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_NOT_MODIFIED, "Not modified");
- resp1.setHeader("Date", DateUtils.formatDate(now));
- resp1.setHeader("Cache-Control","max-age=0");
- resp1.setHeader("Etag", "etag");
- resp1.setHeader("Vary", "Accept-Encoding");
-
- HttpResponse resp2 = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_NOT_MODIFIED, "Not modified");
- resp2.setHeader("Date", DateUtils.formatDate(now));
- resp2.setHeader("Cache-Control","max-age=0");
- resp1.setHeader("Etag", "etag");
- resp1.setHeader("Vary", "Accept-Encoding");
-
- backendExpectsAnyRequestAndReturn(resp1);
- backendExpectsAnyRequestAndReturn(resp2);
- replayMocks();
- HttpResponse result1 = impl.execute(route, req1);
- HttpResponse result2 = impl.execute(route, req2);
- verifyMocks();
-
- assertEquals(HttpStatus.SC_NOT_MODIFIED, result1.getStatusLine().getStatusCode());
- assertEquals("etag", result1.getFirstHeader("Etag").getValue());
- assertEquals(HttpStatus.SC_NOT_MODIFIED, result2.getStatusLine().getStatusCode());
- assertEquals("etag", result2.getFirstHeader("Etag").getValue());
- }
-
- @Test
- public void testDoesNotSend304ForNonConditionalRequest() throws Exception {
-
- Date now = new Date();
- Date inOneMinute = new Date(System.currentTimeMillis()+60000);
-
- impl = new CachingExec(mockBackend, new BasicHttpCache(),CacheConfig.DEFAULT);
-
- HttpRequestWrapper req1 = HttpRequestWrapper.wrap(new HttpGet("http://foo.example.com/"));
- req1.addHeader("If-None-Match", "etag");
-
- HttpRequestWrapper req2 = HttpRequestWrapper.wrap(new HttpGet("http://foo.example.com/"));
-
- HttpResponse resp1 = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_NOT_MODIFIED, "Not modified");
- resp1.setHeader("Date", DateUtils.formatDate(now));
- resp1.setHeader("Cache-Control","public, max-age=60");
- resp1.setHeader("Expires",DateUtils.formatDate(inOneMinute));
- resp1.setHeader("Etag", "etag");
- resp1.setHeader("Vary", "Accept-Encoding");
-
- HttpResponse resp2 = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "Ok");
- resp2.setHeader("Date", DateUtils.formatDate(now));
- resp2.setHeader("Cache-Control","public, max-age=60");
- resp2.setHeader("Expires",DateUtils.formatDate(inOneMinute));
- resp2.setHeader("Etag", "etag");
- resp2.setHeader("Vary", "Accept-Encoding");
- resp2.setEntity(HttpTestUtils.makeBody(128));
-
- backendExpectsAnyRequestAndReturn(resp1);
- backendExpectsAnyRequestAndReturn(resp2).anyTimes();
- replayMocks();
- HttpResponse result1 = impl.execute(route, req1);
- HttpResponse result2 = impl.execute(route, req2);
- verifyMocks();
-
- assertEquals(HttpStatus.SC_NOT_MODIFIED, result1.getStatusLine().getStatusCode());
- assertNull(result1.getEntity());
- assertEquals(HttpStatus.SC_OK, result2.getStatusLine().getStatusCode());
- Assert.assertNotNull(result2.getEntity());
- }
+ impl = new CachingExec(mockBackend, new BasicHttpCache(),
+ CacheConfig.DEFAULT);
+ HttpRequestWrapper req1 = HttpRequestWrapper.wrap(new HttpGet(
+ "http://foo.example.com/"));
+ req1.addHeader("If-None-Match", "\"etag\"");
- private IExpectationSetters<CloseableHttpResponse> backendExpectsAnyRequestAndReturn(
+ HttpResponse resp1 = new BasicHttpResponse(HttpVersion.HTTP_1_1,
+ HttpStatus.SC_NOT_MODIFIED, "Not modified");
+ resp1.setHeader("Content-Length", "128");
+ resp1.setHeader("ETag", "\"etag\"");
+ resp1.setHeader("Date", DateUtils.formatDate(tenSecondsAgo));
+ resp1.setHeader("Cache-Control", "public, max-age=5");
+
+ backendExpectsAnyRequestAndReturn(resp1);
+ replayMocks();
+ HttpResponse result = impl.execute(route, req1);
+ verifyMocks();
+
+ assertEquals(HttpStatus.SC_NOT_MODIFIED, result.getStatusLine()
+ .getStatusCode());
+ assertNull("The 304 response messages MUST NOT contain a message-body",
+ result.getEntity());
+ }
+
+ @Test
+ public void testNotModifiedResponseUpdatesCacheEntryWhenNoEntity() throws Exception {
+
+ Date now = new Date();
+
+ impl = new CachingExec(mockBackend, new BasicHttpCache(),CacheConfig.DEFAULT);
+
+ HttpRequestWrapper req1 = HttpRequestWrapper.wrap(new HttpGet("http://foo.example.com/"));
+ req1.addHeader("If-None-Match", "etag");
+
+ HttpRequestWrapper req2 = HttpRequestWrapper.wrap(new HttpGet("http://foo.example.com/"));
+ req2.addHeader("If-None-Match", "etag");
+
+ HttpResponse resp1 = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_NOT_MODIFIED, "Not modified");
+ resp1.setHeader("Date", DateUtils.formatDate(now));
+ resp1.setHeader("Cache-Control","max-age=0");
+ resp1.setHeader("Etag", "etag");
+
+ HttpResponse resp2 = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_NOT_MODIFIED, "Not modified");
+ resp2.setHeader("Date", DateUtils.formatDate(now));
+ resp2.setHeader("Cache-Control","max-age=0");
+ resp1.setHeader("Etag", "etag");
+
+ backendExpectsAnyRequestAndReturn(resp1);
+ backendExpectsAnyRequestAndReturn(resp2);
+ replayMocks();
+ HttpResponse result1 = impl.execute(route, req1);
+ HttpResponse result2 = impl.execute(route, req2);
+ verifyMocks();
+
+ assertEquals(HttpStatus.SC_NOT_MODIFIED, result1.getStatusLine().getStatusCode());
+ assertEquals("etag", result1.getFirstHeader("Etag").getValue());
+ assertEquals(HttpStatus.SC_NOT_MODIFIED, result2.getStatusLine().getStatusCode());
+ assertEquals("etag", result2.getFirstHeader("Etag").getValue());
+ }
+
+ @Test
+ public void testNotModifiedResponseWithVaryUpdatesCacheEntryWhenNoEntity() throws Exception {
+
+ Date now = new Date();
+
+ impl = new CachingExec(mockBackend, new BasicHttpCache(),CacheConfig.DEFAULT);
+
+ HttpRequestWrapper req1 = HttpRequestWrapper.wrap(new HttpGet("http://foo.example.com/"));
+ req1.addHeader("If-None-Match", "etag");
+
+ HttpRequestWrapper req2 = HttpRequestWrapper.wrap(new HttpGet("http://foo.example.com/"));
+ req2.addHeader("If-None-Match", "etag");
+
+ HttpResponse resp1 = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_NOT_MODIFIED, "Not modified");
+ resp1.setHeader("Date", DateUtils.formatDate(now));
+ resp1.setHeader("Cache-Control","max-age=0");
+ resp1.setHeader("Etag", "etag");
+ resp1.setHeader("Vary", "Accept-Encoding");
+
+ HttpResponse resp2 = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_NOT_MODIFIED, "Not modified");
+ resp2.setHeader("Date", DateUtils.formatDate(now));
+ resp2.setHeader("Cache-Control","max-age=0");
+ resp1.setHeader("Etag", "etag");
+ resp1.setHeader("Vary", "Accept-Encoding");
+
+ backendExpectsAnyRequestAndReturn(resp1);
+ backendExpectsAnyRequestAndReturn(resp2);
+ replayMocks();
+ HttpResponse result1 = impl.execute(route, req1);
+ HttpResponse result2 = impl.execute(route, req2);
+ verifyMocks();
+
+ assertEquals(HttpStatus.SC_NOT_MODIFIED, result1.getStatusLine().getStatusCode());
+ assertEquals("etag", result1.getFirstHeader("Etag").getValue());
+ assertEquals(HttpStatus.SC_NOT_MODIFIED, result2.getStatusLine().getStatusCode());
+ assertEquals("etag", result2.getFirstHeader("Etag").getValue());
+ }
+
+ @Test
+ public void testDoesNotSend304ForNonConditionalRequest() throws Exception {
+
+ Date now = new Date();
+ Date inOneMinute = new Date(System.currentTimeMillis()+60000);
+
+ impl = new CachingExec(mockBackend, new BasicHttpCache(),CacheConfig.DEFAULT);
+
+ HttpRequestWrapper req1 = HttpRequestWrapper.wrap(new HttpGet("http://foo.example.com/"));
+ req1.addHeader("If-None-Match", "etag");
+
+ HttpRequestWrapper req2 = HttpRequestWrapper.wrap(new HttpGet("http://foo.example.com/"));
+
+ HttpResponse resp1 = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_NOT_MODIFIED, "Not modified");
+ resp1.setHeader("Date", DateUtils.formatDate(now));
+ resp1.setHeader("Cache-Control","public, max-age=60");
+ resp1.setHeader("Expires",DateUtils.formatDate(inOneMinute));
+ resp1.setHeader("Etag", "etag");
+ resp1.setHeader("Vary", "Accept-Encoding");
+
+ HttpResponse resp2 = new BasicHttpResponse(HttpVersion.HTTP_1_1, HttpStatus.SC_OK, "Ok");
+ resp2.setHeader("Date", DateUtils.formatDate(now));
+ resp2.setHeader("Cache-Control","public, max-age=60");
+ resp2.setHeader("Expires",DateUtils.formatDate(inOneMinute));
+ resp2.setHeader("Etag", "etag");
+ resp2.setHeader("Vary", "Accept-Encoding");
+ resp2.setEntity(HttpTestUtils.makeBody(128));
+
+ backendExpectsAnyRequestAndReturn(resp1);
+ backendExpectsAnyRequestAndReturn(resp2).anyTimes();
+ replayMocks();
+ HttpResponse result1 = impl.execute(route, req1);
+ HttpResponse result2 = impl.execute(route, req2);
+ verifyMocks();
+
+ assertEquals(HttpStatus.SC_NOT_MODIFIED, result1.getStatusLine().getStatusCode());
+ assertNull(result1.getEntity());
+ assertEquals(HttpStatus.SC_OK, result2.getStatusLine().getStatusCode());
+ Assert.assertNotNull(result2.getEntity());
+ }
+
+ private IExpectationSetters<CloseableHttpResponse> backendExpectsAnyRequestAndReturn(
HttpResponse response) throws Exception {
CloseableHttpResponse resp = mockBackend.execute(
EasyMock.isA(HttpRoute.class),
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestHttpCacheJiraNumber1147.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestHttpCacheJiraNumber1147.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestHttpCacheJiraNumber1147.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestHttpCacheJiraNumber1147.java Fri Dec 28 14:48:57 2012
@@ -73,12 +73,12 @@ public class TestHttpCacheJiraNumber1147
}
cacheDir.mkdir();
}
-
+
@After
public void cleanUp() {
removeCache();
}
-
+
@Test
public void testIssue1147() throws Exception {
CacheConfig cacheConfig = CacheConfig.custom()
@@ -97,30 +97,30 @@ public class TestHttpCacheJiraNumber1147
Date now = new Date();
Date tenSecondsAgo = new Date(now.getTime() - 10 * 1000L);
-
+
HttpResponse response = new BasicHttpResponse(HttpVersion.HTTP_1_1, 200, "OK");
response.setEntity(HttpTestUtils.makeBody(128));
response.setHeader("Content-Length", "128");
response.setHeader("ETag", "\"etag\"");
response.setHeader("Cache-Control", "public, max-age=3600");
response.setHeader("Last-Modified", DateUtils.formatDate(tenSecondsAgo));
-
+
EasyMock.expect(backend.execute(
EasyMock.eq(route),
EasyMock.isA(HttpRequestWrapper.class),
EasyMock.same(context),
EasyMock.<HttpExecutionAware>isNull())).andReturn(Proxies.enhanceResponse(response));
EasyMock.replay(backend);
-
+
BasicHttpCache cache = new BasicHttpCache(resourceFactory, httpCacheStorage, cacheConfig);
CachingExec t = new CachingExec(backend, cache, cacheConfig);
HttpResponse response1 = t.execute(route, get, context, null);
Assert.assertEquals(200, response1.getStatusLine().getStatusCode());
EntityUtils.consume(response1.getEntity());
-
+
EasyMock.verify(backend);
-
+
removeCache();
EasyMock.reset(backend);
@@ -130,7 +130,7 @@ public class TestHttpCacheJiraNumber1147
EasyMock.same(context),
EasyMock.<HttpExecutionAware>isNull())).andReturn(Proxies.enhanceResponse(response));
EasyMock.replay(backend);
-
+
HttpResponse response2 = t.execute(route, get, context, null);
Assert.assertEquals(200, response2.getStatusLine().getStatusCode());
EntityUtils.consume(response2.getEntity());
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseCachingPolicy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseCachingPolicy.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseCachingPolicy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/TestResponseCachingPolicy.java Fri Dec 28 14:48:57 2012
@@ -516,13 +516,13 @@ public class TestResponseCachingPolicy {
response.removeHeaders("Cache-Control");
Assert.assertFalse(policy.isResponseCacheable(request, response));
}
-
+
@Test
public void otherStatusCodesAreCacheableWithExplicitCachingHeaders() {
- response.setStatusCode(HttpStatus.SC_NOT_FOUND);
- response.setHeader("Date", formatDate(now));
- response.setHeader("Cache-Control","max-age=300");
- Assert.assertTrue(policy.isResponseCacheable(request, response));
+ response.setStatusCode(HttpStatus.SC_NOT_FOUND);
+ response.setHeader("Date", formatDate(now));
+ response.setHeader("Cache-Control","max-age=300");
+ Assert.assertTrue(policy.isResponseCacheable(request, response));
}
private int getRandomStatus() {
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestMemcachedCacheEntryImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestMemcachedCacheEntryImpl.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestMemcachedCacheEntryImpl.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestMemcachedCacheEntryImpl.java Fri Dec 28 14:48:57 2012
@@ -51,31 +51,31 @@ public class TestMemcachedCacheEntryImpl
entry = HttpTestUtils.makeCacheEntry();
impl = new MemcachedCacheEntryImpl("foo", entry);
}
-
+
@Test
public void canBeCreatedEmpty() {
impl = new MemcachedCacheEntryImpl();
assertNull(impl.getStorageKey());
assertNull(impl.getHttpCacheEntry());
}
-
+
@Test
public void canBeSerialized() {
byte[] bytes = impl.toByteArray();
assertNotNull(bytes);
assertTrue(bytes.length > 0);
}
-
+
@Test
public void knowsItsCacheKey() {
assertEquals("foo", impl.getStorageKey());
}
-
+
@Test
public void knowsItsCacheEntry() {
assertEquals(entry, impl.getHttpCacheEntry());
}
-
+
@Test
public void canBeReconstitutedFromByteArray() throws Exception {
String key = impl.getStorageKey();
@@ -83,11 +83,11 @@ public class TestMemcachedCacheEntryImpl
byte[] bytes = impl.toByteArray();
impl = new MemcachedCacheEntryImpl();
impl.set(bytes);
-
+
assertEquals(key, impl.getStorageKey());
assertEquivalent(entry, impl.getHttpCacheEntry());
}
-
+
@Test(expected=MemcachedSerializationException.class)
public void cannotReconstituteFromGarbage() {
impl = new MemcachedCacheEntryImpl();
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestPrefixKeyHashingScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestPrefixKeyHashingScheme.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestPrefixKeyHashingScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestPrefixKeyHashingScheme.java Fri Dec 28 14:48:57 2012
@@ -49,7 +49,7 @@ public class TestPrefixKeyHashingScheme
};
impl = new PrefixKeyHashingScheme(PREFIX, scheme);
}
-
+
@Test
public void addsPrefixToBackingScheme() {
assertEquals("prefixhash", impl.hash(KEY));
Modified: httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestSHA256HashingScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestSHA256HashingScheme.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestSHA256HashingScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient-cache/src/test/java/org/apache/http/impl/client/cache/memcached/TestSHA256HashingScheme.java Fri Dec 28 14:48:57 2012
@@ -39,5 +39,5 @@ public class TestSHA256HashingScheme {
String result = impl.hash("hello, hashing world");
assertTrue(result != null && result.length() > 0);
}
-
+
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java Fri Dec 28 14:48:57 2012
@@ -79,4 +79,4 @@ public class ClientExecuteProxy {
}
}
-}
\ No newline at end of file
+}
Modified: httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteSOCKS.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteSOCKS.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteSOCKS.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/examples/org/apache/http/examples/client/ClientExecuteSOCKS.java Fri Dec 28 14:48:57 2012
@@ -130,4 +130,4 @@ public class ClientExecuteSOCKS {
}
-}
\ No newline at end of file
+}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/auth/AuthState.java Fri Dec 28 14:48:57 2012
@@ -154,7 +154,7 @@ public class AuthState {
*
* @deprecated (4.2) use {@link #reset()}
*/
- @Deprecated
+ @Deprecated
public void invalidate() {
reset();
}
@@ -174,7 +174,7 @@ public class AuthState {
*
* @deprecated (4.2) use {@link #update(AuthScheme, Credentials)}
*/
- @Deprecated
+ @Deprecated
public void setAuthScheme(final AuthScheme authScheme) {
if (authScheme == null) {
reset();
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/AbortableHttpRequest.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/AbortableHttpRequest.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/AbortableHttpRequest.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/AbortableHttpRequest.java Fri Dec 28 14:48:57 2012
@@ -40,7 +40,7 @@ import org.apache.http.conn.ManagedClien
* down the underlying HTTP connection.
*
* @since 4.0
- *
+ *
* @deprecated (4.3) use {@link HttpExecutionAware}
*/
@Deprecated
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/CloseableHttpResponse.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/CloseableHttpResponse.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/CloseableHttpResponse.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/methods/CloseableHttpResponse.java Fri Dec 28 14:48:57 2012
@@ -33,7 +33,7 @@ import org.apache.http.HttpResponse;
/**
* Extended version of the {@link HttpResponse} interface that also extends {@link Closeable}.
- *
+ *
* @since 4.3
*/
public interface CloseableHttpResponse extends HttpResponse, Closeable {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/ClientParamBean.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/ClientParamBean.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/ClientParamBean.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/params/ClientParamBean.java Fri Dec 28 14:48:57 2012
@@ -56,7 +56,7 @@ public class ClientParamBean extends Htt
/**
* @deprecated (4.2) do not use.
*/
- @Deprecated
+ @Deprecated
public void setConnectionManagerFactoryClassName (final String factory) {
params.setParameter(ClientPNames.CONNECTION_MANAGER_FACTORY_CLASS_NAME, factory);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAcceptEncoding.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAcceptEncoding.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAcceptEncoding.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/RequestAcceptEncoding.java Fri Dec 28 14:48:57 2012
@@ -56,7 +56,7 @@ public class RequestAcceptEncoding imple
/* Signal support for Accept-Encoding transfer encodings. */
if (!request.containsHeader("Accept-Encoding")) {
request.addHeader("Accept-Encoding", "gzip,deflate");
- }
+ }
}
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseAuthCache.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseAuthCache.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseAuthCache.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseAuthCache.java Fri Dec 28 14:48:57 2012
@@ -59,7 +59,7 @@ import org.apache.http.util.Args;
* @deprecated (4.2) use {@link AuthenticationStrategy}
*/
@Immutable
-@Deprecated
+@Deprecated
public class ResponseAuthCache implements HttpResponseInterceptor {
private final Log log = LogFactory.getLog(getClass());
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseContentEncoding.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseContentEncoding.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseContentEncoding.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/protocol/ResponseContentEncoding.java Fri Dec 28 14:48:57 2012
@@ -52,8 +52,8 @@ import org.apache.http.protocol.HttpCont
@Immutable
public class ResponseContentEncoding implements HttpResponseInterceptor {
- public static final String UNCOMPRESSED = "http.client.response.uncompressed";
-
+ public static final String UNCOMPRESSED = "http.client.response.uncompressed";
+
/**
* Handles the following {@code Content-Encoding}s by
* using the appropriate decompressor to wrap the response Entity:
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URIBuilder.java Fri Dec 28 14:48:57 2012
@@ -72,7 +72,7 @@ public class URIBuilder {
/**
* Construct an instance from the string which must be a valid URI.
- *
+ *
* @param string a valid URI in string form
* @throws URISyntaxException if the input is not a valid URI
*/
@@ -103,7 +103,7 @@ public class URIBuilder {
public URI build() throws URISyntaxException {
return new URI(buildString());
}
-
+
private String buildString() {
StringBuilder sb = new StringBuilder();
if (this.scheme != null) {
@@ -256,9 +256,9 @@ public class URIBuilder {
* Sets URI query.
* <p>
* The value is expected to be encoded form data.
- *
+ *
* @deprecated (4.3) use {@link #setParameters(List)} or {@link #setParameters(NameValuePair...)}
- *
+ *
* @see URLEncodedUtils#parse
*/
@Deprecated
@@ -269,14 +269,14 @@ public class URIBuilder {
this.encodedSchemeSpecificPart = null;
return this;
}
-
+
/**
* Sets URI query parameters. The parameter name / values are expected to be unescaped
* and may contain non ASCII characters.
* <p/>
* Please note query parameters and custom query component are mutually exclusive. This method
* will remove custom query if present.
- *
+ *
* @since 4.3
*/
public URIBuilder setParameters(final List <NameValuePair> nvps) {
@@ -291,14 +291,14 @@ public class URIBuilder {
this.query = null;
return this;
}
-
+
/**
* Adds URI query parameters. The parameter name / values are expected to be unescaped
* and may contain non ASCII characters.
* <p/>
* Please note query parameters and custom query component are mutually exclusive. This method
* will remove custom query if present.
- *
+ *
* @since 4.3
*/
public URIBuilder addParameters(final List <NameValuePair> nvps) {
@@ -311,14 +311,14 @@ public class URIBuilder {
this.query = null;
return this;
}
-
+
/**
* Sets URI query parameters. The parameter name / values are expected to be unescaped
* and may contain non ASCII characters.
* <p/>
* Please note query parameters and custom query component are mutually exclusive. This method
* will remove custom query if present.
- *
+ *
* @since 4.3
*/
public URIBuilder setParameters(final NameValuePair... nvps) {
@@ -335,7 +335,7 @@ public class URIBuilder {
this.query = null;
return this;
}
-
+
/**
* Adds parameter to URI query. The parameter name and value are expected to be unescaped
* and may contain non ASCII characters.
@@ -382,7 +382,7 @@ public class URIBuilder {
/**
* Clears URI query parameters.
- *
+ *
* @since 4.3
*/
public URIBuilder clearParameters() {
@@ -391,14 +391,14 @@ public class URIBuilder {
this.encodedSchemeSpecificPart = null;
return this;
}
-
+
/**
* Sets custom URI query. The value is expected to be unescaped and may contain non ASCII
- * characters.
+ * characters.
* <p/>
* Please note query parameters and custom query component are mutually exclusive. This method
* will remove query parameters if present.
- *
+ *
* @since 4.3
*/
public URIBuilder setCustomQuery(final String query) {
@@ -408,7 +408,7 @@ public class URIBuilder {
this.queryParams = null;
return this;
}
-
+
/**
* Sets URI fragment. The value is expected to be unescaped and may contain non ASCII
* characters.
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/client/utils/URLEncodedUtils.java Fri Dec 28 14:48:57 2012
@@ -257,7 +257,7 @@ public class URLEncodedUtils {
return result.toString();
}
- /**
+ /**
* Unreserved characters, i.e. alphanumeric, plus: {@code _ - ! . ~ ' ( ) *}
* <p>
* This list is the same as the {@code unreserved} list in
@@ -270,28 +270,28 @@ public class URLEncodedUtils {
* These are the additional characters allowed by userinfo.
*/
private static final BitSet PUNCT = new BitSet(256);
- /** Characters which are safe to use in userinfo,
+ /** Characters which are safe to use in userinfo,
* i.e. {@link #UNRESERVED} plus {@link #PUNCT}uation */
private static final BitSet USERINFO = new BitSet(256);
- /** Characters which are safe to use in a path,
+ /** Characters which are safe to use in a path,
* i.e. {@link #UNRESERVED} plus {@link #PUNCT}uation plus / @ */
private static final BitSet PATHSAFE = new BitSet(256);
- /** Characters which are safe to use in a query or a fragment,
+ /** Characters which are safe to use in a query or a fragment,
* i.e. {@link #RESERVED} plus {@link #UNRESERVED} */
private static final BitSet URIC = new BitSet(256);
- /**
+ /**
* Reserved characters, i.e. {@code ;/?:@&=+$,[]}
* <p>
- * This list is the same as the {@code reserved} list in
+ * This list is the same as the {@code reserved} list in
* <a href="http://www.ietf.org/rfc/rfc2396.txt">RFC 2396</a>
* as augmented by
* <a href="http://www.ietf.org/rfc/rfc2732.txt">RFC 2732</a>
*/
private static final BitSet RESERVED = new BitSet(256);
-
- /**
+
+ /**
* Safe characters for x-www-form-urlencoded data, as per java.net.URLEncoder and browser behaviour,
* i.e. alphanumeric plus {@code "-", "_", ".", "*"}
*/
@@ -343,7 +343,7 @@ public class URLEncodedUtils {
PATHSAFE.set('+');
PATHSAFE.set('$');
PATHSAFE.set(',');
-
+
RESERVED.set(';');
RESERVED.set('/');
RESERVED.set('?');
@@ -356,7 +356,7 @@ public class URLEncodedUtils {
RESERVED.set(',');
RESERVED.set('['); // added by RFC 2732
RESERVED.set(']'); // added by RFC 2732
-
+
URIC.or(RESERVED);
URIC.or(UNRESERVED);
}
@@ -365,7 +365,7 @@ public class URLEncodedUtils {
/**
* Emcode/escape a portion of a URL, to use with the query part ensure {@code plusAsBlank} is true.
- *
+ *
* @param content the portion to decode
* @param charset the charset to use
* @param blankAsPlus if {@code true}, then convert space to '+' (e.g. for www-url-form-encoded content), otherwise leave as is.
@@ -400,7 +400,7 @@ public class URLEncodedUtils {
/**
* Decode/unescape a portion of a URL, to use with the query part ensure {@code plusAsBlank} is true.
- *
+ *
* @param content the portion to decode
* @param charset the charset to use
* @param plusAsBlank if {@code true}, then convert '+' to space (e.g. for www-url-form-encoded content), otherwise leave as is.
@@ -441,7 +441,7 @@ public class URLEncodedUtils {
/**
* Decode/unescape www-url-form-encoded content.
- *
+ *
* @param content the content to decode, will decode '+' as space
* @param charset the charset to use
* @return
@@ -455,7 +455,7 @@ public class URLEncodedUtils {
/**
* Decode/unescape www-url-form-encoded content.
- *
+ *
* @param content the content to decode, will decode '+' as space
* @param charset the charset to use
* @return
@@ -473,7 +473,7 @@ public class URLEncodedUtils {
* Uses the {@link #URLENCODER} set of characters, rather than
* the {@link #UNRSERVED} set; this is for compatibilty with previous
* releases, URLEncoder.encode() and most browsers.
- *
+ *
* @param content the content to encode, will convert space to '+'
* @param charset the charset to use
* @return
@@ -492,7 +492,7 @@ public class URLEncodedUtils {
* Uses the {@link #URLENCODER} set of characters, rather than
* the {@link #UNRSERVED} set; this is for compatibilty with previous
* releases, URLEncoder.encode() and most browsers.
- *
+ *
* @param content the content to encode, will convert space to '+'
* @param charset the charset to use
* @return
@@ -508,7 +508,7 @@ public class URLEncodedUtils {
* Encode a String using the {@link #USERINFO} set of characters.
* <p>
* Used by URIBuilder to encode the userinfo segment.
- *
+ *
* @param content the string to encode, does not convert space to '+'
* @param charset the charset to use
* @return the encoded string
@@ -521,7 +521,7 @@ public class URLEncodedUtils {
* Encode a String using the {@link #URIC} set of characters.
* <p>
* Used by URIBuilder to encode the query and fragment segments.
- *
+ *
* @param content the string to encode, does not convert space to '+'
* @param charset the charset to use
* @return the encoded string
@@ -534,7 +534,7 @@ public class URLEncodedUtils {
* Encode a String using the {@link #PATHSAFE} set of characters.
* <p>
* Used by URIBuilder to encode path segments.
- *
+ *
* @param content the string to encode, does not convert space to '+'
* @param charset the charset to use
* @return the encoded string
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicEofSensorWatcher.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicEofSensorWatcher.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicEofSensorWatcher.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicEofSensorWatcher.java Fri Dec 28 14:48:57 2012
@@ -37,7 +37,7 @@ import org.apache.http.util.Args;
* is released on close or EOF.
*
* @since 4.0
- *
+ *
* @deprecated (4.3) do not use.
*/
@Deprecated
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicManagedEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicManagedEntity.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicManagedEntity.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/BasicManagedEntity.java Fri Dec 28 14:48:57 2012
@@ -44,7 +44,7 @@ import org.apache.http.util.EntityUtils;
* the unmanaged entity in the response with a managed one.
*
* @since 4.0
- *
+ *
* @deprecated (4.3) do not use.
*/
@Deprecated
@@ -106,7 +106,7 @@ public class BasicManagedEntity extends
* @deprecated (4.1) Use {@link EntityUtils#consume(HttpEntity)}
*/
@Deprecated
- @Override
+ @Override
public void consumeContent() throws IOException {
ensureConsumed();
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionPNames.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionPNames.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionPNames.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionPNames.java Fri Dec 28 14:48:57 2012
@@ -32,7 +32,7 @@ import org.apache.http.impl.conn.Default
* Parameter names for HTTP client connections.
*
* @since 4.0
- *
+ *
* @deprecated (4.1) use custom {@link DefaultHttpResponseParser} implementation.
*/
@Deprecated
@@ -58,7 +58,7 @@ public interface ConnConnectionPNames {
* @deprecated (4.1) Use custom {@link DefaultHttpResponseParser} implementation
*/
@Deprecated
- public static final String MAX_STATUS_LINE_GARBAGE = "http.connection.max-status-line-garbage";
+ public static final String MAX_STATUS_LINE_GARBAGE = "http.connection.max-status-line-garbage";
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionParamBean.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionParamBean.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionParamBean.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnConnectionParamBean.java Fri Dec 28 14:48:57 2012
@@ -37,10 +37,10 @@ import org.apache.http.params.HttpParams
* using Java Beans conventions.
*
* @since 4.0
- *
+ *
* @deprecated (4.2) do not use
*/
-@Deprecated
+@Deprecated
public class ConnConnectionParamBean extends HttpAbstractParamBean {
public ConnConnectionParamBean (final HttpParams params) {
@@ -51,7 +51,7 @@ public class ConnConnectionParamBean ext
* @deprecated (4.2) Use custom {@link DefaultHttpResponseParser} implementation
*/
@Deprecated
- public void setMaxStatusLineGarbage (final int maxStatusLineGarbage) {
+ public void setMaxStatusLineGarbage (final int maxStatusLineGarbage) {
params.setIntParameter(ConnConnectionPNames.MAX_STATUS_LINE_GARBAGE, maxStatusLineGarbage);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerPNames.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerPNames.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerPNames.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerPNames.java Fri Dec 28 14:48:57 2012
@@ -30,10 +30,10 @@ package org.apache.http.conn.params;
* Parameter names for connection managers in HttpConn.
*
* @since 4.0
- *
+ *
* @deprecated (4.1) use configuration methods of the specific connection manager implementation.
*/
-@Deprecated
+@Deprecated
public interface ConnManagerPNames {
/**
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParamBean.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParamBean.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParamBean.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParamBean.java Fri Dec 28 14:48:57 2012
@@ -37,11 +37,11 @@ import org.apache.http.params.HttpParams
* using Java Beans conventions.
*
* @since 4.0
- *
+ *
* @deprecated (4.1) use configuration methods of the specific connection manager implementation.
*/
@NotThreadSafe
-@Deprecated
+@Deprecated
public class ConnManagerParamBean extends HttpAbstractParamBean {
public ConnManagerParamBean (final HttpParams params) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnManagerParams.java Fri Dec 28 14:48:57 2012
@@ -39,10 +39,10 @@ import org.apache.http.util.Args;
* @since 4.0
*
* @see ConnManagerPNames
- *
+ *
* @deprecated (4.1) use configuration methods of the specific connection manager implementation.
*/
-@Deprecated
+@Deprecated
@Immutable
public final class ConnManagerParams implements ConnManagerPNames {
@@ -59,7 +59,7 @@ public final class ConnManagerParams imp
* @deprecated (4.1) use {@link HttpConnectionParams#getConnectionTimeout(HttpParams)}
*/
@Deprecated
- public static long getTimeout(final HttpParams params) {
+ public static long getTimeout(final HttpParams params) {
Args.notNull(params, "HTTP parameters");
return params.getLongParameter(TIMEOUT, 0);
}
@@ -74,7 +74,7 @@ public final class ConnManagerParams imp
* @deprecated (4.1) use {@link HttpConnectionParams#setConnectionTimeout(HttpParams, int)}
*/
@Deprecated
- public static void setTimeout(final HttpParams params, long timeout) {
+ public static void setTimeout(final HttpParams params, long timeout) {
Args.notNull(params, "HTTP parameters");
params.setLongParameter(TIMEOUT, timeout);
}
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java Fri Dec 28 14:48:57 2012
@@ -44,7 +44,7 @@ import org.apache.http.util.Args;
*
* @deprecated (4.2) use {@link ConnPoolControl}
*/
-@Deprecated
+@Deprecated
@ThreadSafe
public final class ConnPerRouteBean implements ConnPerRoute {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/HostNameResolver.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/HostNameResolver.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/HostNameResolver.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/HostNameResolver.java Fri Dec 28 14:48:57 2012
@@ -37,7 +37,7 @@ import java.net.InetAddress;
*
* @deprecated (4.1) Do not use
*/
-@Deprecated
+@Deprecated
public interface HostNameResolver {
/**
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSchemeSocketFactory.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSchemeSocketFactory.java?rev=1426529&r1=1426528&r2=1426529&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSchemeSocketFactory.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/conn/scheme/LayeredSchemeSocketFactory.java Fri Dec 28 14:48:57 2012
@@ -35,7 +35,7 @@ import java.net.UnknownHostException;
* Extended {@link SchemeSocketFactory} interface for layered sockets such as SSL/TLS.
*
* @since 4.1
- *
+ *
* @deprecated (4.2) use {@link SchemeLayeredSocketFactory}
*/
@Deprecated