Merge branch '4.11.x' into 4.12.x

Author: adutra

changelog/README.md

@@ -2,6 +2,13 @@
 
 <!-- Note: contrary to 3.x, insert new entries *first* in their section -->
 
+### 4.12.1 (in progress)
+
+Merged from 4.11.x:
+
+- [bug] JAVA-2949: Provide mapper support for CompletionStage<Stream<T>>
+- [bug] JAVA-2950: Remove reference to Reflection class from DependencyCheck
+
 ### 4.12.0
 
 - [improvement] JAVA-2935: Make GetEntity and SetEntity methods resilient to incomplete data
@@ -18,6 +25,11 @@ Merged from 4.11.x:
 - [bug] JAVA-2943: Prevent session leak with wrong keyspace name
 - [bug] JAVA-2938: OverloadedException message is misleading
 
+### 4.11.3 (in progress)
+
+- [bug] JAVA-2949: Provide mapper support for CompletionStage<Stream<T>>
+- [bug] JAVA-2950: Remove reference to Reflection class from DependencyCheck
+
 ### 4.11.2
 
 - [bug] JAVA-2932: Make DefaultDriverConfigLoader.close() resilient to terminated executors

core/src/main/java/com/datastax/dse/driver/internal/core/type/codec/DseTypeCodecsRegistrar.java

@@ -15,9 +15,11 @@
  */
 package com.datastax.dse.driver.internal.core.type.codec;
 
+import static com.datastax.oss.driver.internal.core.util.Dependency.ESRI;
+
 import com.datastax.dse.driver.api.core.type.codec.DseTypeCodecs;
 import com.datastax.oss.driver.api.core.type.codec.registry.MutableCodecRegistry;
-import com.datastax.oss.driver.internal.core.util.DependencyCheck;
+import com.datastax.oss.driver.internal.core.util.DefaultDependencyChecker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -27,7 +29,7 @@ public class DseTypeCodecsRegistrar {
 
   public static void registerDseCodecs(MutableCodecRegistry registry) {
     registry.register(DseTypeCodecs.DATE_RANGE);
-    if (DependencyCheck.ESRI.isPresent()) {
+    if (DefaultDependencyChecker.isPresent(ESRI)) {
       registry.register(DseTypeCodecs.LINE_STRING, DseTypeCodecs.POINT, DseTypeCodecs.POLYGON);
     } else {
       LOG.debug("ESRI was not found on the classpath: geo codecs will not be available");

core/src/main/java/com/datastax/dse/driver/internal/core/type/codec/DseTypeCodecsRegistrarSubstitutions.java

@@ -15,9 +15,11 @@
  */
 package com.datastax.dse.driver.internal.core.type.codec;
 
+import static com.datastax.oss.driver.internal.core.util.Dependency.ESRI;
+
 import com.datastax.dse.driver.api.core.type.codec.DseTypeCodecs;
 import com.datastax.oss.driver.api.core.type.codec.registry.MutableCodecRegistry;
-import com.datastax.oss.driver.internal.core.util.DependencyCheck;
+import com.datastax.oss.driver.internal.core.util.GraalDependencyChecker;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
 import java.util.function.BooleanSupplier;
@@ -37,7 +39,7 @@ public static void registerDseCodecs(MutableCodecRegistry registry) {
   public static class EsriMissing implements BooleanSupplier {
     @Override
     public boolean getAsBoolean() {
-      return !DependencyCheck.ESRI.isPresent();
+      return !GraalDependencyChecker.isPresent(ESRI);
     }
   }
 }

core/src/main/java/com/datastax/oss/driver/api/core/connection/HeartbeatException.java

@@ -28,8 +28,8 @@
  *
  * <p>Heartbeat queries are sent automatically on idle connections, to ensure that they are still
  * alive. If a heartbeat query fails, the connection is closed, and all pending queries are aborted.
- * The exception will be passed to {@link RetryPolicy#onRequestAborted(Request, Throwable, int)},
- * which decides what to do next (the default policy retries the query on the next node).
+ * The exception will be passed to {@link RetryPolicy#onRequestAbortedVerdict(Request, Throwable,
+ * int)}, which decides what to do next (the default policy retries the query on the next node).
  */
 public class HeartbeatException extends DriverException {
 

core/src/main/java/com/datastax/oss/driver/api/core/servererrors/ReadFailureException.java

@@ -33,7 +33,7 @@
  * <p>This happens when some of the replicas that were contacted by the coordinator replied with an
  * error.
  *
- * <p>This exception is processed by {@link RetryPolicy#onErrorResponse(Request,
+ * <p>This exception is processed by {@link RetryPolicy#onErrorResponseVerdict(Request,
  * CoordinatorException, int)}, which will decide if it is rethrown directly to the client or if the
  * request should be retried. If all other tried nodes also fail, this exception will appear in the
  * {@link AllNodesFailedException} thrown to the client.

core/src/main/java/com/datastax/oss/driver/api/core/servererrors/ReadTimeoutException.java

@@ -27,10 +27,10 @@
 /**
  * A server-side timeout during a read query.
  *
- * <p>This exception is processed by {@link RetryPolicy#onReadTimeout(Request, ConsistencyLevel,
- * int, int, boolean, int)}, which will decide if it is rethrown directly to the client or if the
- * request should be retried. If all other tried nodes also fail, this exception will appear in the
- * {@link AllNodesFailedException} thrown to the client.
+ * <p>This exception is processed by {@link RetryPolicy#onReadTimeoutVerdict(Request,
+ * ConsistencyLevel, int, int, boolean, int)}, which will decide if it is rethrown directly to the
+ * client or if the request should be retried. If all other tried nodes also fail, this exception
+ * will appear in the {@link AllNodesFailedException} thrown to the client.
  */
 public class ReadTimeoutException extends QueryConsistencyException {
 

core/src/main/java/com/datastax/oss/driver/api/core/servererrors/ServerError.java

@@ -29,7 +29,7 @@
  *
  * <p>This should be considered as a server bug and reported as such.
  *
- * <p>This exception is processed by {@link RetryPolicy#onErrorResponse(Request,
+ * <p>This exception is processed by {@link RetryPolicy#onErrorResponseVerdict(Request,
  * CoordinatorException, int)}, which will decide if it is rethrown directly to the client or if the
  * request should be retried. If all other tried nodes also fail, this exception will appear in the
  * {@link AllNodesFailedException} thrown to the client.

core/src/main/java/com/datastax/oss/driver/api/core/servererrors/TruncateException.java

@@ -27,7 +27,7 @@
 /**
  * An error during a truncation operation.
  *
- * <p>This exception is processed by {@link RetryPolicy#onErrorResponse(Request,
+ * <p>This exception is processed by {@link RetryPolicy#onErrorResponseVerdict(Request,
  * CoordinatorException, int)}, which will decide if it is rethrown directly to the client or if the
  * request should be retried. If all other tried nodes also fail, this exception will appear in the
  * {@link AllNodesFailedException} thrown to the client.

core/src/main/java/com/datastax/oss/driver/api/core/servererrors/UnavailableException.java

@@ -28,10 +28,10 @@
  * Thrown when the coordinator knows there is not enough replicas alive to perform a query with the
  * requested consistency level.
  *
- * <p>This exception is processed by {@link RetryPolicy#onUnavailable(Request, ConsistencyLevel,
- * int, int, int)}, which will decide if it is rethrown directly to the client or if the request
- * should be retried. If all other tried nodes also fail, this exception will appear in the {@link
- * AllNodesFailedException} thrown to the client.
+ * <p>This exception is processed by {@link RetryPolicy#onUnavailableVerdict(Request,
+ * ConsistencyLevel, int, int, int)}, which will decide if it is rethrown directly to the client or
+ * if the request should be retried. If all other tried nodes also fail, this exception will appear
+ * in the {@link AllNodesFailedException} thrown to the client.
  */
 public class UnavailableException extends QueryExecutionException {
   private final ConsistencyLevel consistencyLevel;

core/src/main/java/com/datastax/oss/driver/api/core/servererrors/WriteFailureException.java

@@ -33,7 +33,7 @@
  * <p>This happens when some of the replicas that were contacted by the coordinator replied with an
  * error.
  *
- * <p>This exception is processed by {@link RetryPolicy#onErrorResponse(Request,
+ * <p>This exception is processed by {@link RetryPolicy#onErrorResponseVerdict(Request,
  * CoordinatorException, int)}, which will decide if it is rethrown directly to the client or if the
  * request should be retried. If all other tried nodes also fail, this exception will appear in the
  * {@link AllNodesFailedException} thrown to the client.