Move all configurable policies to the user-facing context interface

olim7t · olim7t · commit e60c803343a6 · 2018-06-01T11:57:51.000-07:00
diff --git a/core/src/main/java/com/datastax/oss/driver/api/core/context/DriverContext.java b/core/src/main/java/com/datastax/oss/driver/api/core/context/DriverContext.java
@@ -18,15 +18,20 @@
 import com.datastax.oss.driver.api.core.addresstranslation.AddressTranslator;
 import com.datastax.oss.driver.api.core.auth.AuthProvider;
 import com.datastax.oss.driver.api.core.config.DriverConfig;
+import com.datastax.oss.driver.api.core.config.DriverConfigLoader;
 import com.datastax.oss.driver.api.core.config.DriverConfigProfile;
 import com.datastax.oss.driver.api.core.connection.ReconnectionPolicy;
 import com.datastax.oss.driver.api.core.detach.AttachmentPoint;
 import com.datastax.oss.driver.api.core.loadbalancing.LoadBalancingPolicy;
+import com.datastax.oss.driver.api.core.metadata.NodeStateListener;
+import com.datastax.oss.driver.api.core.metadata.schema.SchemaChangeListener;
 import com.datastax.oss.driver.api.core.retry.RetryPolicy;
 import com.datastax.oss.driver.api.core.session.Session;
+import com.datastax.oss.driver.api.core.session.throttling.RequestThrottler;
 import com.datastax.oss.driver.api.core.specex.SpeculativeExecutionPolicy;
 import com.datastax.oss.driver.api.core.ssl.SslEngineFactory;
 import com.datastax.oss.driver.api.core.time.TimestampGenerator;
+import com.datastax.oss.driver.api.core.tracker.RequestTracker;
 import java.util.Map;
 import java.util.Optional;
 
@@ -41,6 +46,8 @@ public interface DriverContext extends AttachmentPoint {
 
   DriverConfig config();
 
+  DriverConfigLoader configLoader();
+
   Map<String, LoadBalancingPolicy> loadBalancingPolicies();
 
   default LoadBalancingPolicy loadBalancingPolicy(String profileName) {
@@ -78,4 +85,12 @@ default SpeculativeExecutionPolicy speculativeExecutionPolicy(String profileName
 
   /** The SSL engine factory, if SSL was configured. */
   Optional<SslEngineFactory> sslEngineFactory();
+
+  RequestTracker requestTracker();
+
+  RequestThrottler requestThrottler();
+
+  NodeStateListener nodeStateListener();
+
+  SchemaChangeListener schemaChangeListener();
 }
diff --git a/core/src/main/java/com/datastax/oss/driver/internal/core/context/InternalDriverContext.java b/core/src/main/java/com/datastax/oss/driver/internal/core/context/InternalDriverContext.java
@@ -15,14 +15,9 @@
  */
 package com.datastax.oss.driver.internal.core.context;
 
-import com.datastax.oss.driver.api.core.config.DriverConfigLoader;
 import com.datastax.oss.driver.api.core.context.DriverContext;
 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;
 import com.datastax.oss.driver.api.core.session.SessionBuilder;
-import com.datastax.oss.driver.api.core.session.throttling.RequestThrottler;
-import com.datastax.oss.driver.api.core.tracker.RequestTracker;
 import com.datastax.oss.driver.internal.core.ConsistencyLevelRegistry;
 import com.datastax.oss.driver.internal.core.ProtocolVersionRegistry;
 import com.datastax.oss.driver.internal.core.channel.ChannelFactory;
@@ -82,8 +77,6 @@ public interface InternalDriverContext extends DriverContext {
 
   RequestProcessorRegistry requestProcessorRegistry();
 
-  DriverConfigLoader configLoader();
-
   SchemaQueriesFactory schemaQueriesFactory();
 
   SchemaParserFactory schemaParserFactory();
@@ -96,14 +89,6 @@ public interface InternalDriverContext extends DriverContext {
 
   MetricsFactory metricsFactory();
 
-  RequestThrottler requestThrottler();
-
-  NodeStateListener nodeStateListener();
-
-  SchemaChangeListener schemaChangeListener();
-
-  RequestTracker requestTracker();
-
   /**
    * This is the filter from {@link SessionBuilder#withNodeFilter(String, Predicate)}. If the filter
    * for this profile was specified through the configuration instead, this method will return
