Fix minor details around programmatic authentication

olim7t · olim7t · commit 67f650040872 · 2019-08-12T15:30:56.000-07:00
diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/session/SessionBuilder.java b/core/src/main/java/com/datastax/oss/driver/api/core/session/SessionBuilder.java
@@ -208,7 +208,7 @@ public SelfT withSchemaChangeListener(@Nullable SchemaChangeListener schemaChang
   }
 
   /**
-   * Register a request tracker to use with the session.
+   * Registers a request tracker to use with the session.
    *
    * <p>If the tracker is specified programmatically with this method, it overrides the
    * configuration (that is, the {@code request.tracker.class} option will be ignored).
@@ -220,7 +220,7 @@ public SelfT withRequestTracker(@Nullable RequestTracker requestTracker) {
   }
 
   /**
-   * Register an authentication provider to use with the session.
+   * Registers an authentication provider to use with the session.
    *
    * <p>If the provider is specified programmatically with this method, it overrides the
    * configuration (that is, the {@code advanced.auth-provider.class} option will be ignored).
diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/context/DefaultDriverContext.java b/core/src/main/java/com/datastax/oss/driver/internal/core/context/DefaultDriverContext.java
@@ -193,7 +193,6 @@ public class DefaultDriverContext implements InternalDriverContext {
   private final NodeStateListener nodeStateListenerFromBuilder;
   private final SchemaChangeListener schemaChangeListenerFromBuilder;
   private final RequestTracker requestTrackerFromBuilder;
-  private final AuthProvider authProviderFromBuilder;
   private final Map<String, String> localDatacentersFromBuilder;
   private final Map<String, Predicate<Node>> nodeFiltersFromBuilder;
   private final ClassLoader classLoader;
@@ -226,11 +225,12 @@ public DefaultDriverContext(
             () -> buildSchemaChangeListener(schemaChangeListenerFromBuilder),
             cycleDetector);
     this.requestTrackerFromBuilder = programmaticArguments.getRequestTracker();
-    this.authProviderFromBuilder = programmaticArguments.getAuthProvider();
 
     this.authProviderRef =
         new LazyReference<>(
-            "authProvider", () -> buildAuthProvider(authProviderFromBuilder), cycleDetector);
+            "authProvider",
+            () -> buildAuthProvider(programmaticArguments.getAuthProvider()),
+            cycleDetector);
     this.requestTrackerRef =
         new LazyReference<>(
             "requestTracker", () -> buildRequestTracker(requestTrackerFromBuilder), cycleDetector);
diff --git a/core/src/main/resources/reference.conf b/core/src/main/resources/reference.conf
@@ -382,6 +382,9 @@ datastax-java-driver {
   # Required: no. If the 'class' child option is absent, no authentication will occur.
   # Modifiable at runtime: no
   # Overridable in a profile: no
+  #
+  # Note that the contents of this section can be overridden programmatically with
+  # SessionBuilder.withAuthProvider or SessionBuilder.withAuthCredentials.
   advanced.auth-provider {
     # The class of the provider. If it is not qualified, the driver assumes that it resides in the
     # package com.datastax.oss.driver.internal.core.auth.

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ public SelfT withSchemaChangeListener(@Nullable SchemaChangeListener schemaChang`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`/**`
`211`		`- * Register a request tracker to use with the session.`
	`211`	`+ * Registers a request tracker to use with the session.`
`212`	`212`	`*`
`213`	`213`	`* <p>If the tracker is specified programmatically with this method, it overrides the`
`214`	`214`	`* configuration (that is, the {@code request.tracker.class} option will be ignored).`
`@@ -220,7 +220,7 @@ public SelfT withRequestTracker(@Nullable RequestTracker requestTracker) {`
`220`	`220`	`}`
`221`	`221`
`222`	`222`	`/**`
`223`		`- * Register an authentication provider to use with the session.`
	`223`	`+ * Registers an authentication provider to use with the session.`
`224`	`224`	`*`
`225`	`225`	`* <p>If the provider is specified programmatically with this method, it overrides the`
`226`	`226`	`* configuration (that is, the {@code advanced.auth-provider.class} option will be ignored).`