HttpClientContext to use instance variables for standard attributes

Author: ok2c

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

@@ -68,7 +68,7 @@ public static HttpCacheContext adapt(final HttpContext context) {
     }
 
     public static HttpCacheContext create() {
-        return new HttpCacheContext(new HttpClientContext());
+        return new HttpCacheContext();
     }
 
     public HttpCacheContext(final HttpContext context) {

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

@@ -804,7 +804,7 @@ private void handleCacheHit(
                                 scope.route,
                                 scope.originalRequest,
                                 new ComplexFuture<>(null),
-                                HttpClientContext.create(),
+                                HttpCacheContext.create(),
                                 scope.execRuntime.fork(),
                                 scope.scheduler,
                                 scope.execCount);

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

@@ -318,7 +318,7 @@ private ClassicHttpResponse handleCacheHit(
                             scope.route,
                             scope.originalRequest,
                             scope.execRuntime.fork(null),
-                            HttpClientContext.create());
+                            HttpCacheContext.create());
                     if (LOG.isDebugEnabled()) {
                         LOG.debug("{} starting asynchronous revalidation exchange {}", exchangeId, revalidationExchangeId);
                     }

httpclient5-fluent/src/main/java/org/apache/hc/client5/http/fluent/Executor.java

@@ -232,14 +232,14 @@ public Response execute(
         final HttpClientContext localContext = HttpClientContext.create();
         final CredentialsStore credentialsStoreSnapshot = credentialsStore;
         if (credentialsStoreSnapshot != null) {
-            localContext.setAttribute(HttpClientContext.CREDS_PROVIDER, credentialsStoreSnapshot);
+            localContext.setCredentialsProvider(credentialsStoreSnapshot);
         }
         if (this.authCache != null) {
-            localContext.setAttribute(HttpClientContext.AUTH_CACHE, this.authCache);
+            localContext.setAuthCache(this.authCache);
         }
         final CookieStore cookieStoreSnapshot = cookieStore;
         if (cookieStoreSnapshot != null) {
-            localContext.setAttribute(HttpClientContext.COOKIE_STORE, cookieStoreSnapshot);
+            localContext.setCookieStore(cookieStoreSnapshot);
         }
         return new Response(request.internalExecute(this.httpclient, localContext));
     }

httpclient5/src/main/java/org/apache/hc/client5/http/ContextBuilder.java

@@ -102,7 +102,7 @@ public ContextBuilder preemptiveBasicAuth(final HttpHost host, final UsernamePas
 
     @Override
     protected HttpClientContext createContext() {
-        return new HttpClientContext();
+        return HttpClientContext.create();
     }
 
 }

httpclient5/src/main/java/org/apache/hc/client5/http/async/AsyncExecChain.java

@@ -81,7 +81,7 @@ public Scope(
             this.route = Args.notNull(route, "Route");
             this.originalRequest = Args.notNull(originalRequest, "Original request");
             this.cancellableDependency = Args.notNull(cancellableDependency, "Dependency");
-            this.clientContext = clientContext != null ? clientContext : HttpClientContext.create();
+            this.clientContext = Args.notNull(clientContext, "HTTP context");
             this.execRuntime = Args.notNull(execRuntime, "Exec runtime");
             this.scheduler = scheduler;
             this.execCount = execCount != null ? execCount : new AtomicInteger(1);

httpclient5/src/main/java/org/apache/hc/client5/http/classic/ExecChain.java

@@ -59,7 +59,7 @@ public Scope(final String exchangeId, final HttpRoute route, final ClassicHttpRe
             this.route = Args.notNull(route, "Route");
             this.originalRequest = Args.notNull(originalRequest, "Original request");
             this.execRuntime = Args.notNull(execRuntime, "Exec runtime");
-            this.clientContext = clientContext != null ? clientContext : HttpClientContext.create();
+            this.clientContext = Args.notNull(clientContext, "HTTP context");
         }
 
     }

httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultAuthenticationStrategy.java

@@ -77,7 +77,7 @@ public List<AuthScheme> select(
         Args.notNull(challengeType, "ChallengeType");
         Args.notNull(challenges, "Map of auth challenges");
         Args.notNull(context, "HTTP context");
-        final HttpClientContext clientContext = HttpClientContext.adapt(context);
+        final HttpClientContext clientContext = HttpClientContext.cast(context);
         final String exchangeId = clientContext.getExchangeId();
 
         final List<AuthScheme> options = new ArrayList<>();
@@ -88,7 +88,7 @@ public List<AuthScheme> select(
             }
             return options;
         }
-        final RequestConfig config = clientContext.getRequestConfig();
+        final RequestConfig config = clientContext.getRequestConfigOrDefault();
         Collection<String> authPrefs = challengeType == ChallengeType.TARGET ?
                 config.getTargetPreferredAuthSchemes() : config.getProxyPreferredAuthSchemes();
         if (authPrefs == null) {

httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultConnectionKeepAliveStrategy.java

@@ -71,8 +71,8 @@ public TimeValue getKeepAliveDuration(final HttpResponse response, final HttpCon
                 }
             }
         }
-        final HttpClientContext clientContext = HttpClientContext.adapt(context);
-        final RequestConfig requestConfig = clientContext.getRequestConfig();
+        final HttpClientContext clientContext = HttpClientContext.cast(context);
+        final RequestConfig requestConfig = clientContext.getRequestConfigOrDefault();
         return requestConfig.getConnectionKeepAlive();
     }
 

httpclient5/src/main/java/org/apache/hc/client5/http/impl/DefaultUserTokenHandler.java

@@ -69,7 +69,7 @@ public Object getUserToken(final HttpRoute route, final HttpContext context) {
     @Override
     public Object getUserToken(final HttpRoute route, final HttpRequest request, final HttpContext context) {
 
-        final HttpClientContext clientContext = HttpClientContext.adapt(context);
+        final HttpClientContext clientContext = HttpClientContext.cast(context);
 
         final HttpHost target = request != null ? new HttpHost(request.getScheme(), request.getAuthority()) : route.getTargetHost();