HTTP cache protocol interceptors to use SimpleHttpRequest internally for cache operations; the use of self-contained request object should help simplify handling of requests with an enclosed entity such as QUERY

Author: ok2c

httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/AsyncCachingExec.java

@@ -36,6 +36,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import org.apache.hc.client5.http.async.methods.SimpleHttpRequest;
 import org.apache.hc.client5.http.cache.HttpAsyncCacheStorage;
 import org.apache.hc.client5.http.cache.HttpCacheCASOperation;
 import org.apache.hc.client5.http.cache.HttpCacheEntry;
@@ -53,7 +54,6 @@
 import org.apache.hc.core5.concurrent.FutureCallback;
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.HttpStatus;
 import org.apache.hc.core5.http.Method;
@@ -93,7 +93,7 @@ public BasicHttpAsyncCache(final ResourceFactory resourceFactory, final HttpAsyn
     }
 
     @Override
-    public Cancellable match(final HttpHost host, final HttpRequest request, final FutureCallback<CacheMatch> callback) {
+    public Cancellable match(final HttpHost host, final SimpleHttpRequest request, final FutureCallback<CacheMatch> callback) {
         final String rootKey = cacheKeyGenerator.generateKey(host, request);
         if (LOG.isDebugEnabled()) {
             LOG.debug("Get cache entry: {}", rootKey);
@@ -384,7 +384,7 @@ public void completed(final Boolean result) {
     @Override
     public Cancellable store(
             final HttpHost host,
-            final HttpRequest request,
+            final SimpleHttpRequest request,
             final HttpResponse originResponse,
             final ByteArrayBuffer content,
             final Instant requestSent,
@@ -424,7 +424,7 @@ public Cancellable store(
     public Cancellable update(
             final CacheHit stale,
             final HttpHost host,
-            final HttpRequest request,
+            final SimpleHttpRequest request,
             final HttpResponse originResponse,
             final Instant requestSent,
             final Instant responseReceived,
@@ -447,7 +447,7 @@ public Cancellable update(
     public Cancellable storeFromNegotiated(
             final CacheHit negotiated,
             final HttpHost host,
-            final HttpRequest request,
+            final SimpleHttpRequest request,
             final HttpResponse originResponse,
             final Instant requestSent,
             final Instant responseReceived,
@@ -543,7 +543,7 @@ public void cancelled() {
 
     @Override
     public Cancellable evictInvalidatedEntries(
-            final HttpHost host, final HttpRequest request, final HttpResponse response, final FutureCallback<Boolean> callback) {
+            final HttpHost host, final SimpleHttpRequest request, final HttpResponse response, final FutureCallback<Boolean> callback) {
         if (LOG.isDebugEnabled()) {
             LOG.debug("Flush cache entries invalidated by exchange: {}; {} {} -> {}",
                     host, request.getMethod(), request.getRequestUri(), response.getCode());

httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/BasicHttpAsyncCache.java

@@ -34,6 +34,7 @@
 import java.util.List;
 import java.util.Set;
 
+import org.apache.hc.client5.http.async.methods.SimpleHttpRequest;
 import org.apache.hc.client5.http.cache.HttpCacheCASOperation;
 import org.apache.hc.client5.http.cache.HttpCacheEntry;
 import org.apache.hc.client5.http.cache.HttpCacheEntryFactory;
@@ -46,7 +47,6 @@
 import org.apache.hc.client5.http.validator.ValidatorType;
 import org.apache.hc.core5.http.HttpHeaders;
 import org.apache.hc.core5.http.HttpHost;
-import org.apache.hc.core5.http.HttpRequest;
 import org.apache.hc.core5.http.HttpResponse;
 import org.apache.hc.core5.http.HttpStatus;
 import org.apache.hc.core5.http.Method;
@@ -139,7 +139,7 @@ private void removeInternal(final String cacheKey) {
     }
 
     @Override
-    public CacheMatch match(final HttpHost host, final HttpRequest request) {
+    public CacheMatch match(final HttpHost host, final SimpleHttpRequest request) {
         final String rootKey = cacheKeyGenerator.generateKey(host, request);
         if (LOG.isDebugEnabled()) {
             LOG.debug("Get cache root entry: {}", rootKey);
@@ -218,7 +218,7 @@ CacheHit store(final String rootKey, final String variantKey, final HttpCacheEnt
     @Override
     public CacheHit store(
             final HttpHost host,
-            final HttpRequest request,
+            final SimpleHttpRequest request,
             final HttpResponse originResponse,
             final ByteArrayBuffer content,
             final Instant requestSent,
@@ -256,7 +256,7 @@ public CacheHit store(
     public CacheHit update(
             final CacheHit stale,
             final HttpHost host,
-            final HttpRequest request,
+            final SimpleHttpRequest request,
             final HttpResponse originResponse,
             final Instant requestSent,
             final Instant responseReceived) {
@@ -278,7 +278,7 @@ public CacheHit update(
     public CacheHit storeFromNegotiated(
             final CacheHit negotiated,
             final HttpHost host,
-            final HttpRequest request,
+            final SimpleHttpRequest request,
             final HttpResponse originResponse,
             final Instant requestSent,
             final Instant responseReceived) {
@@ -339,7 +339,7 @@ private void evict(final String rootKey, final HttpResponse response) {
     }
 
     @Override
-    public void evictInvalidatedEntries(final HttpHost host, final HttpRequest request, final HttpResponse response) {
+    public void evictInvalidatedEntries(final HttpHost host, final SimpleHttpRequest request, final HttpResponse response) {
         if (LOG.isDebugEnabled()) {
             LOG.debug("Evict cache entries invalidated by exchange: {}; {} {} -> {}",
                     host, request.getMethod(), request.getRequestUri(), response.getCode());