Always use default DSE package for auth providers

olim7t · olim7t · commit 4ca63d754e26 · 2020-01-14T09:28:53.000-08:00
diff --git a/core/src/main/java/com/datastax/dse/driver/internal/core/context/DseDriverContext.java b/core/src/main/java/com/datastax/dse/driver/internal/core/context/DseDriverContext.java
@@ -32,10 +32,7 @@
 import com.datastax.dse.protocol.internal.DseProtocolV1ClientCodecs;
 import com.datastax.dse.protocol.internal.DseProtocolV2ClientCodecs;
 import com.datastax.dse.protocol.internal.ProtocolV4ClientCodecsForDse;
-import com.datastax.oss.driver.api.core.auth.AuthProvider;
-import com.datastax.oss.driver.api.core.config.DefaultDriverOption;
 import com.datastax.oss.driver.api.core.config.DriverConfigLoader;
-import com.datastax.oss.driver.api.core.loadbalancing.LoadBalancingPolicy;
 import com.datastax.oss.driver.api.core.metadata.Node;
 import com.datastax.oss.driver.api.core.metadata.NodeStateListener;
 import com.datastax.oss.driver.api.core.metadata.schema.SchemaChangeListener;
@@ -57,7 +54,6 @@
 import com.datastax.oss.driver.internal.core.session.RequestProcessor;
 import com.datastax.oss.driver.internal.core.session.RequestProcessorRegistry;
 import com.datastax.oss.driver.internal.core.util.Loggers;
-import com.datastax.oss.driver.internal.core.util.Reflection;
 import com.datastax.oss.protocol.internal.FrameCodec;
 import com.datastax.oss.protocol.internal.ProtocolV3ClientCodecs;
 import com.datastax.oss.protocol.internal.ProtocolV5ClientCodecs;
@@ -67,7 +63,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.UUID;
 import java.util.function.Predicate;
 import net.jcip.annotations.ThreadSafe;
@@ -262,28 +257,4 @@ protected RequestTracker buildRequestTracker(RequestTracker requestTrackerFromBu
   public List<LifecycleListener> getLifecycleListeners() {
     return listeners;
   }
-
-  @Override
-  protected Map<String, LoadBalancingPolicy> buildLoadBalancingPolicies() {
-    return Reflection.buildFromConfigProfiles(
-        this,
-        DefaultDriverOption.LOAD_BALANCING_POLICY,
-        LoadBalancingPolicy.class,
-        "com.datastax.oss.driver.internal.core.loadbalancing",
-        // Add the DSE default package
-        "com.datastax.dse.driver.internal.core.loadbalancing");
-  }
-
-  @Override
-  protected Optional<AuthProvider> buildAuthProvider(AuthProvider authProviderFromBuilder) {
-    return (authProviderFromBuilder != null)
-        ? Optional.of(authProviderFromBuilder)
-        : Reflection.buildFromConfig(
-            this,
-            DefaultDriverOption.AUTH_PROVIDER_CLASS,
-            AuthProvider.class,
-            "com.datastax.oss.driver.internal.core.auth",
-            // Add the DSE default package
-            "com.datastax.dse.driver.internal.core.auth");
-  }
 }
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
@@ -558,7 +558,8 @@ protected Optional<AuthProvider> buildAuthProvider(AuthProvider authProviderFrom
             this,
             DefaultDriverOption.AUTH_PROVIDER_CLASS,
             AuthProvider.class,
-            "com.datastax.oss.driver.internal.core.auth");
+            "com.datastax.oss.driver.internal.core.auth",
+            "com.datastax.dse.driver.internal.core.auth");
   }
 
   @NonNull
diff --git a/core/src/main/resources/reference.conf b/core/src/main/resources/reference.conf
@@ -526,15 +526,17 @@ datastax-java-driver {
     # - com.datastax.oss.driver.internal.core.auth
     # - com.datastax.dse.driver.internal.core.auth
     #
-    # The DSE driver provides 3 implementations out of the box:
+    # The driver provides one implementation for Apache Cassandra(R):
     # - PlainTextAuthProvider: uses plain-text credentials. It requires the `username` and
     #   `password` options below. Should be used only when authenticating against Apache
     #   Cassandra(R) clusters; not recommended when authenticating against DSE clusters.
+    #
+    # And two DSE-specific implementations:
     # - DsePlainTextAuthProvider: provides SASL authentication using the PLAIN mechanism for DSE
     #   clusters secured with DseAuthenticator. It requires the `username` and `password` options
     #   below, and optionally, an `authorization-id`.
     # - DseGssApiAuthProvider: provides GSSAPI authentication for DSE clusters secured with
-    #   DseAuthenticator. Read the javadocs of this authenticator for detailed instructions.
+    #   DseAuthenticator. See the example below and refer to the manual for detailed instructions.
     #
     # You can also specify a custom class that implements AuthProvider and has a public constructor
     # with a DriverContext argument (to simplify this, the driver provides two abstract classes that

Original file line number	Diff line number	Diff line change
`@@ -558,7 +558,8 @@ protected Optional<AuthProvider> buildAuthProvider(AuthProvider authProviderFrom`
`558`	`558`	`this,`
`559`	`559`	`DefaultDriverOption.AUTH_PROVIDER_CLASS,`
`560`	`560`	`AuthProvider.class,`
`561`		`- "com.datastax.oss.driver.internal.core.auth");`
	`561`	`+ "com.datastax.oss.driver.internal.core.auth",`
	`562`	`+ "com.datastax.dse.driver.internal.core.auth");`
`562`	`563`	`}`
`563`	`564`
`564`	`565`	`@NonNull`