Create spring-boot-data-cassandra module

Author: snicoll

settings.gradle

@@ -52,6 +52,7 @@ include "spring-boot-project:spring-boot-autoconfigure-all"
 include "spring-boot-project:spring-boot-batch"
 include "spring-boot-project:spring-boot-cassandra"
 include "spring-boot-project:spring-boot-couchbase"
+include "spring-boot-project:spring-boot-data-cassandra"
 include "spring-boot-project:spring-boot-data-jpa"
 include "spring-boot-project:spring-boot-data-ldap"
 include "spring-boot-project:spring-boot-data-mongodb"

spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

@@ -20,8 +20,8 @@ dependencies {
 	optional(project(":spring-boot-project:spring-boot-activemq"))
 	optional(project(":spring-boot-project:spring-boot-amqp"))
 	optional(project(":spring-boot-project:spring-boot-artemis"))
-	optional(project(":spring-boot-project:spring-boot-cassandra"))
 	optional(project(":spring-boot-project:spring-boot-couchbase"))
+	optional(project(":spring-boot-project:spring-boot-data-cassandra"))
 	optional(project(":spring-boot-project:spring-boot-data-jpa"))
 	optional(project(":spring-boot-project:spring-boot-data-mongodb"))
 	optional(project(":spring-boot-project:spring-boot-elasticsearch"))
@@ -140,9 +140,6 @@ dependencies {
 	optional("org.springframework:spring-webmvc")
 	optional("org.springframework.amqp:spring-rabbit")
 	optional("org.springframework.batch:spring-batch-core")
-	optional("org.springframework.data:spring-data-cassandra") {
-		exclude group: "org.slf4j", module: "jcl-over-slf4j"
-	}
 	optional("org.springframework.data:spring-data-couchbase")
 	optional("org.springframework.data:spring-data-jpa")
 	optional("org.springframework.data:spring-data-ldap")

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraHealthContributorAutoConfiguration.java

@@ -24,7 +24,6 @@
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.data.cassandra.CassandraDataAutoConfiguration;
 import org.springframework.context.annotation.Import;
 
 /**
@@ -35,9 +34,9 @@
  * @author Stephane Nicoll
  * @since 2.1.0
  */
-@AutoConfiguration(
-		after = { CassandraDataAutoConfiguration.class, CassandraReactiveHealthContributorAutoConfiguration.class },
-		afterName = "org.springframework.boot.cassandra.autoconfigure.CassandraAutoConfiguration")
+@AutoConfiguration(afterName = { "org.springframework.boot.data.cassandra.autoconfigure.CassandraDataAutoConfiguration",
+		"org.springframework.boot.actuate.autoconfigure.cassandra.CassandraReactiveHealthContributorAutoConfiguration",
+		"org.springframework.boot.cassandra.autoconfigure.CassandraAutoConfiguration" })
 @ConditionalOnClass(CqlSession.class)
 @ConditionalOnEnabledHealthIndicator("cassandra")
 @Import(CassandraDriverConfiguration.class)

spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cassandra/CassandraReactiveHealthContributorAutoConfiguration.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.data.cassandra.CassandraReactiveDataAutoConfiguration;
+import org.springframework.boot.data.cassandra.autoconfigure.CassandraReactiveDataAutoConfiguration;
 import org.springframework.context.annotation.Import;
 
 /**

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/integrationtest/WebEndpointsAutoConfigurationIntegrationTests.java

@@ -24,7 +24,6 @@
 import org.springframework.boot.actuate.health.HealthEndpointWebExtension;
 import org.springframework.boot.actuate.health.ReactiveHealthEndpointWebExtension;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.autoconfigure.data.cassandra.CassandraDataAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.neo4j.Neo4jDataAutoConfiguration;
 import org.springframework.boot.autoconfigure.data.neo4j.Neo4jRepositoriesAutoConfiguration;
@@ -33,6 +32,7 @@
 import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
 import org.springframework.boot.cassandra.autoconfigure.CassandraAutoConfiguration;
 import org.springframework.boot.context.annotation.UserConfigurations;
+import org.springframework.boot.data.cassandra.autoconfigure.CassandraDataAutoConfiguration;
 import org.springframework.boot.data.mongodb.autoconfigure.MongoDataAutoConfiguration;
 import org.springframework.boot.data.mongodb.autoconfigure.MongoReactiveDataAutoConfiguration;
 import org.springframework.boot.flyway.autoconfigure.FlywayAutoConfiguration;

spring-boot-project/spring-boot-actuator/build.gradle

@@ -25,6 +25,7 @@ dependencies {
 	dockerTestImplementation("org.testcontainers:testcontainers")
 
 	optional(project(":spring-boot-project:spring-boot-activemq"))
+	optional(project(":spring-boot-project:spring-boot-data-cassandra"))
 	optional(project(":spring-boot-project:spring-boot-flyway"))
 	optional(project(":spring-boot-project:spring-boot-http"))
 	optional(project(":spring-boot-project:spring-boot-integration"))
@@ -37,9 +38,6 @@ dependencies {
 	optional(project(":spring-boot-project:spring-boot-undertow"))
 	optional(project(":spring-boot-project:spring-boot-validation"))
 	optional(project(":spring-boot-project:spring-boot-webmvc"))
-	optional("org.apache.cassandra:java-driver-core") {
-		exclude group: "org.slf4j", module: "jcl-over-slf4j"
-	}
 	optional("com.fasterxml.jackson.core:jackson-databind")
 	optional("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
 	optional("com.github.ben-manes.caffeine:caffeine")
@@ -86,9 +84,6 @@ dependencies {
 	optional("org.springframework:spring-webmvc")
 	optional("org.springframework.graphql:spring-graphql")
 	optional("org.springframework.amqp:spring-rabbit")
-	optional("org.springframework.data:spring-data-cassandra") {
-		exclude group: "org.slf4j", module: "jcl-over-slf4j"
-	}
 	optional("org.springframework.data:spring-data-couchbase")
 	optional("org.springframework.data:spring-data-elasticsearch")  {
 		exclude(group: "commons-logging", module: "commons-logging")

spring-boot-project/spring-boot-autoconfigure-all/build.gradle

@@ -33,7 +33,6 @@ dependencies {
 	dockerTestImplementation("org.junit.jupiter:junit-jupiter")
 	dockerTestImplementation("org.mockito:mockito-core")
 	dockerTestImplementation("org.springframework:spring-test")
-	dockerTestImplementation("org.testcontainers:cassandra")
 	dockerTestImplementation("org.testcontainers:couchbase")
 	dockerTestImplementation("org.testcontainers:elasticsearch")
 	dockerTestImplementation("org.testcontainers:junit-jupiter")
@@ -43,7 +42,6 @@ dependencies {
 
 	optional(project(":spring-boot-project:spring-boot-activemq"))
 	optional(project(":spring-boot-project:spring-boot-artemis"))
-	optional(project(":spring-boot-project:spring-boot-cassandra"))
 	optional(project(":spring-boot-project:spring-boot-couchbase"))
 	optional(project(":spring-boot-project:spring-boot-data-jpa"))
 	optional(project(":spring-boot-project:spring-boot-data-mongodb"))
@@ -173,9 +171,6 @@ dependencies {
 		exclude group: "org.jboss.spec.javax.transaction", module: "jboss-transaction-api_1.2_spec"
 	}
 	optional("org.springframework.data:spring-data-rest-webmvc")
-	optional("org.springframework.data:spring-data-cassandra") {
-		exclude group: "org.slf4j", module: "jcl-over-slf4j"
-	}
 	optional("org.springframework.data:spring-data-elasticsearch") {
 		exclude group: "org.elasticsearch.client", module: "transport"
 	}

spring-boot-project/spring-boot-autoconfigure-all/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -19,264 +19,6 @@
       "description": "Whether to enable the PersistenceExceptionTranslationPostProcessor.",
       "defaultValue": true
     },
-    {
-      "name": "spring.data.cassandra.compression",
-      "defaultValue": "none",
-      "deprecation": {
-        "replacement": "spring.cassandra.compression",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.config",
-      "type": "org.springframework.core.io.Resource",
-      "deprecation": {
-        "replacement": "spring.cassandra.config",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.connection.connect-timeout",
-      "defaultValue": "5s",
-      "deprecation": {
-        "replacement": "spring.cassandra.connection.connect-timeout",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.connection.init-query-timeout",
-      "defaultValue": "5s",
-      "deprecation": {
-        "replacement": "spring.cassandra.connection.init-query-timeout",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.contact-points",
-      "defaultValue": [
-        "127.0.0.1:9042"
-      ],
-      "deprecation": {
-        "replacement": "spring.cassandra.contact-points",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.controlconnection.timeout",
-      "defaultValue": "5s",
-      "deprecation": {
-        "replacement": "spring.cassandra.controlconnection.timeout",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.jmx-enabled",
-      "type": "java.lang.Boolean",
-      "description": "Whether to enable JMX reporting. Default to false as Cassandra JMX reporting is not compatible with Dropwizard Metrics.",
-      "deprecation": {
-        "reason": "Cassandra no longer provides JMX metrics.",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.keyspace-name",
-      "type": "java.lang.String",
-      "deprecation": {
-        "replacement": "spring.cassandra.keyspace-name",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.load-balancing-policy",
-      "type": "java.lang.Class",
-      "description": "Class name of the load balancing policy. The class must have a default constructor.",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.local-datacenter",
-      "type": "java.lang.String",
-      "deprecation": {
-        "replacement": "spring.cassandra.local-datacenter",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.password",
-      "type": "java.lang.String",
-      "deprecation": {
-        "replacement": "spring.cassandra.password",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.pool.heartbeat-interval",
-      "defaultValue": "30s",
-      "deprecation": {
-        "replacement": "spring.cassandra.pool.heartbeat-interval",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.pool.idle-timeout",
-      "defaultValue": "5s",
-      "deprecation": {
-        "replacement": "spring.cassandra.pool.idle-timeout",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.pool.max-queue-size",
-      "type": "java.lang.Integer",
-      "deprecation": {
-        "replacement": "spring.cassandra.request.throttler.max-queue-size",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.pool.pool-timeout",
-      "type": "java.time.Duration",
-      "description": "Pool timeout when trying to acquire a connection from a host's pool.",
-      "deprecation": {
-        "reason": "No longer available.",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.port",
-      "type": "java.lang.Integer",
-      "deprecation": {
-        "replacement": "spring.cassandra.port",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.reconnection-policy",
-      "type": "java.lang.Class",
-      "description": "Class name of the reconnection policy. The class must have a default constructor.",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.repositories.type",
-      "type": "org.springframework.boot.autoconfigure.data.RepositoryType",
-      "description": "Type of Cassandra repositories to enable.",
-      "defaultValue": "auto"
-    },
-    {
-      "name": "spring.data.cassandra.request.consistency",
-      "type": "com.datastax.oss.driver.api.core.DefaultConsistencyLevel",
-      "deprecation": {
-        "replacement": "spring.cassandra.request.consistency",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.request.page-size",
-      "defaultValue": 5000,
-      "deprecation": {
-        "replacement": "spring.cassandra.request.page-size",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.request.serial-consistency",
-      "type": "com.datastax.oss.driver.api.core.DefaultConsistencyLevel",
-      "deprecation": {
-        "replacement": "spring.cassandra.request.serial-consistency",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.request.throttler.drain-interval",
-      "type": "java.time.Duration",
-      "deprecation": {
-        "replacement": "spring.cassandra.request.throttler.drain-interval",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.request.throttler.max-concurrent-requests",
-      "type": "java.lang.Integer",
-      "deprecation": {
-        "replacement": "spring.cassandra.request.throttler.max-concurrent-requests",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.request.throttler.max-queue-size",
-      "type": "java.lang.Integer",
-      "deprecation": {
-        "replacement": "spring.cassandra.request.throttler.max-queue-size",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.request.throttler.max-requests-per-second",
-      "type": "java.lang.Integer",
-      "deprecation": {
-        "replacement": "spring.cassandra.request.throttler.max-requests-per-second",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.request.throttler.type",
-      "defaultValue": "none",
-      "deprecation": {
-        "replacement": "spring.cassandra.request.throttler.type",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.request.timeout",
-      "defaultValue": "2s",
-      "deprecation": {
-        "replacement": "spring.cassandra.request.timeout",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.retry-policy",
-      "type": "java.lang.Class",
-      "description": "Class name of the retry policy. The class must have a default constructor.",
-      "deprecation": {
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.schema-action",
-      "type": "java.lang.String",
-      "deprecation": {
-        "replacement": "spring.cassandra.schema-action",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.session-name",
-      "type": "java.lang.String",
-      "deprecation": {
-        "replacement": "spring.cassandra.session-name",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.ssl",
-      "type": "java.lang.Boolean",
-      "deprecation": {
-        "replacement": "spring.cassandra.ssl.enabled",
-        "level": "error"
-      }
-    },
-    {
-      "name": "spring.data.cassandra.username",
-      "type": "java.lang.String",
-      "deprecation": {
-        "replacement": "spring.cassandra.username",
-        "level": "error"
-      }
-    },
     {
       "name": "spring.data.couchbase.consistency",
       "type": "org.springframework.data.couchbase.core.query.Consistency",