JAVA-2945: Reinstate InternalDriverContext.getNodeFilter method (#1553)

Author: adutra

changelog/README.md

@@ -4,6 +4,7 @@
 
 ### 4.11.2 (in progress)
 
+- [bug] JAVA-2945: Reinstate InternalDriverContext.getNodeFilter method
 - [bug] JAVA-2947: Release buffer after decoding multi-slice frame
 - [bug] JAVA-2946: Make MapperResultProducerService instances be located with user-provided class loader
 - [bug] JAVA-2942: GraphStatement.setConsistencyLevel() is not effective

core/src/main/java/com/datastax/oss/driver/internal/core/context/DefaultDriverContext.java

@@ -225,6 +225,7 @@ public class DefaultDriverContext implements InternalDriverContext {
   private final SchemaChangeListener schemaChangeListenerFromBuilder;
   private final RequestTracker requestTrackerFromBuilder;
   private final Map<String, String> localDatacentersFromBuilder;
+  private final Map<String, Predicate<Node>> nodeFiltersFromBuilder;
   private final Map<String, NodeDistanceEvaluator> nodeDistanceEvaluatorsFromBuilder;
   private final ClassLoader classLoader;
   private final InetSocketAddress cloudProxyAddress;
@@ -277,6 +278,9 @@ public DefaultDriverContext(
             "sslEngineFactory",
             () -> buildSslEngineFactory(programmaticArguments.getSslEngineFactory()),
             cycleDetector);
+    @SuppressWarnings("deprecation")
+    Map<String, Predicate<Node>> nodeFilters = programmaticArguments.getNodeFilters();
+    this.nodeFiltersFromBuilder = nodeFilters;
     this.nodeDistanceEvaluatorsFromBuilder = programmaticArguments.getNodeDistanceEvaluators();
     this.classLoader = programmaticArguments.getClassLoader();
     this.cloudProxyAddress = programmaticArguments.getCloudProxyAddress();
@@ -909,6 +913,13 @@ public String getLocalDatacenter(@NonNull String profileName) {
     return localDatacentersFromBuilder.get(profileName);
   }
 
+  @Nullable
+  @Override
+  @Deprecated
+  public Predicate<Node> getNodeFilter(@NonNull String profileName) {
+    return nodeFiltersFromBuilder.get(profileName);
+  }
+
   @Nullable
   @Override
   public NodeDistanceEvaluator getNodeDistanceEvaluator(@NonNull String profileName) {

core/src/main/java/com/datastax/oss/driver/internal/core/context/InternalDriverContext.java

@@ -17,6 +17,7 @@
 
 import com.datastax.oss.driver.api.core.context.DriverContext;
 import com.datastax.oss.driver.api.core.loadbalancing.NodeDistanceEvaluator;
+import com.datastax.oss.driver.api.core.metadata.Node;
 import com.datastax.oss.driver.api.core.session.SessionBuilder;
 import com.datastax.oss.driver.internal.core.ConsistencyLevelRegistry;
 import com.datastax.oss.driver.internal.core.ProtocolVersionRegistry;
@@ -49,6 +50,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.function.Predicate;
 
 /** Extends the driver context with additional components that are not exposed by our public API. */
 public interface InternalDriverContext extends DriverContext {
@@ -136,6 +138,17 @@ public interface InternalDriverContext extends DriverContext {
   @Nullable
   String getLocalDatacenter(@NonNull String profileName);
 
+  /**
+   * 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
+   * {@code null}.
+   *
+   * @deprecated Use {@link #getNodeDistanceEvaluator(String)} instead.
+   */
+  @Nullable
+  @Deprecated
+  Predicate<Node> getNodeFilter(@NonNull String profileName);
+
   /**
    * This is the node distance evaluator from {@link
    * SessionBuilder#withNodeDistanceEvaluator(String, NodeDistanceEvaluator)}. If the evaluator for