Removed unused method argument

apache · Aug 21, 2023 · 6bdd389 · 6bdd389
1 parent 06700d0
commit 6bdd389
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
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
@@ -606,7 +606,7 @@ private void handleCacheHit(
             }
             LOG.debug("Cache hit");
             try {
-                final SimpleHttpResponse cacheResponse = generateCachedResponse(responseCacheControl, hit.entry, request, context);
+                final SimpleHttpResponse cacheResponse = generateCachedResponse(hit.entry, request, context);
                 triggerResponse(cacheResponse, scope, asyncExecCallback);
             } catch (final ResourceIOException ex) {
                 recordCacheFailure(target, request);
@@ -634,7 +634,7 @@ private void handleCacheHit(
                     && (validityPolicy.mayReturnStaleWhileRevalidating(responseCacheControl, hit.entry, now) || staleIfErrorEnabled)) {
                 LOG.debug("Serving stale with asynchronous revalidation");
                 try {
-                    final SimpleHttpResponse cacheResponse = generateCachedResponse(responseCacheControl, hit.entry, request, context);
+                    final SimpleHttpResponse cacheResponse = generateCachedResponse(hit.entry, request, context);
                     final String exchangeId = ExecSupport.getNextExchangeId();
                     context.setExchangeId(exchangeId);
                     final AsyncExecChain.Scope fork = new AsyncExecChain.Scope(
@@ -658,7 +658,7 @@ private void handleCacheHit(
                             LOG.debug("Serving stale response due to IOException and stale-if-error enabled");
                         }
                         try {
-                            final SimpleHttpResponse cacheResponse = generateCachedResponse(responseCacheControl, hit.entry, request, context);
+                            final SimpleHttpResponse cacheResponse = generateCachedResponse(hit.entry, request, context);
                             triggerResponse(cacheResponse, scope, asyncExecCallback);
                         } catch (final ResourceIOException ex2) {
                             if (LOG.isDebugEnabled()) {

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
@@ -256,7 +256,7 @@ private ClassicHttpResponse handleCacheHit(
             }
             LOG.debug("Cache hit");
             try {
-                return convert(generateCachedResponse(responseCacheControl, hit.entry, request, context), scope);
+                return convert(generateCachedResponse(hit.entry, request, context), scope);
             } catch (final ResourceIOException ex) {
                 recordCacheFailure(target, request);
                 if (!mayCallBackend(requestCacheControl)) {
@@ -284,7 +284,7 @@ private ClassicHttpResponse handleCacheHit(
                             scope.originalRequest,
                             scope.execRuntime.fork(null),
                             HttpClientContext.create());
-                    final SimpleHttpResponse response = generateCachedResponse(responseCacheControl, hit.entry, request, context);
+                    final SimpleHttpResponse response = generateCachedResponse(hit.entry, request, context);
                     cacheRevalidator.revalidateCacheEntry(
                             hit.getEntryKey(),
                             () -> revalidateCacheEntry(requestCacheControl, responseCacheControl, hit, target, request, fork, chain));
@@ -296,7 +296,7 @@ private ClassicHttpResponse handleCacheHit(
                     if (LOG.isDebugEnabled()) {
                         LOG.debug("Serving stale response due to IOException and stale-if-error enabled");
                     }
-                    return convert(generateCachedResponse(responseCacheControl, hit.entry, request, context), scope);
+                    return convert(generateCachedResponse(hit.entry, request, context), scope);
                 }
                 return convert(handleRevalidationFailure(requestCacheControl, responseCacheControl, hit.entry, request, context, now), scope);
             }

diff --git a/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExecBase.java b/httpclient5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingExecBase.java
@@ -157,7 +157,6 @@ void recordCacheUpdate(final HttpContext context) {
     }
 
     SimpleHttpResponse generateCachedResponse(
-            final ResponseCacheControl responseCacheControl,
             final HttpCacheEntry entry,
             final HttpRequest request,
             final HttpContext context) throws ResourceIOException {

diff --git a/...5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpClientBuilder.java b/...5-cache/src/main/java/org/apache/hc/client5/http/impl/cache/CachingHttpClientBuilder.java
@@ -95,7 +95,7 @@ public final CachingHttpClientBuilder setCacheConfig(final CacheConfig cacheConf
      * @deprecated Do not use.
      */
     @Deprecated
-    public final CachingHttpClientBuilder setHttpCacheInvalidator(final org.apache.hc.client5.http.cache.HttpAsyncCacheInvalidator cacheInvalidator) {
+    public final CachingHttpClientBuilder setHttpCacheInvalidator(final org.apache.hc.client5.http.cache.HttpCacheInvalidator cacheInvalidator) {
         return this;
     }