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 2018/01/02 12:46:47 UTC
httpcomponents-client git commit: HTTPCLIENT-1384: clean up of
HttpCacheInvalidator and HttpAsyncCacheInvalidator APIs
Repository: httpcomponents-client
Updated Branches:
refs/heads/master c78032d63 -> eb1cab46e
HTTPCLIENT-1384: clean up of HttpCacheInvalidator and HttpAsyncCacheInvalidator APIs
Project: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/commit/eb1cab46
Tree: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/tree/eb1cab46
Diff: http://git-wip-us.apache.org/repos/asf/httpcomponents-client/diff/eb1cab46
Branch: refs/heads/master
Commit: eb1cab46e6cd7ebeb16e02c1a05b5cf4965105bb
Parents: c78032d
Author: Oleg Kalnichevski <ol...@apache.org>
Authored: Tue Jan 2 13:41:31 2018 +0100
Committer: Oleg Kalnichevski <ol...@apache.org>
Committed: Tue Jan 2 13:41:31 2018 +0100
----------------------------------------------------------------------
.../http/cache/HttpAsyncCacheInvalidator.java | 10 ++-
.../http/cache/HttpCacheInvalidator.java | 10 ++-
.../http/impl/cache/AsyncCachingExec.java | 4 +-
.../http/impl/cache/BasicHttpAsyncCache.java | 24 +++----
.../client5/http/impl/cache/BasicHttpCache.java | 16 ++---
.../http/impl/cache/CacheableRequestPolicy.java | 4 +-
.../hc/client5/http/impl/cache/CachingExec.java | 4 +-
.../cache/DefaultAsyncCacheInvalidator.java | 4 +-
.../impl/cache/DefaultCacheInvalidator.java | 4 +-
.../client5/http/impl/cache/HttpAsyncCache.java | 10 +--
.../hc/client5/http/impl/cache/HttpCache.java | 10 +--
.../http/impl/cache/AbstractProtocolTest.java | 4 +-
.../http/impl/cache/TestBasicHttpCache.java | 4 +-
.../http/impl/cache/TestCachingExec.java | 4 +-
.../http/impl/cache/TestCachingExecChain.java | 7 +-
.../cache/TestDefaultAsyncCacheInvalidator.java | 62 +++++++++---------
.../impl/cache/TestDefaultCacheInvalidator.java | 68 +++++++++-----------
.../impl/cache/TestProtocolRequirements.java | 2 +-
18 files changed, 120 insertions(+), 131 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb1cab46/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpAsyncCacheInvalidator.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpAsyncCacheInvalidator.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpAsyncCacheInvalidator.java
index fa9684b..327fb36 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpAsyncCacheInvalidator.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpAsyncCacheInvalidator.java
@@ -46,8 +46,7 @@ import org.apache.hc.core5.http.HttpResponse;
public interface HttpAsyncCacheInvalidator {
/**
- * Remove cache entries from the cache that are no longer fresh or have been
- * invalidated in some way.
+ * Flush {@link HttpCacheEntry}s invalidated by the given request.
*
* @param host backend host
* @param request request message
@@ -55,7 +54,7 @@ public interface HttpAsyncCacheInvalidator {
* @param cacheStorage internal cache storage
* @param callback result callback
*/
- Cancellable flushInvalidatedCacheEntries(
+ Cancellable flushCacheEntriesInvalidatedByRequest(
HttpHost host,
HttpRequest request,
Resolver<URI, String> cacheKeyResolver,
@@ -63,8 +62,7 @@ public interface HttpAsyncCacheInvalidator {
FutureCallback<Boolean> callback);
/**
- * Flushes entries that were invalidated by the given response received for
- * the given host/request pair.
+ * Flush {@link HttpCacheEntry}s invalidated by the given message exchange.
*
* @param host backend host
* @param request request message
@@ -73,7 +71,7 @@ public interface HttpAsyncCacheInvalidator {
* @param cacheStorage internal cache storage
* @param callback result callback
*/
- Cancellable flushInvalidatedCacheEntries(
+ Cancellable flushCacheEntriesInvalidatedByExchange(
HttpHost host,
HttpRequest request,
HttpResponse response,
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb1cab46/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheInvalidator.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheInvalidator.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheInvalidator.java
index 36fd2a1..e373d22 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheInvalidator.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/cache/HttpCacheInvalidator.java
@@ -44,8 +44,7 @@ import org.apache.hc.core5.http.HttpResponse;
public interface HttpCacheInvalidator {
/**
- * Remove cache entries from the cache that are no longer fresh or have been
- * invalidated in some way.
+ * Flush {@link HttpCacheEntry}s invalidated by the given request.
*
* @param host backend host
* @param request request message
@@ -54,15 +53,14 @@ public interface HttpCacheInvalidator {
*
* @since 5.0
*/
- void flushInvalidatedCacheEntries(
+ void flushCacheEntriesInvalidatedByRequest(
HttpHost host,
HttpRequest request,
Resolver<URI, String> cacheKeyResolver,
HttpCacheStorage cacheStorage);
/**
- * Flushes entries that were invalidated by the given response received for
- * the given host/request pair.
+ * Flush {@link HttpCacheEntry}s invalidated by the given message exchange.
*
* @param host backend host
* @param request request message
@@ -72,7 +70,7 @@ public interface HttpCacheInvalidator {
*
* @since 5.0
*/
- void flushInvalidatedCacheEntries(
+ void flushCacheEntriesInvalidatedByExchange(
HttpHost host,
HttpRequest request,
HttpResponse response,
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb1cab46/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsyncCachingExec.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsyncCachingExec.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsyncCachingExec.java
index 59d6e07..6989bba 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsyncCachingExec.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsyncCachingExec.java
@@ -212,7 +212,7 @@ public class AsyncCachingExec extends CachingExecBase implements AsyncExecChainH
if (!cacheableRequestPolicy.isServableFromCache(request)) {
log.debug("Request is not servable from cache");
- future.setDependency(responseCache.flushInvalidatedCacheEntriesFor(target, request, new FutureCallback<Boolean>() {
+ future.setDependency(responseCache.flushCacheEntriesInvalidatedByRequest(target, request, new FutureCallback<Boolean>() {
@Override
public void completed(final Boolean result) {
@@ -438,7 +438,7 @@ public class AsyncCachingExec extends CachingExecBase implements AsyncExecChainH
final HttpResponse backendResponse,
final EntityDetails entityDetails) throws HttpException, IOException {
responseCompliance.ensureProtocolCompliance(scope.originalRequest, request, backendResponse);
- responseCache.flushInvalidatedCacheEntriesFor(target, request, backendResponse, new FutureCallback<Boolean>() {
+ responseCache.flushCacheEntriesInvalidatedByExchange(target, request, backendResponse, new FutureCallback<Boolean>() {
@Override
public void completed(final Boolean result) {
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb1cab46/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpAsyncCache.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpAsyncCache.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpAsyncCache.java
index 55337dc..199fb64 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpAsyncCache.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpAsyncCache.java
@@ -124,28 +124,28 @@ class BasicHttpAsyncCache implements HttpAsyncCache {
}
@Override
- public Cancellable flushInvalidatedCacheEntriesFor(
+ public Cancellable flushCacheEntriesInvalidatedByRequest(
+ final HttpHost host, final HttpRequest request, final FutureCallback<Boolean> callback) {
+ if (log.isDebugEnabled()) {
+ log.debug("Flush cache entries invalidated by request: " + host + "; " + new RequestLine(request));
+ }
+ return cacheInvalidator.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyGenerator, storage, callback);
+ }
+
+ @Override
+ public Cancellable flushCacheEntriesInvalidatedByExchange(
final HttpHost host, final HttpRequest request, final HttpResponse response, final FutureCallback<Boolean> callback) {
if (log.isDebugEnabled()) {
- log.debug("Flush cache entries: " + host + "; " + new RequestLine(request) + " " + new StatusLine(response));
+ log.debug("Flush cache entries invalidated by exchange: " + host + "; " + new RequestLine(request) + " -> " + new StatusLine(response));
}
if (!StandardMethods.isSafe(request.getMethod())) {
- return cacheInvalidator.flushInvalidatedCacheEntries(host, request, response, cacheKeyGenerator, storage, callback);
+ return cacheInvalidator.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyGenerator, storage, callback);
} else {
callback.completed(Boolean.TRUE);
return Operations.nonCancellable();
}
}
- @Override
- public Cancellable flushInvalidatedCacheEntriesFor(
- final HttpHost host, final HttpRequest request, final FutureCallback<Boolean> callback) {
- if (log.isDebugEnabled()) {
- log.debug("Flush invalidated cache entries: " + host + "; " + new RequestLine(request));
- }
- return cacheInvalidator.flushInvalidatedCacheEntries(host, request, cacheKeyGenerator, storage, callback);
- }
-
Cancellable storeInCache(
final String cacheKey,
final HttpHost host,
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb1cab46/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java
index 6c8463a..6d908fe 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpCache.java
@@ -106,21 +106,21 @@ class BasicHttpCache implements HttpCache {
}
@Override
- public void flushInvalidatedCacheEntriesFor(final HttpHost host, final HttpRequest request, final HttpResponse response) {
+ public void flushCacheEntriesInvalidatedByRequest(final HttpHost host, final HttpRequest request) {
if (log.isDebugEnabled()) {
- log.debug("Flush cache entries: " + host + "; " + new RequestLine(request) + " " + new StatusLine(response));
- }
- if (!StandardMethods.isSafe(request.getMethod())) {
- cacheInvalidator.flushInvalidatedCacheEntries(host, request, response, cacheKeyGenerator, storage);
+ log.debug("Flush cache entries invalidated by request: " + host + "; " + new RequestLine(request));
}
+ cacheInvalidator.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyGenerator, storage);
}
@Override
- public void flushInvalidatedCacheEntriesFor(final HttpHost host, final HttpRequest request) {
+ public void flushCacheEntriesInvalidatedByExchange(final HttpHost host, final HttpRequest request, final HttpResponse response) {
if (log.isDebugEnabled()) {
- log.debug("Flush invalidated cache entries: " + host + "; " + new RequestLine(request));
+ log.debug("Flush cache entries invalidated by exchange: " + host + "; " + new RequestLine(request) + " -> " + new StatusLine(response));
+ }
+ if (!StandardMethods.isSafe(request.getMethod())) {
+ cacheInvalidator.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyGenerator, storage);
}
- cacheInvalidator.flushInvalidatedCacheEntries(host, request, cacheKeyGenerator, storage);
}
void storeInCache(
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb1cab46/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheableRequestPolicy.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheableRequestPolicy.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheableRequestPolicy.java
index e1d0a69..d2278af 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheableRequestPolicy.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CacheableRequestPolicy.java
@@ -66,7 +66,9 @@ class CacheableRequestPolicy {
}
if (!method.equals(HeaderConstants.GET_METHOD) && !method.equals(HeaderConstants.HEAD_METHOD)) {
- log.debug(method + " request is not serveable from cache");
+ if (log.isDebugEnabled()) {
+ log.debug(method + " request is not serveable from cache");
+ }
return false;
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb1cab46/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExec.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExec.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExec.java
index 3b2491d..774c726 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExec.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExec.java
@@ -175,7 +175,7 @@ public class CachingExec extends CachingExecBase implements ExecChainHandler {
if (!cacheableRequestPolicy.isServableFromCache(request)) {
log.debug("Request is not servable from cache");
- responseCache.flushInvalidatedCacheEntriesFor(target, request);
+ responseCache.flushCacheEntriesInvalidatedByRequest(target, request);
return callBackend(target, request, scope, chain);
}
@@ -340,7 +340,7 @@ public class CachingExec extends CachingExecBase implements ExecChainHandler {
responseCompliance.ensureProtocolCompliance(scope.originalRequest, request, backendResponse);
- responseCache.flushInvalidatedCacheEntriesFor(target, request, backendResponse);
+ responseCache.flushCacheEntriesInvalidatedByExchange(target, request, backendResponse);
final boolean cacheable = responseCachingPolicy.isResponseCacheable(request, backendResponse);
if (cacheable) {
storeRequestIfModifiedSinceFor304Response(request, backendResponse);
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb1cab46/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultAsyncCacheInvalidator.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultAsyncCacheInvalidator.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultAsyncCacheInvalidator.java
index c815ce6..c9f7b22 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultAsyncCacheInvalidator.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultAsyncCacheInvalidator.java
@@ -93,7 +93,7 @@ public class DefaultAsyncCacheInvalidator extends CacheInvalidatorBase implement
}
@Override
- public Cancellable flushInvalidatedCacheEntries(
+ public Cancellable flushCacheEntriesInvalidatedByRequest(
final HttpHost host,
final HttpRequest request,
final Resolver<URI, String> cacheKeyResolver,
@@ -180,7 +180,7 @@ public class DefaultAsyncCacheInvalidator extends CacheInvalidatorBase implement
}
@Override
- public Cancellable flushInvalidatedCacheEntries(
+ public Cancellable flushCacheEntriesInvalidatedByExchange(
final HttpHost host,
final HttpRequest request,
final HttpResponse response,
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb1cab46/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultCacheInvalidator.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultCacheInvalidator.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultCacheInvalidator.java
index 76ac99e..2297e6f 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultCacheInvalidator.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/DefaultCacheInvalidator.java
@@ -80,7 +80,7 @@ public class DefaultCacheInvalidator extends CacheInvalidatorBase implements Htt
}
@Override
- public void flushInvalidatedCacheEntries(
+ public void flushCacheEntriesInvalidatedByRequest(
final HttpHost host,
final HttpRequest request,
final Resolver<URI, String> cacheKeyResolver,
@@ -149,7 +149,7 @@ public class DefaultCacheInvalidator extends CacheInvalidatorBase implements Htt
}
@Override
- public void flushInvalidatedCacheEntries(
+ public void flushCacheEntriesInvalidatedByExchange(
final HttpHost host,
final HttpRequest request,
final HttpResponse response,
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb1cab46/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/HttpAsyncCache.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/HttpAsyncCache.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/HttpAsyncCache.java
index a83cb63..8f1bd0e 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/HttpAsyncCache.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/HttpAsyncCache.java
@@ -51,15 +51,15 @@ interface HttpAsyncCache {
HttpHost host, HttpRequest request, FutureCallback<Boolean> callback);
/**
- * Clear invalidated matching {@link HttpCacheEntry}s
+ * Flush {@link HttpCacheEntry}s invalidated by the given request
*/
- Cancellable flushInvalidatedCacheEntriesFor(
+ Cancellable flushCacheEntriesInvalidatedByRequest(
HttpHost host, HttpRequest request, FutureCallback<Boolean> callback);
- /** Clear any entries that may be invalidated by the given response to
- * a particular request.
+ /**
+ * Flush {@link HttpCacheEntry}s invalidated by the given message exchange.
*/
- Cancellable flushInvalidatedCacheEntriesFor(
+ Cancellable flushCacheEntriesInvalidatedByExchange(
HttpHost host, HttpRequest request, HttpResponse response, FutureCallback<Boolean> callback);
/**
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb1cab46/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/HttpCache.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/HttpCache.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/HttpCache.java
index 756f6f3..8cb0e07 100644
--- a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/HttpCache.java
+++ b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/HttpCache.java
@@ -46,14 +46,14 @@ interface HttpCache {
void flushCacheEntriesFor(HttpHost host, HttpRequest request);
/**
- * Clear invalidated matching {@link HttpCacheEntry}s
+ * Flush {@link HttpCacheEntry}s invalidated by the given request
*/
- void flushInvalidatedCacheEntriesFor(HttpHost host, HttpRequest request);
+ void flushCacheEntriesInvalidatedByRequest(HttpHost host, HttpRequest request);
- /** Clear any entries that may be invalidated by the given response to
- * a particular request.
+ /**
+ * Flush {@link HttpCacheEntry}s invalidated by the given message exchange.
*/
- void flushInvalidatedCacheEntriesFor(HttpHost host, HttpRequest request, HttpResponse response);
+ void flushCacheEntriesInvalidatedByExchange(HttpHost host, HttpRequest request, HttpResponse response);
/**
* Retrieve matching {@link HttpCacheEntry} from the cache if it exists.
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb1cab46/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/AbstractProtocolTest.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/AbstractProtocolTest.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/AbstractProtocolTest.java
index 395c9a3..1d433fe 100644
--- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/AbstractProtocolTest.java
+++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/AbstractProtocolTest.java
@@ -161,10 +161,10 @@ public abstract class AbstractProtocolTest {
mockCache.flushCacheEntriesFor(EasyMock.isA(HttpHost.class), EasyMock.isA(HttpRequest.class));
EasyMock.expectLastCall().anyTimes();
- mockCache.flushInvalidatedCacheEntriesFor(EasyMock.isA(HttpHost.class), EasyMock.isA(HttpRequest.class));
+ mockCache.flushCacheEntriesInvalidatedByRequest(EasyMock.isA(HttpHost.class), EasyMock.isA(HttpRequest.class));
EasyMock.expectLastCall().anyTimes();
- mockCache.flushInvalidatedCacheEntriesFor(EasyMock.isA(HttpHost.class), EasyMock.isA(HttpRequest.class), EasyMock.isA(HttpResponse.class));
+ mockCache.flushCacheEntriesInvalidatedByExchange(EasyMock.isA(HttpHost.class), EasyMock.isA(HttpRequest.class), EasyMock.isA(HttpResponse.class));
EasyMock.expectLastCall().anyTimes();
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb1cab46/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestBasicHttpCache.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestBasicHttpCache.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestBasicHttpCache.java
index 1b21f59..9e3e892 100644
--- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestBasicHttpCache.java
+++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestBasicHttpCache.java
@@ -140,7 +140,7 @@ public class TestBasicHttpCache {
backing.map.put(key, entry);
- impl.flushInvalidatedCacheEntriesFor(host, req, resp);
+ impl.flushCacheEntriesInvalidatedByExchange(host, req, resp);
assertNull(backing.map.get(key));
}
@@ -161,7 +161,7 @@ public class TestBasicHttpCache {
backing.map.put(key, entry);
- impl.flushInvalidatedCacheEntriesFor(host, req, resp);
+ impl.flushCacheEntriesInvalidatedByExchange(host, req, resp);
assertEquals(entry, backing.map.get(key));
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb1cab46/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExec.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExec.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExec.java
index 2a8ad68..446512a 100644
--- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExec.java
+++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExec.java
@@ -419,9 +419,7 @@ public class TestCachingExec extends TestCachingExecChain {
}
private void cacheInvalidatorWasCalled() throws IOException {
- mockCache.flushInvalidatedCacheEntriesFor(
- (HttpHost)anyObject(),
- (HttpRequest)anyObject());
+ mockCache.flushCacheEntriesInvalidatedByRequest((HttpHost)anyObject(), (HttpRequest)anyObject());
}
private void getCurrentDateReturns(final Date date) {
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb1cab46/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExecChain.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExecChain.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExecChain.java
index 9784962..3237533 100644
--- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExecChain.java
+++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestCachingExecChain.java
@@ -1632,8 +1632,7 @@ public abstract class TestCachingExecChain {
}
private void cacheInvalidatorWasCalled() throws IOException {
- mockCache
- .flushInvalidatedCacheEntriesFor((HttpHost) anyObject(), (HttpRequest) anyObject());
+ mockCache.flushCacheEntriesInvalidatedByRequest((HttpHost) anyObject(), (HttpRequest) anyObject());
}
protected void cacheEntryValidatable(final boolean b) {
@@ -1685,8 +1684,8 @@ public abstract class TestCachingExecChain {
}
protected void doesNotFlushCache() throws IOException {
- mockCache.flushInvalidatedCacheEntriesFor(isA(HttpHost.class), isA(HttpRequest.class));
- EasyMock.expectLastCall().andThrow(new AssertionError("flushInvalidatedCacheEntriesFor should not have been called")).anyTimes();
+ mockCache.flushCacheEntriesInvalidatedByRequest(isA(HttpHost.class), isA(HttpRequest.class));
+ EasyMock.expectLastCall().andThrow(new AssertionError("flushCacheEntriesInvalidByResponse should not have been called")).anyTimes();
}
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb1cab46/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestDefaultAsyncCacheInvalidator.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestDefaultAsyncCacheInvalidator.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestDefaultAsyncCacheInvalidator.java
index d64018d..5845d36 100644
--- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestDefaultAsyncCacheInvalidator.java
+++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestDefaultAsyncCacheInvalidator.java
@@ -106,7 +106,7 @@ public class TestDefaultAsyncCacheInvalidator {
cacheEntryHasVariantMap(variantMap);
cacheReturnsEntryForUri(key, mockEntry);
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage, operationCallback);
verify(mockEntry).getVariantMap();
verify(mockStorage).getEntry(Mockito.eq(key), Mockito.<FutureCallback<HttpCacheEntry>>any());
@@ -127,7 +127,7 @@ public class TestDefaultAsyncCacheInvalidator {
cacheReturnsEntryForUri(key, mockEntry);
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage, operationCallback);
verify(mockEntry).getVariantMap();
verify(mockStorage).getEntry(Mockito.eq(key), Mockito.<FutureCallback<HttpCacheEntry>>any());
@@ -149,7 +149,7 @@ public class TestDefaultAsyncCacheInvalidator {
cacheReturnsEntryForUri(key, mockEntry);
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage, operationCallback);
verify(mockEntry).getVariantMap();
verify(mockStorage).getEntry(Mockito.eq(key), Mockito.<FutureCallback<HttpCacheEntry>>any());
@@ -171,7 +171,7 @@ public class TestDefaultAsyncCacheInvalidator {
cacheReturnsEntryForUri(key, mockEntry);
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage, operationCallback);
verify(mockEntry).getVariantMap();
verify(mockStorage).getEntry(Mockito.eq(key), Mockito.<FutureCallback<HttpCacheEntry>>any());
@@ -193,7 +193,7 @@ public class TestDefaultAsyncCacheInvalidator {
cacheReturnsEntryForUri(key, mockEntry);
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage, operationCallback);
verify(mockEntry).getVariantMap();
verify(mockStorage).getEntry(Mockito.eq(key), Mockito.<FutureCallback<HttpCacheEntry>>any());
@@ -203,7 +203,7 @@ public class TestDefaultAsyncCacheInvalidator {
@Test
public void testDoesNotInvalidateGETRequest() throws Exception {
final HttpRequest request = new BasicHttpRequest("GET","/");
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage, operationCallback);
verify(mockStorage).getEntry(Mockito.eq("http://foo.example.com:80/"), Mockito.<FutureCallback<HttpCacheEntry>>any());
verifyNoMoreInteractions(mockStorage);
@@ -212,7 +212,7 @@ public class TestDefaultAsyncCacheInvalidator {
@Test
public void testDoesNotInvalidateHEADRequest() throws Exception {
final HttpRequest request = new BasicHttpRequest("HEAD","/");
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage, operationCallback);
verify(mockStorage).getEntry(Mockito.eq("http://foo.example.com:80/"), Mockito.<FutureCallback<HttpCacheEntry>>any());
verifyNoMoreInteractions(mockStorage);
@@ -228,7 +228,7 @@ public class TestDefaultAsyncCacheInvalidator {
cacheEntryHasVariantMap(new HashMap<String, String>());
cacheReturnsEntryForUri(key, mockEntry);
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage, operationCallback);
verify(mockEntry).getRequestMethod();
verify(mockEntry).getVariantMap();
@@ -249,7 +249,7 @@ public class TestDefaultAsyncCacheInvalidator {
cacheEntryHasVariantMap(variants);
cacheReturnsEntryForUri(key, mockEntry);
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage, operationCallback);
verify(mockEntry).getRequestMethod();
verify(mockEntry).getVariantMap();
@@ -266,7 +266,7 @@ public class TestDefaultAsyncCacheInvalidator {
cacheReturnsEntryForUri(key, mockEntry);
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage, operationCallback);
verify(mockStorage).getEntry(Mockito.eq(key), Mockito.<FutureCallback<HttpCacheEntry>>any());
verifyNoMoreInteractions(mockStorage);
@@ -280,7 +280,7 @@ public class TestDefaultAsyncCacheInvalidator {
cacheReturnsEntryForUri(key, mockEntry);
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage, operationCallback);
verify(mockStorage).getEntry(Mockito.eq(key), Mockito.<FutureCallback<HttpCacheEntry>>any());
verifyNoMoreInteractions(mockStorage);
@@ -295,7 +295,7 @@ public class TestDefaultAsyncCacheInvalidator {
cacheEntryisForMethod("GET");
cacheReturnsEntryForUri(key, mockEntry);
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage, operationCallback);
verify(mockEntry).getRequestMethod();
verify(mockStorage).getEntry(Mockito.eq(key), Mockito.<FutureCallback<HttpCacheEntry>>any());
@@ -307,7 +307,7 @@ public class TestDefaultAsyncCacheInvalidator {
final HttpRequest request = new BasicHttpRequest("GET","/");
request.setHeader("Cache-Control","no-cache");
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage, operationCallback);
verify(mockStorage).getEntry(Mockito.eq("http://foo.example.com:80/"), Mockito.<FutureCallback<HttpCacheEntry>>any());
verifyNoMoreInteractions(mockStorage);
@@ -318,7 +318,7 @@ public class TestDefaultAsyncCacheInvalidator {
final HttpRequest request = new BasicHttpRequest("GET","/");
request.setHeader("Pragma","no-cache");
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage, operationCallback);
verify(mockStorage).getEntry(Mockito.eq("http://foo.example.com:80/"), Mockito.<FutureCallback<HttpCacheEntry>>any());
verifyNoMoreInteractions(mockStorage);
@@ -335,7 +335,7 @@ public class TestDefaultAsyncCacheInvalidator {
cacheReturnsEntryForUri(key, mockEntry);
cacheEntryHasVariantMap(mapOfURIs);
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage, operationCallback);
verify(mockStorage).getEntry(Mockito.eq(key), Mockito.<FutureCallback<HttpCacheEntry>>any());
verify(mockEntry).getVariantMap();
@@ -347,7 +347,7 @@ public class TestDefaultAsyncCacheInvalidator {
public void doesNotFlushForResponsesWithoutContentLocation() throws Exception {
final HttpRequest request = new BasicHttpRequest("POST","/");
final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
verifyNoMoreInteractions(mockStorage);
}
@@ -368,7 +368,7 @@ public class TestDefaultAsyncCacheInvalidator {
cacheReturnsEntryForUri(key, entry);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
verify(mockStorage).getEntry(Mockito.eq(key), Mockito.<FutureCallback<HttpCacheEntry>>any());
verify(mockStorage).removeEntry(Mockito.eq(key), Mockito.<FutureCallback<Boolean>>any());
@@ -390,7 +390,7 @@ public class TestDefaultAsyncCacheInvalidator {
cacheReturnsEntryForUri(key, entry);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
verify(mockStorage).getEntry(Mockito.eq(key), Mockito.<FutureCallback<HttpCacheEntry>>any());
verify(mockStorage).removeEntry(Mockito.eq(key), Mockito.<FutureCallback<Boolean>>any());
@@ -405,7 +405,7 @@ public class TestDefaultAsyncCacheInvalidator {
final String key = "http://foo.example.com:80/bar";
response.setHeader("Content-Location", key);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
verifyNoMoreInteractions(mockStorage);
}
@@ -426,7 +426,7 @@ public class TestDefaultAsyncCacheInvalidator {
cacheReturnsEntryForUri(key, entry);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
verify(mockStorage).getEntry(Mockito.eq(key), Mockito.<FutureCallback<HttpCacheEntry>>any());
verify(mockStorage).removeEntry(Mockito.eq(key), Mockito.<FutureCallback<Boolean>>any());
@@ -448,7 +448,7 @@ public class TestDefaultAsyncCacheInvalidator {
cacheReturnsEntryForUri(key, entry);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
verify(mockStorage).getEntry(Mockito.eq(key), Mockito.<FutureCallback<HttpCacheEntry>>any());
verify(mockStorage).removeEntry(Mockito.eq(key), Mockito.<FutureCallback<Boolean>>any());
@@ -470,7 +470,7 @@ public class TestDefaultAsyncCacheInvalidator {
cacheReturnsEntryForUri(key, entry);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
verifyNoMoreInteractions(mockStorage);
}
@@ -490,7 +490,7 @@ public class TestDefaultAsyncCacheInvalidator {
});
cacheReturnsEntryForUri(key, entry);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
verify(mockStorage).getEntry(Mockito.eq(key), Mockito.<FutureCallback<HttpCacheEntry>>any());
verifyNoMoreInteractions(mockStorage);
@@ -512,7 +512,7 @@ public class TestDefaultAsyncCacheInvalidator {
cacheReturnsEntryForUri(key, entry);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
verify(mockStorage).getEntry(Mockito.eq(key), Mockito.<FutureCallback<HttpCacheEntry>>any());
verifyNoMoreInteractions(mockStorage);
@@ -529,7 +529,7 @@ public class TestDefaultAsyncCacheInvalidator {
cacheReturnsEntryForUri(key, null);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
verify(mockStorage).getEntry(Mockito.eq(key), Mockito.<FutureCallback<HttpCacheEntry>>any());
verifyNoMoreInteractions(mockStorage);
@@ -551,7 +551,7 @@ public class TestDefaultAsyncCacheInvalidator {
cacheReturnsEntryForUri(key, entry);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
verify(mockStorage).getEntry(Mockito.eq(key), Mockito.<FutureCallback<HttpCacheEntry>>any());
verifyNoMoreInteractions(mockStorage);
@@ -572,7 +572,7 @@ public class TestDefaultAsyncCacheInvalidator {
cacheReturnsEntryForUri(key, entry);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
verify(mockStorage).getEntry(Mockito.eq(key), Mockito.<FutureCallback<HttpCacheEntry>>any());
verifyNoMoreInteractions(mockStorage);
@@ -594,7 +594,7 @@ public class TestDefaultAsyncCacheInvalidator {
cacheReturnsEntryForUri(key, entry);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
verify(mockStorage).getEntry(Mockito.eq(key), Mockito.<FutureCallback<HttpCacheEntry>>any());
verify(mockStorage).removeEntry(Mockito.eq(key), Mockito.<FutureCallback<Boolean>>any());
@@ -616,7 +616,7 @@ public class TestDefaultAsyncCacheInvalidator {
cacheReturnsEntryForUri(key, entry);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
verify(mockStorage).getEntry(Mockito.eq(key), Mockito.<FutureCallback<HttpCacheEntry>>any());
verify(mockStorage).removeEntry(Mockito.eq(key), Mockito.<FutureCallback<Boolean>>any());
@@ -639,7 +639,7 @@ public class TestDefaultAsyncCacheInvalidator {
cacheReturnsEntryForUri(key, entry);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
verify(mockStorage).getEntry(Mockito.eq(key), Mockito.<FutureCallback<HttpCacheEntry>>any());
verify(mockStorage).removeEntry(Mockito.eq(key), Mockito.<FutureCallback<Boolean>>any());
@@ -662,7 +662,7 @@ public class TestDefaultAsyncCacheInvalidator {
cacheReturnsEntryForUri(key, entry);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage, operationCallback);
verify(mockStorage).getEntry(Mockito.eq(key), Mockito.<FutureCallback<HttpCacheEntry>>any());
verify(mockStorage).removeEntry(Mockito.eq(key), Mockito.<FutureCallback<Boolean>>any());
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb1cab46/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestDefaultCacheInvalidator.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestDefaultCacheInvalidator.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestDefaultCacheInvalidator.java
index 31f9af2..45ea326 100644
--- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestDefaultCacheInvalidator.java
+++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestDefaultCacheInvalidator.java
@@ -38,7 +38,6 @@ import java.util.Map;
import org.apache.hc.client5.http.cache.HttpCacheEntry;
import org.apache.hc.client5.http.cache.HttpCacheStorage;
-import org.apache.hc.client5.http.cache.ResourceIOException;
import org.apache.hc.client5.http.utils.DateUtils;
import org.apache.hc.core5.function.Resolver;
import org.apache.hc.core5.http.Header;
@@ -102,7 +101,7 @@ public class TestDefaultCacheInvalidator {
cacheReturnsEntryForUri(key);
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage);
verify(mockEntry).getVariantMap();
verify(mockStorage).getEntry(key);
@@ -123,7 +122,7 @@ public class TestDefaultCacheInvalidator {
cacheReturnsEntryForUri(key);
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage);
verify(mockEntry).getVariantMap();
verify(mockStorage).getEntry(key);
@@ -145,7 +144,7 @@ public class TestDefaultCacheInvalidator {
cacheReturnsEntryForUri(key);
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage);
verify(mockEntry).getVariantMap();
verify(mockStorage).getEntry(key);
@@ -167,7 +166,7 @@ public class TestDefaultCacheInvalidator {
cacheReturnsEntryForUri(key);
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage);
verify(mockEntry).getVariantMap();
verify(mockStorage).getEntry(key);
@@ -189,7 +188,7 @@ public class TestDefaultCacheInvalidator {
cacheReturnsEntryForUri(key);
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage);
verify(mockEntry).getVariantMap();
verify(mockStorage).getEntry(key);
@@ -199,7 +198,7 @@ public class TestDefaultCacheInvalidator {
@Test
public void testDoesNotInvalidateGETRequest() throws Exception {
final HttpRequest request = new BasicHttpRequest("GET","/");
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage);
verify(mockStorage).getEntry("http://foo.example.com:80/");
verifyNoMoreInteractions(mockStorage);
@@ -208,7 +207,7 @@ public class TestDefaultCacheInvalidator {
@Test
public void testDoesNotInvalidateHEADRequest() throws Exception {
final HttpRequest request = new BasicHttpRequest("HEAD","/");
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage);
verify(mockStorage).getEntry("http://foo.example.com:80/");
verifyNoMoreInteractions(mockStorage);
@@ -224,7 +223,7 @@ public class TestDefaultCacheInvalidator {
cacheEntryHasVariantMap(new HashMap<String, String>());
cacheReturnsEntryForUri(key);
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage);
verify(mockEntry).getRequestMethod();
verify(mockEntry).getVariantMap();
@@ -245,7 +244,7 @@ public class TestDefaultCacheInvalidator {
cacheEntryHasVariantMap(variants);
cacheReturnsEntryForUri(key);
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage);
verify(mockEntry).getRequestMethod();
verify(mockEntry).getVariantMap();
@@ -262,7 +261,7 @@ public class TestDefaultCacheInvalidator {
cacheReturnsEntryForUri(key);
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage);
verify(mockStorage).getEntry(key);
verifyNoMoreInteractions(mockStorage);
@@ -276,7 +275,7 @@ public class TestDefaultCacheInvalidator {
cacheReturnsEntryForUri(key);
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage);
verify(mockStorage).getEntry(key);
verifyNoMoreInteractions(mockStorage);
@@ -291,7 +290,7 @@ public class TestDefaultCacheInvalidator {
cacheEntryisForMethod("GET");
cacheReturnsEntryForUri(key);
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage);
verify(mockEntry).getRequestMethod();
verify(mockStorage).getEntry(key);
@@ -303,7 +302,7 @@ public class TestDefaultCacheInvalidator {
final HttpRequest request = new BasicHttpRequest("GET","/");
request.setHeader("Cache-Control","no-cache");
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage);
verify(mockStorage).getEntry("http://foo.example.com:80/");
verifyNoMoreInteractions(mockStorage);
@@ -314,7 +313,7 @@ public class TestDefaultCacheInvalidator {
final HttpRequest request = new BasicHttpRequest("GET","/");
request.setHeader("Pragma","no-cache");
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage);
verify(mockStorage).getEntry("http://foo.example.com:80/");
verifyNoMoreInteractions(mockStorage);
@@ -331,7 +330,7 @@ public class TestDefaultCacheInvalidator {
cacheReturnsEntryForUri(key);
cacheEntryHasVariantMap(mapOfURIs);
- impl.flushInvalidatedCacheEntries(host, request, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByRequest(host, request, cacheKeyResolver, mockStorage);
verify(mockStorage).getEntry(key);
verify(mockEntry).getVariantMap();
@@ -343,7 +342,7 @@ public class TestDefaultCacheInvalidator {
public void doesNotFlushForResponsesWithoutContentLocation() throws Exception {
final HttpRequest request = new BasicHttpRequest("POST","/");
final HttpResponse response = new BasicHttpResponse(HttpStatus.SC_OK);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage);
verifyNoMoreInteractions(mockStorage);
}
@@ -364,7 +363,7 @@ public class TestDefaultCacheInvalidator {
when(mockStorage.getEntry(key)).thenReturn(entry);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage);
verify(mockStorage).getEntry(key);
verify(mockStorage).removeEntry(key);
@@ -386,7 +385,7 @@ public class TestDefaultCacheInvalidator {
when(mockStorage.getEntry(key)).thenReturn(entry);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage);
verify(mockStorage).getEntry(key);
verify(mockStorage).removeEntry(key);
@@ -401,7 +400,7 @@ public class TestDefaultCacheInvalidator {
final String key = "http://foo.example.com:80/bar";
response.setHeader("Content-Location", key);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage);
verifyNoMoreInteractions(mockStorage);
}
@@ -422,7 +421,7 @@ public class TestDefaultCacheInvalidator {
when(mockStorage.getEntry(cacheKey)).thenReturn(entry);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage);
verify(mockStorage).getEntry(cacheKey);
verify(mockStorage).removeEntry(cacheKey);
@@ -444,7 +443,7 @@ public class TestDefaultCacheInvalidator {
when(mockStorage.getEntry(cacheKey)).thenReturn(entry);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage);
verify(mockStorage).getEntry(cacheKey);
verify(mockStorage).removeEntry(cacheKey);
@@ -459,7 +458,7 @@ public class TestDefaultCacheInvalidator {
final String cacheKey = "http://baz.example.com:80/bar";
response.setHeader("Content-Location", cacheKey);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage);
verifyNoMoreInteractions(mockStorage);
}
@@ -479,7 +478,7 @@ public class TestDefaultCacheInvalidator {
});
when(mockStorage.getEntry(key)).thenReturn(entry);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage);
verify(mockStorage).getEntry(key);
verifyNoMoreInteractions(mockStorage);
@@ -501,7 +500,7 @@ public class TestDefaultCacheInvalidator {
when(mockStorage.getEntry(key)).thenReturn(entry);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage);
verify(mockStorage).getEntry(key);
verifyNoMoreInteractions(mockStorage);
@@ -518,7 +517,7 @@ public class TestDefaultCacheInvalidator {
when(mockStorage.getEntry(key)).thenReturn(null);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage);
verify(mockStorage).getEntry(key);
verifyNoMoreInteractions(mockStorage);
@@ -540,7 +539,7 @@ public class TestDefaultCacheInvalidator {
when(mockStorage.getEntry(key)).thenReturn(entry);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage);
verify(mockStorage).getEntry(key);
verifyNoMoreInteractions(mockStorage);
@@ -561,7 +560,7 @@ public class TestDefaultCacheInvalidator {
when(mockStorage.getEntry(key)).thenReturn(entry);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage);
verify(mockStorage).getEntry(key);
verifyNoMoreInteractions(mockStorage);
@@ -583,7 +582,7 @@ public class TestDefaultCacheInvalidator {
when(mockStorage.getEntry(key)).thenReturn(entry);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage);
verify(mockStorage).getEntry(key);
verify(mockStorage).removeEntry(key);
@@ -605,7 +604,7 @@ public class TestDefaultCacheInvalidator {
when(mockStorage.getEntry(key)).thenReturn(entry);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage);
verify(mockStorage).getEntry(key);
verify(mockStorage).removeEntry(key);
@@ -628,7 +627,7 @@ public class TestDefaultCacheInvalidator {
when(mockStorage.getEntry(key)).thenReturn(entry);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage);
verify(mockStorage).getEntry(key);
verify(mockStorage).removeEntry(key);
@@ -651,7 +650,7 @@ public class TestDefaultCacheInvalidator {
when(mockStorage.getEntry(key)).thenReturn(entry);
- impl.flushInvalidatedCacheEntries(host, request, response, cacheKeyResolver, mockStorage);
+ impl.flushCacheEntriesInvalidatedByExchange(host, request, response, cacheKeyResolver, mockStorage);
verify(mockStorage).getEntry(key);
verify(mockStorage).removeEntry(key);
@@ -668,11 +667,6 @@ public class TestDefaultCacheInvalidator {
when(mockStorage.getEntry(key)).thenReturn(mockEntry);
}
- private void cacheReturnsExceptionForUri(final String key) throws IOException {
- when(mockStorage.getEntry(key)).thenThrow(
- new ResourceIOException("TOTAL FAIL"));
- }
-
private void cacheEntryisForMethod(final String httpMethod) {
when(mockEntry.getRequestMethod()).thenReturn(httpMethod);
}
http://git-wip-us.apache.org/repos/asf/httpcomponents-client/blob/eb1cab46/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java
----------------------------------------------------------------------
diff --git a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java
index ede78e7..2fe25fa 100644
--- a/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java
+++ b/httpclient5-cache/src/test/java/org/apache/hc/client5/http/impl/cache/TestProtocolRequirements.java
@@ -2535,7 +2535,7 @@ public class TestProtocolRequirements extends AbstractProtocolTest {
final Capture<ClassicHttpRequest> cap = new Capture<>();
- mockCache.flushInvalidatedCacheEntriesFor(
+ mockCache.flushCacheEntriesInvalidatedByExchange(
EasyMock.isA(HttpHost.class),
EasyMock.isA(ClassicHttpRequest.class),
EasyMock.isA(ClassicHttpResponse.class));