test: fix Java 11 test compilation and diagnostics

dkropachev · dkropachev · commit 1b9fab11e2b4 · 2026-05-24T20:41:27.000-04:00
Enable required annotation processors, silence Java 11 compiler warnings, and improve CCM cleanup logging so integration failures are easier to diagnose.
diff --git a/examples/pom.xml b/examples/pom.xml
@@ -151,6 +151,11 @@
           <source>11</source>
           <target>11</target>
           <annotationProcessorPaths>
+            <path>
+              <groupId>com.google.errorprone</groupId>
+              <artifactId>error_prone_core</artifactId>
+              <version>2.31.0</version>
+            </path>
             <path>
               <groupId>com.scylladb</groupId>
               <artifactId>java-driver-mapper-processor</artifactId>
diff --git a/examples/src/main/java/com/datastax/oss/driver/examples/paging/ForwardPagingRestUi.java b/examples/src/main/java/com/datastax/oss/driver/examples/paging/ForwardPagingRestUi.java
@@ -119,7 +119,7 @@ private static void populateSchema(CqlSession session) {
         int videoid = i * 100 + j;
         session.execute(
             prepare.bind(
-                i, "user " + i, Instant.ofEpochMilli(j * 100000), videoid, "video " + videoid));
+                i, "user " + i, Instant.ofEpochMilli(j * 100000L), videoid, "video " + videoid));
       }
     }
   }
diff --git a/examples/src/main/java/com/datastax/oss/driver/examples/paging/RandomPagingRestUi.java b/examples/src/main/java/com/datastax/oss/driver/examples/paging/RandomPagingRestUi.java
@@ -129,7 +129,7 @@ private static void populateSchema(CqlSession session) {
         int videoid = i * 100 + j;
         session.execute(
             prepare.bind(
-                i, "user " + i, Instant.ofEpochMilli(j * 100000), videoid, "video " + videoid));
+                i, "user " + i, Instant.ofEpochMilli(j * 100000L), videoid, "video " + videoid));
       }
     }
   }
diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
@@ -231,6 +231,42 @@
   </dependencies>
   <build>
     <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <compilerArgs combine.children="append">
+            <compilerArg>-processor</compilerArg>
+            <compilerArg>com.datastax.oss.driver.internal.mapper.processor.MapperProcessor,com.datastax.oss.driver.internal.gremlin.PatchedGremlinDslProcessor</compilerArg>
+          </compilerArgs>
+          <annotationProcessorPaths>
+            <path>
+              <groupId>com.google.errorprone</groupId>
+              <artifactId>error_prone_core</artifactId>
+              <version>2.31.0</version>
+            </path>
+            <path>
+              <groupId>com.scylladb</groupId>
+              <artifactId>java-driver-test-infra</artifactId>
+              <version>${project.version}</version>
+            </path>
+            <path>
+              <groupId>com.scylladb</groupId>
+              <artifactId>java-driver-mapper-processor</artifactId>
+              <version>${project.version}</version>
+            </path>
+            <path>
+              <groupId>com.scylladb</groupId>
+              <artifactId>java-driver-mapper-runtime</artifactId>
+              <version>${project.version}</version>
+            </path>
+            <path>
+              <groupId>org.apache.tinkerpop</groupId>
+              <artifactId>gremlin-core</artifactId>
+              <version>${tinkerpop.version}</version>
+            </path>
+          </annotationProcessorPaths>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-failsafe-plugin</artifactId>
diff --git a/metrics/micrometer/src/main/java/com/datastax/oss/driver/internal/metrics/micrometer/MicrometerMetricUpdater.java b/metrics/micrometer/src/main/java/com/datastax/oss/driver/internal/metrics/micrometer/MicrometerMetricUpdater.java
@@ -55,22 +55,22 @@ protected MicrometerMetricUpdater(
   @Override
   public void incrementCounter(MetricT metric, @Nullable String profileName, long amount) {
     if (isEnabled(metric, profileName)) {
-      getOrCreateCounterFor(metric).increment(amount);
+      getOrCreateCounterFor(metric).increment((double) amount);
     }
   }
 
   @Override
   public void updateHistogram(MetricT metric, @Nullable String profileName, long value) {
     if (isEnabled(metric, profileName)) {
-      getOrCreateDistributionSummaryFor(metric).record(value);
+      getOrCreateDistributionSummaryFor(metric).record((double) value);
     }
   }
 
   @Override
   public void markMeter(MetricT metric, @Nullable String profileName, long amount) {
     if (isEnabled(metric, profileName)) {
       // There is no meter type in Micrometer, so use a counter
-      getOrCreateCounterFor(metric).increment(amount);
+      getOrCreateCounterFor(metric).increment((double) amount);
     }
   }
 
diff --git a/osgi-tests/pom.xml b/osgi-tests/pom.xml
@@ -162,6 +162,23 @@
   </dependencies>
   <build>
     <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <annotationProcessorPaths combine.children="append">
+            <path>
+              <groupId>com.scylladb</groupId>
+              <artifactId>java-driver-mapper-processor</artifactId>
+              <version>${project.version}</version>
+            </path>
+            <path>
+              <groupId>com.scylladb</groupId>
+              <artifactId>java-driver-mapper-runtime</artifactId>
+              <version>${project.version}</version>
+            </path>
+          </annotationProcessorPaths>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.apache.servicemix.tooling</groupId>
         <artifactId>depends-maven-plugin</artifactId>
diff --git a/test-infra/pom.xml b/test-infra/pom.xml
@@ -48,6 +48,11 @@
       <groupId>com.scylladb</groupId>
       <artifactId>java-driver-core</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.tinkerpop</groupId>
+      <artifactId>gremlin-core</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>com.github.spotbugs</groupId>
       <artifactId>spotbugs-annotations</artifactId>
diff --git a/test-infra/src/main/java/com/datastax/oss/driver/internal/gremlin/PatchedGremlinDslProcessor.java b/test-infra/src/main/java/com/datastax/oss/driver/internal/gremlin/PatchedGremlinDslProcessor.java
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.datastax.oss.driver.internal.gremlin;
+
+import java.util.Collections;
+import java.util.Set;
+import javax.annotation.processing.SupportedAnnotationTypes;
+import javax.lang.model.SourceVersion;
+import org.apache.tinkerpop.gremlin.process.traversal.dsl.GremlinDslProcessor;
+
+@SupportedAnnotationTypes("org.apache.tinkerpop.gremlin.process.traversal.dsl.GremlinDsl")
+public class PatchedGremlinDslProcessor extends GremlinDslProcessor {
+
+  @Override
+  public Set<String> getSupportedAnnotationTypes() {
+    return Collections.singleton("org.apache.tinkerpop.gremlin.process.traversal.dsl.GremlinDsl");
+  }
+
+  @Override
+  public SourceVersion getSupportedSourceVersion() {
+    return SourceVersion.latestSupported();
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -119,7 +119,7 @@ private static void populateSchema(CqlSession session) {`
`119`	`119`	`int videoid = i * 100 + j;`
`120`	`120`	`session.execute(`
`121`	`121`	`prepare.bind(`
`122`		`- i, "user " + i, Instant.ofEpochMilli(j * 100000), videoid, "video " + videoid));`
	`122`	`+ i, "user " + i, Instant.ofEpochMilli(j * 100000L), videoid, "video " + videoid));`
`123`	`123`	`}`
`124`	`124`	`}`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,7 +129,7 @@ private static void populateSchema(CqlSession session) {`
`129`	`129`	`int videoid = i * 100 + j;`
`130`	`130`	`session.execute(`
`131`	`131`	`prepare.bind(`
`132`		`- i, "user " + i, Instant.ofEpochMilli(j * 100000), videoid, "video " + videoid));`
	`132`	`+ i, "user " + i, Instant.ofEpochMilli(j * 100000L), videoid, "video " + videoid));`
`133`	`133`	`}`
`134`	`134`	`}`
`135`	`135`	`}`
Original file line number	Diff line number	Diff line change
`@@ -55,22 +55,22 @@ protected MicrometerMetricUpdater(`
`55`	`55`	`@Override`
`56`	`56`	`public void incrementCounter(MetricT metric, @Nullable String profileName, long amount) {`
`57`	`57`	`if (isEnabled(metric, profileName)) {`
`58`		`- getOrCreateCounterFor(metric).increment(amount);`
	`58`	`+ getOrCreateCounterFor(metric).increment((double) amount);`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`@Override`
`63`	`63`	`public void updateHistogram(MetricT metric, @Nullable String profileName, long value) {`
`64`	`64`	`if (isEnabled(metric, profileName)) {`
`65`		`- getOrCreateDistributionSummaryFor(metric).record(value);`
	`65`	`+ getOrCreateDistributionSummaryFor(metric).record((double) value);`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`
`69`	`69`	`@Override`
`70`	`70`	`public void markMeter(MetricT metric, @Nullable String profileName, long amount) {`
`71`	`71`	`if (isEnabled(metric, profileName)) {`
`72`	`72`	`// There is no meter type in Micrometer, so use a counter`
`73`		`- getOrCreateCounterFor(metric).increment(amount);`
	`73`	`+ getOrCreateCounterFor(metric).increment((double) amount);`
`74`	`74`	`}`
`75`	`75`	`}`
`76`	`76`