Bulk upgrade of Quarkus and the Cassandra driver (#213)

adutra · web-flow · commit 9a82b02590d9 · 2022-12-09T17:49:03.000+01:00
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -69,7 +69,7 @@
       <dependency>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>gremlin-core</artifactId>
-        <version>3.4.10</version>
+        <version>3.5.3</version>
         <optional>true</optional>
         <exclusions>
           <exclusion>
@@ -93,7 +93,7 @@
       <dependency>
         <groupId>org.apache.tinkerpop</groupId>
         <artifactId>tinkergraph-gremlin</artifactId>
-        <version>3.4.10</version>
+        <version>3.5.3</version>
         <optional>true</optional>
       </dependency>
       <dependency>
diff --git a/changelog/README.md b/changelog/README.md
@@ -1,3 +1,7 @@
+### 1.1.3 (in progress)
+
+This release is built against Quarkus 2.15.0.Final and the Cassandra driver 4.15.0.
+
 ### 1.1.2
 
 This release is built against Quarkus 2.7.1.Final and the Cassandra driver 4.14.0.
diff --git a/deployment/src/test/java/com/datastax/oss/quarkus/deployment/internal/health/CassandraHealthCheckBuildItemDisabledTest.java b/deployment/src/test/java/com/datastax/oss/quarkus/deployment/internal/health/CassandraHealthCheckBuildItemDisabledTest.java
@@ -16,19 +16,24 @@
 package com.datastax.oss.quarkus.deployment.internal.health;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
 import com.datastax.oss.quarkus.runtime.internal.health.CassandraAsyncHealthCheck;
 import com.datastax.oss.quarkus.test.CassandraTestResource;
-import io.quarkus.arc.Arc;
 import io.quarkus.test.QuarkusUnitTest;
-import java.util.Set;
-import javax.enterprise.inject.spi.Bean;
+import javax.enterprise.inject.UnsatisfiedResolutionException;
+import javax.inject.Inject;
+import javax.inject.Provider;
+import org.eclipse.microprofile.health.Readiness;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 public class CassandraHealthCheckBuildItemDisabledTest {
+
+  @Inject @Readiness Provider<CassandraAsyncHealthCheck> healthCheckProvider;
+
   @RegisterExtension
   static QuarkusUnitTest runner =
       new QuarkusUnitTest()
@@ -38,7 +43,9 @@ public class CassandraHealthCheckBuildItemDisabledTest {
 
   @Test
   public void should_not_have_health_check_in_the_container() {
-    Set<Bean<?>> beans = Arc.container().beanManager().getBeans(CassandraAsyncHealthCheck.class);
-    assertThat(beans.size()).isZero();
+    assertThat(healthCheckProvider).isNotNull();
+    assertThatThrownBy(healthCheckProvider::get)
+        .isInstanceOf(UnsatisfiedResolutionException.class)
+        .hasMessageContaining("No bean found for required type");
   }
 }
diff --git a/deployment/src/test/java/com/datastax/oss/quarkus/deployment/internal/health/CassandraHealthCheckBuildItemEnabledTest.java b/deployment/src/test/java/com/datastax/oss/quarkus/deployment/internal/health/CassandraHealthCheckBuildItemEnabledTest.java
@@ -19,16 +19,20 @@
 
 import com.datastax.oss.quarkus.runtime.internal.health.CassandraAsyncHealthCheck;
 import com.datastax.oss.quarkus.test.CassandraTestResource;
-import io.quarkus.arc.Arc;
 import io.quarkus.test.QuarkusUnitTest;
-import java.util.Set;
-import javax.enterprise.inject.spi.Bean;
+import java.util.concurrent.ExecutionException;
+import javax.inject.Inject;
+import org.eclipse.microprofile.health.HealthCheckResponse;
+import org.eclipse.microprofile.health.Readiness;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
 public class CassandraHealthCheckBuildItemEnabledTest {
+
+  @Inject @Readiness CassandraAsyncHealthCheck healthCheck;
+
   @RegisterExtension
   static QuarkusUnitTest runner =
       new QuarkusUnitTest()
@@ -37,8 +41,15 @@ public class CassandraHealthCheckBuildItemEnabledTest {
           .overrideConfigKey("quarkus.cassandra.health.enabled", "true");
 
   @Test
-  public void should_have_health_check_in_the_container() {
-    Set<Bean<?>> beans = Arc.container().beanManager().getBeans(CassandraAsyncHealthCheck.class);
-    assertThat(beans.size()).isEqualTo(1);
+  public void should_have_health_check_in_the_container()
+      throws ExecutionException, InterruptedException {
+    assertThat(healthCheck).isNotNull();
+    assertThat(healthCheck.call().subscribe().asCompletionStage().get())
+        .isNotNull()
+        .satisfies(
+            hc -> {
+              assertThat(hc.getName()).isEqualTo("DataStax Apache Cassandra Driver health check");
+              assertThat(hc.getStatus()).isEqualTo(HealthCheckResponse.Status.UP);
+            });
   }
 }
diff --git a/integration-tests/application/src/main/java/com/datastax/oss/quarkus/tests/dao/ProductReactiveQueries.java b/integration-tests/application/src/main/java/com/datastax/oss/quarkus/tests/dao/ProductReactiveQueries.java
@@ -46,7 +46,8 @@ public ProductReactiveQueries(MapperContext context, EntityHelper<Product> produ
   public Multi<Product> queryProviderSelectMultiProduct() {
     return MutinyWrappers.toMulti(
         new DefaultMappedReactiveResultSet<>(
-            session.executeReactive("SELECT * FROM product"), productHelper::get));
+            session.executeReactive("SELECT * FROM product"),
+            source -> productHelper.get(source, false)));
   }
 
   public Uni<Product> queryProviderSelectUniProduct(UUID id) {
@@ -63,7 +64,8 @@ public MutinyReactiveResultSet queryProviderSelectResultSet() {
   public MutinyMappedReactiveResultSet<Product> queryProviderSelectMappedResultSet() {
     return new DefaultMutinyMappedReactiveResultSet<>(
         new DefaultMappedReactiveResultSet<>(
-            session.executeReactive("SELECT * FROM product"), productHelper::get));
+            session.executeReactive("SELECT * FROM product"),
+            source -> productHelper.get(source, false)));
   }
 
   public Multi<Row> queryProviderSelectMultiRow() {
diff --git a/integration-tests/application/src/main/java/com/datastax/oss/quarkus/tests/resource/ProductReactiveResource.java b/integration-tests/application/src/main/java/com/datastax/oss/quarkus/tests/resource/ProductReactiveResource.java
@@ -37,7 +37,7 @@ public class ProductReactiveResource {
       consumes = MediaType.APPLICATION_JSON,
       order = 1)
   public void createProduct(RoutingExchange ex) {
-    Product product = Json.decodeValue(ex.context().getBody(), Product.class);
+    Product product = Json.decodeValue(ex.context().body().asString(), Product.class);
     service
         .create(product)
         .subscribe()
@@ -51,7 +51,7 @@ public void createProduct(RoutingExchange ex) {
       order = 1)
   public void updateProduct(RoutingExchange ex) {
     UUID id = ex.getParam("id").map(UUID::fromString).orElseThrow(IllegalStateException::new);
-    Product product = Json.decodeValue(ex.context().getBody(), Product.class);
+    Product product = Json.decodeValue(ex.context().body().asString(), Product.class);
     product.setId(id);
     service
         .update(product)
diff --git a/integration-tests/dse/src/test/java/com/datastax/oss/quarkus/tests/DseTestBase.java b/integration-tests/dse/src/test/java/com/datastax/oss/quarkus/tests/DseTestBase.java
@@ -24,7 +24,7 @@
     initArgs = {
       @ResourceArg(
           name = "quarkus.cassandra.test.container.image",
-          value = "datastax/dse-server:6.8.14"),
+          value = "datastax/dse-server:6.8.25"),
       // activate DSE Graph with the -g switch; the resulting command will be: dse cassandra -f -g
       @ResourceArg(name = "quarkus.cassandra.test.container.cmd", value = "-g"),
       @ResourceArg(name = "quarkus.cassandra.test.container.startup-timeout", value = "PT5M")
diff --git a/integration-tests/main/src/test/java/com/datastax/oss/quarkus/tests/nativ/CassandraHealthCheckNativeIT.java b/integration-tests/main/src/test/java/com/datastax/oss/quarkus/tests/nativ/CassandraHealthCheckNativeIT.java
@@ -16,9 +16,9 @@
 package com.datastax.oss.quarkus.tests.nativ;
 
 import com.datastax.oss.quarkus.tests.CassandraHealthCheckIT;
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 import org.junit.jupiter.api.Tag;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 @Tag("native")
 public class CassandraHealthCheckNativeIT extends CassandraHealthCheckIT {}
diff --git a/integration-tests/main/src/test/java/com/datastax/oss/quarkus/tests/nativ/CassandraMetricsNativeIT.java b/integration-tests/main/src/test/java/com/datastax/oss/quarkus/tests/nativ/CassandraMetricsNativeIT.java
@@ -16,9 +16,9 @@
 package com.datastax.oss.quarkus.tests.nativ;
 
 import com.datastax.oss.quarkus.tests.CassandraMetricsIT;
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 import org.junit.jupiter.api.Tag;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 @Tag("native")
 public class CassandraMetricsNativeIT extends CassandraMetricsIT {}
diff --git a/integration-tests/main/src/test/java/com/datastax/oss/quarkus/tests/nativ/CustomerResourceNativeIT.java b/integration-tests/main/src/test/java/com/datastax/oss/quarkus/tests/nativ/CustomerResourceNativeIT.java
@@ -16,9 +16,9 @@
 package com.datastax.oss.quarkus.tests.nativ;
 
 import com.datastax.oss.quarkus.tests.CustomerResourceIT;
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 import org.junit.jupiter.api.Tag;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 @Tag("native")
 public class CustomerResourceNativeIT extends CustomerResourceIT {}
diff --git a/integration-tests/main/src/test/java/com/datastax/oss/quarkus/tests/nativ/DriverConfigNativeIT.java b/integration-tests/main/src/test/java/com/datastax/oss/quarkus/tests/nativ/DriverConfigNativeIT.java
@@ -16,9 +16,9 @@
 package com.datastax.oss.quarkus.tests.nativ;
 
 import com.datastax.oss.quarkus.tests.DriverConfigIT;
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 import org.junit.jupiter.api.Tag;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 @Tag("native")
 class DriverConfigNativeIT extends DriverConfigIT {}
diff --git a/integration-tests/main/src/test/java/com/datastax/oss/quarkus/tests/nativ/ProductReactiveResourceNativeIT.java b/integration-tests/main/src/test/java/com/datastax/oss/quarkus/tests/nativ/ProductReactiveResourceNativeIT.java
@@ -16,9 +16,9 @@
 package com.datastax.oss.quarkus.tests.nativ;
 
 import com.datastax.oss.quarkus.tests.ProductReactiveResourceIT;
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 import org.junit.jupiter.api.Tag;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 @Tag("native")
 public class ProductReactiveResourceNativeIT extends ProductReactiveResourceIT {}
diff --git a/integration-tests/main/src/test/java/com/datastax/oss/quarkus/tests/nativ/ProductResourceNativeIT.java b/integration-tests/main/src/test/java/com/datastax/oss/quarkus/tests/nativ/ProductResourceNativeIT.java
@@ -16,9 +16,9 @@
 package com.datastax.oss.quarkus.tests.nativ;
 
 import com.datastax.oss.quarkus.tests.ProductResourceIT;
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 import org.junit.jupiter.api.Tag;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 @Tag("native")
 public class ProductResourceNativeIT extends ProductResourceIT {}
diff --git a/integration-tests/metrics-disabled/src/test/java/com/datastax/oss/quarkus/tests/CassandraMetricsDisabledNativeIT.java b/integration-tests/metrics-disabled/src/test/java/com/datastax/oss/quarkus/tests/CassandraMetricsDisabledNativeIT.java
@@ -15,9 +15,9 @@
  */
 package com.datastax.oss.quarkus.tests;
 
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 import org.junit.jupiter.api.Tag;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 @Tag("native")
 public class CassandraMetricsDisabledNativeIT extends CassandraMetricsDisabledIT {}
diff --git a/integration-tests/metrics-microprofile/src/test/java/com/datastax/oss/quarkus/tests/CassandraMetricsMicroProfileNativeIT.java b/integration-tests/metrics-microprofile/src/test/java/com/datastax/oss/quarkus/tests/CassandraMetricsMicroProfileNativeIT.java
@@ -15,9 +15,9 @@
  */
 package com.datastax.oss.quarkus.tests;
 
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 import org.junit.jupiter.api.Tag;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 @Tag("native")
 public class CassandraMetricsMicroProfileNativeIT extends CassandraMetricsMicroProfileIT {}
diff --git a/integration-tests/no-mapper/src/test/java/com/datastax/oss/quarkus/tests/ProductResourceNativeIT.java b/integration-tests/no-mapper/src/test/java/com/datastax/oss/quarkus/tests/ProductResourceNativeIT.java
@@ -15,9 +15,9 @@
  */
 package com.datastax.oss.quarkus.tests;
 
-import io.quarkus.test.junit.NativeImageTest;
+import io.quarkus.test.junit.QuarkusIntegrationTest;
 import org.junit.jupiter.api.Tag;
 
-@NativeImageTest
+@QuarkusIntegrationTest
 @Tag("native")
 public class ProductResourceNativeIT extends ProductResourceIT {}
diff --git a/pom.xml b/pom.xml
@@ -33,9 +33,9 @@
     Note: when upgrading the Quarkus version or the DataStax Java driver version, make sure that you
     upgrade them in the quickstart module too.
     -->
-    <quarkus.version>2.7.1.Final</quarkus.version>
-    <datastax-java-driver.version>4.14.0</datastax-java-driver.version>
-    <assertj.version>3.22.0</assertj.version>
+    <quarkus.version>2.15.0.Final</quarkus.version>
+    <datastax-java-driver.version>4.15.0</datastax-java-driver.version>
+    <assertj.version>3.23.1</assertj.version>
     <maven.compiler.target>11</maven.compiler.target>
     <maven.compiler.source>11</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -56,37 +56,37 @@
         <plugin>
           <groupId>com.coveo</groupId>
           <artifactId>fmt-maven-plugin</artifactId>
-          <version>2.9</version>
+          <version>2.13</version>
         </plugin>
         <plugin>
           <groupId>au.com.acegi</groupId>
           <artifactId>xml-format-maven-plugin</artifactId>
-          <version>3.1.1</version>
+          <version>3.2.1</version>
         </plugin>
         <plugin>
           <groupId>com.mycila</groupId>
           <artifactId>license-maven-plugin</artifactId>
-          <version>3.0</version>
+          <version>4.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.8.0</version>
+          <version>3.10.1</version>
         </plugin>
         <plugin>
           <groupId>org.jacoco</groupId>
           <artifactId>jacoco-maven-plugin</artifactId>
-          <version>0.8.5</version>
+          <version>0.8.8</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>3.0.0-M4</version>
+          <version>3.0.0-M7</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-failsafe-plugin</artifactId>
-          <version>3.0.0-M4</version>
+          <version>3.0.0-M7</version>
         </plugin>
         <plugin>
           <groupId>io.quarkus</groupId>
@@ -95,50 +95,50 @@
         </plugin>
         <plugin>
           <groupId>io.quarkus</groupId>
-          <artifactId>quarkus-bootstrap-maven-plugin</artifactId>
+          <artifactId>quarkus-extension-maven-plugin</artifactId>
           <version>${quarkus.version}</version>
         </plugin>
         <plugin>
           <groupId>org.asciidoctor</groupId>
           <artifactId>asciidoctor-maven-plugin</artifactId>
-          <version>2.0.0-RC.1</version>
+          <version>2.2.2</version>
         </plugin>
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
-          <version>3.2.0</version>
+          <version>3.3.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-source-plugin</artifactId>
-          <version>3.1.0</version>
+          <version>3.2.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-javadoc-plugin</artifactId>
-          <version>3.2.0</version>
+          <version>3.4.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-assembly-plugin</artifactId>
-          <version>3.1.0</version>
+          <version>3.4.2</version>
         </plugin>
         <plugin>
           <artifactId>maven-gpg-plugin</artifactId>
-          <version>1.6</version>
+          <version>3.0.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-install-plugin</artifactId>
-          <version>2.5.2</version>
+          <version>3.0.1</version>
         </plugin>
         <plugin>
           <artifactId>maven-deploy-plugin</artifactId>
-          <version>2.8.2</version>
+          <version>3.0.0</version>
         </plugin>
         <plugin>
           <artifactId>maven-release-plugin</artifactId>
-          <version>2.5.3</version>
+          <version>3.0.0-M6</version>
         </plugin>
         <plugin>
           <groupId>org.sonatype.plugins</groupId>
           <artifactId>nexus-staging-maven-plugin</artifactId>
-          <version>1.6.8</version>
+          <version>1.6.13</version>
         </plugin>
       </plugins>
     </pluginManagement>
diff --git a/quickstart/README.adoc b/quickstart/README.adoc
diff --git a/quickstart/pom.xml b/quickstart/pom.xml
diff --git a/quickstart/src/main/resources/application.properties b/quickstart/src/main/resources/application.properties
diff --git a/quickstart/src/test/java/com/datastax/oss/demo/FruitResourceNativeIT.java b/quickstart/src/test/java/com/datastax/oss/demo/FruitResourceNativeIT.java
diff --git a/runtime/pom.xml b/runtime/pom.xml
diff --git a/runtime/src/main/java/com/datastax/oss/quarkus/runtime/internal/reactive/mapper/MapperMutinyWrappers.java b/runtime/src/main/java/com/datastax/oss/quarkus/runtime/internal/reactive/mapper/MapperMutinyWrappers.java
diff --git a/test-framework/pom.xml b/test-framework/pom.xml
diff --git a/test-framework/src/main/java/com/datastax/oss/quarkus/test/CassandraTestResource.java b/test-framework/src/main/java/com/datastax/oss/quarkus/test/CassandraTestResource.java
