Skip to content

Commit e3387ac

Browse files
snicollsnicoll
committed
Create spring-boot-data-cassandra module
1 parent e611dee commit e3387ac

File tree

36 files changed

+372
-379
lines changed

36 files changed

+372
-379
lines changed

Diff for: ‎settings.gradle

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ include "spring-boot-project:spring-boot-autoconfigure-all"
5252
include "spring-boot-project:spring-boot-batch"
5353
include "spring-boot-project:spring-boot-cassandra"
5454
include "spring-boot-project:spring-boot-couchbase"
55+
include "spring-boot-project:spring-boot-data-cassandra"
5556
include "spring-boot-project:spring-boot-data-jpa"
5657
include "spring-boot-project:spring-boot-data-ldap"
5758
include "spring-boot-project:spring-boot-data-mongodb"

Diff for: ‎spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle

+1-4
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ dependencies {
2020
optional(project(":spring-boot-project:spring-boot-activemq"))
2121
optional(project(":spring-boot-project:spring-boot-amqp"))
2222
optional(project(":spring-boot-project:spring-boot-artemis"))
23-
optional(project(":spring-boot-project:spring-boot-cassandra"))
2423
optional(project(":spring-boot-project:spring-boot-couchbase"))
24+
optional(project(":spring-boot-project:spring-boot-data-cassandra"))
2525
optional(project(":spring-boot-project:spring-boot-data-jpa"))
2626
optional(project(":spring-boot-project:spring-boot-data-mongodb"))
2727
optional(project(":spring-boot-project:spring-boot-elasticsearch"))
@@ -140,9 +140,6 @@ dependencies {
140140
optional("org.springframework:spring-webmvc")
141141
optional("org.springframework.amqp:spring-rabbit")
142142
optional("org.springframework.batch:spring-batch-core")
143-
optional("org.springframework.data:spring-data-cassandra") {
144-
exclude group: "org.slf4j", module: "jcl-over-slf4j"
145-
}
146143
optional("org.springframework.data:spring-data-couchbase")
147144
optional("org.springframework.data:spring-data-jpa")
148145
optional("org.springframework.data:spring-data-ldap")

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.springframework.boot.autoconfigure.AutoConfiguration;
2525
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
27-
import org.springframework.boot.autoconfigure.data.cassandra.CassandraDataAutoConfiguration;
2827
import org.springframework.context.annotation.Import;
2928

3029
/**
@@ -35,9 +34,9 @@
3534
* @author Stephane Nicoll
3635
* @since 2.1.0
3736
*/
38-
@AutoConfiguration(
39-
after = { CassandraDataAutoConfiguration.class, CassandraReactiveHealthContributorAutoConfiguration.class },
40-
afterName = "org.springframework.boot.cassandra.autoconfigure.CassandraAutoConfiguration")
37+
@AutoConfiguration(afterName = { "org.springframework.boot.data.cassandra.autoconfigure.CassandraDataAutoConfiguration",
38+
"org.springframework.boot.actuate.autoconfigure.cassandra.CassandraReactiveHealthContributorAutoConfiguration",
39+
"org.springframework.boot.cassandra.autoconfigure.CassandraAutoConfiguration" })
4140
@ConditionalOnClass(CqlSession.class)
4241
@ConditionalOnEnabledHealthIndicator("cassandra")
4342
@Import(CassandraDriverConfiguration.class)

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2022 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
2525
import org.springframework.boot.autoconfigure.AutoConfiguration;
2626
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2727
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
28-
import org.springframework.boot.autoconfigure.data.cassandra.CassandraReactiveDataAutoConfiguration;
28+
import org.springframework.boot.data.cassandra.autoconfigure.CassandraReactiveDataAutoConfiguration;
2929
import org.springframework.context.annotation.Import;
3030

3131
/**

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.springframework.boot.actuate.health.HealthEndpointWebExtension;
2525
import org.springframework.boot.actuate.health.ReactiveHealthEndpointWebExtension;
2626
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
27-
import org.springframework.boot.autoconfigure.data.cassandra.CassandraDataAutoConfiguration;
2827
import org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchDataAutoConfiguration;
2928
import org.springframework.boot.autoconfigure.data.neo4j.Neo4jDataAutoConfiguration;
3029
import org.springframework.boot.autoconfigure.data.neo4j.Neo4jRepositoriesAutoConfiguration;
@@ -33,6 +32,7 @@
3332
import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
3433
import org.springframework.boot.cassandra.autoconfigure.CassandraAutoConfiguration;
3534
import org.springframework.boot.context.annotation.UserConfigurations;
35+
import org.springframework.boot.data.cassandra.autoconfigure.CassandraDataAutoConfiguration;
3636
import org.springframework.boot.data.mongodb.autoconfigure.MongoDataAutoConfiguration;
3737
import org.springframework.boot.data.mongodb.autoconfigure.MongoReactiveDataAutoConfiguration;
3838
import org.springframework.boot.flyway.autoconfigure.FlywayAutoConfiguration;

Diff for: ‎spring-boot-project/spring-boot-actuator/build.gradle

+1-6
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ dependencies {
2525
dockerTestImplementation("org.testcontainers:testcontainers")
2626

2727
optional(project(":spring-boot-project:spring-boot-activemq"))
28+
optional(project(":spring-boot-project:spring-boot-data-cassandra"))
2829
optional(project(":spring-boot-project:spring-boot-flyway"))
2930
optional(project(":spring-boot-project:spring-boot-http"))
3031
optional(project(":spring-boot-project:spring-boot-integration"))
@@ -37,9 +38,6 @@ dependencies {
3738
optional(project(":spring-boot-project:spring-boot-undertow"))
3839
optional(project(":spring-boot-project:spring-boot-validation"))
3940
optional(project(":spring-boot-project:spring-boot-webmvc"))
40-
optional("org.apache.cassandra:java-driver-core") {
41-
exclude group: "org.slf4j", module: "jcl-over-slf4j"
42-
}
4341
optional("com.fasterxml.jackson.core:jackson-databind")
4442
optional("com.fasterxml.jackson.datatype:jackson-datatype-jsr310")
4543
optional("com.github.ben-manes.caffeine:caffeine")
@@ -86,9 +84,6 @@ dependencies {
8684
optional("org.springframework:spring-webmvc")
8785
optional("org.springframework.graphql:spring-graphql")
8886
optional("org.springframework.amqp:spring-rabbit")
89-
optional("org.springframework.data:spring-data-cassandra") {
90-
exclude group: "org.slf4j", module: "jcl-over-slf4j"
91-
}
9287
optional("org.springframework.data:spring-data-couchbase")
9388
optional("org.springframework.data:spring-data-elasticsearch") {
9489
exclude(group: "commons-logging", module: "commons-logging")

Diff for: ‎spring-boot-project/spring-boot-autoconfigure-all/build.gradle

-5
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ dependencies {
3333
dockerTestImplementation("org.junit.jupiter:junit-jupiter")
3434
dockerTestImplementation("org.mockito:mockito-core")
3535
dockerTestImplementation("org.springframework:spring-test")
36-
dockerTestImplementation("org.testcontainers:cassandra")
3736
dockerTestImplementation("org.testcontainers:couchbase")
3837
dockerTestImplementation("org.testcontainers:elasticsearch")
3938
dockerTestImplementation("org.testcontainers:junit-jupiter")
@@ -43,7 +42,6 @@ dependencies {
4342

4443
optional(project(":spring-boot-project:spring-boot-activemq"))
4544
optional(project(":spring-boot-project:spring-boot-artemis"))
46-
optional(project(":spring-boot-project:spring-boot-cassandra"))
4745
optional(project(":spring-boot-project:spring-boot-couchbase"))
4846
optional(project(":spring-boot-project:spring-boot-data-jpa"))
4947
optional(project(":spring-boot-project:spring-boot-data-mongodb"))
@@ -173,9 +171,6 @@ dependencies {
173171
exclude group: "org.jboss.spec.javax.transaction", module: "jboss-transaction-api_1.2_spec"
174172
}
175173
optional("org.springframework.data:spring-data-rest-webmvc")
176-
optional("org.springframework.data:spring-data-cassandra") {
177-
exclude group: "org.slf4j", module: "jcl-over-slf4j"
178-
}
179174
optional("org.springframework.data:spring-data-elasticsearch") {
180175
exclude group: "org.elasticsearch.client", module: "transport"
181176
}

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

-258
Original file line numberDiff line numberDiff line change
@@ -19,264 +19,6 @@
1919
"description": "Whether to enable the PersistenceExceptionTranslationPostProcessor.",
2020
"defaultValue": true
2121
},
22-
{
23-
"name": "spring.data.cassandra.compression",
24-
"defaultValue": "none",
25-
"deprecation": {
26-
"replacement": "spring.cassandra.compression",
27-
"level": "error"
28-
}
29-
},
30-
{
31-
"name": "spring.data.cassandra.config",
32-
"type": "org.springframework.core.io.Resource",
33-
"deprecation": {
34-
"replacement": "spring.cassandra.config",
35-
"level": "error"
36-
}
37-
},
38-
{
39-
"name": "spring.data.cassandra.connection.connect-timeout",
40-
"defaultValue": "5s",
41-
"deprecation": {
42-
"replacement": "spring.cassandra.connection.connect-timeout",
43-
"level": "error"
44-
}
45-
},
46-
{
47-
"name": "spring.data.cassandra.connection.init-query-timeout",
48-
"defaultValue": "5s",
49-
"deprecation": {
50-
"replacement": "spring.cassandra.connection.init-query-timeout",
51-
"level": "error"
52-
}
53-
},
54-
{
55-
"name": "spring.data.cassandra.contact-points",
56-
"defaultValue": [
57-
"127.0.0.1:9042"
58-
],
59-
"deprecation": {
60-
"replacement": "spring.cassandra.contact-points",
61-
"level": "error"
62-
}
63-
},
64-
{
65-
"name": "spring.data.cassandra.controlconnection.timeout",
66-
"defaultValue": "5s",
67-
"deprecation": {
68-
"replacement": "spring.cassandra.controlconnection.timeout",
69-
"level": "error"
70-
}
71-
},
72-
{
73-
"name": "spring.data.cassandra.jmx-enabled",
74-
"type": "java.lang.Boolean",
75-
"description": "Whether to enable JMX reporting. Default to false as Cassandra JMX reporting is not compatible with Dropwizard Metrics.",
76-
"deprecation": {
77-
"reason": "Cassandra no longer provides JMX metrics.",
78-
"level": "error"
79-
}
80-
},
81-
{
82-
"name": "spring.data.cassandra.keyspace-name",
83-
"type": "java.lang.String",
84-
"deprecation": {
85-
"replacement": "spring.cassandra.keyspace-name",
86-
"level": "error"
87-
}
88-
},
89-
{
90-
"name": "spring.data.cassandra.load-balancing-policy",
91-
"type": "java.lang.Class",
92-
"description": "Class name of the load balancing policy. The class must have a default constructor.",
93-
"deprecation": {
94-
"level": "error"
95-
}
96-
},
97-
{
98-
"name": "spring.data.cassandra.local-datacenter",
99-
"type": "java.lang.String",
100-
"deprecation": {
101-
"replacement": "spring.cassandra.local-datacenter",
102-
"level": "error"
103-
}
104-
},
105-
{
106-
"name": "spring.data.cassandra.password",
107-
"type": "java.lang.String",
108-
"deprecation": {
109-
"replacement": "spring.cassandra.password",
110-
"level": "error"
111-
}
112-
},
113-
{
114-
"name": "spring.data.cassandra.pool.heartbeat-interval",
115-
"defaultValue": "30s",
116-
"deprecation": {
117-
"replacement": "spring.cassandra.pool.heartbeat-interval",
118-
"level": "error"
119-
}
120-
},
121-
{
122-
"name": "spring.data.cassandra.pool.idle-timeout",
123-
"defaultValue": "5s",
124-
"deprecation": {
125-
"replacement": "spring.cassandra.pool.idle-timeout",
126-
"level": "error"
127-
}
128-
},
129-
{
130-
"name": "spring.data.cassandra.pool.max-queue-size",
131-
"type": "java.lang.Integer",
132-
"deprecation": {
133-
"replacement": "spring.cassandra.request.throttler.max-queue-size",
134-
"level": "error"
135-
}
136-
},
137-
{
138-
"name": "spring.data.cassandra.pool.pool-timeout",
139-
"type": "java.time.Duration",
140-
"description": "Pool timeout when trying to acquire a connection from a host's pool.",
141-
"deprecation": {
142-
"reason": "No longer available.",
143-
"level": "error"
144-
}
145-
},
146-
{
147-
"name": "spring.data.cassandra.port",
148-
"type": "java.lang.Integer",
149-
"deprecation": {
150-
"replacement": "spring.cassandra.port",
151-
"level": "error"
152-
}
153-
},
154-
{
155-
"name": "spring.data.cassandra.reconnection-policy",
156-
"type": "java.lang.Class",
157-
"description": "Class name of the reconnection policy. The class must have a default constructor.",
158-
"deprecation": {
159-
"level": "error"
160-
}
161-
},
162-
{
163-
"name": "spring.data.cassandra.repositories.type",
164-
"type": "org.springframework.boot.autoconfigure.data.RepositoryType",
165-
"description": "Type of Cassandra repositories to enable.",
166-
"defaultValue": "auto"
167-
},
168-
{
169-
"name": "spring.data.cassandra.request.consistency",
170-
"type": "com.datastax.oss.driver.api.core.DefaultConsistencyLevel",
171-
"deprecation": {
172-
"replacement": "spring.cassandra.request.consistency",
173-
"level": "error"
174-
}
175-
},
176-
{
177-
"name": "spring.data.cassandra.request.page-size",
178-
"defaultValue": 5000,
179-
"deprecation": {
180-
"replacement": "spring.cassandra.request.page-size",
181-
"level": "error"
182-
}
183-
},
184-
{
185-
"name": "spring.data.cassandra.request.serial-consistency",
186-
"type": "com.datastax.oss.driver.api.core.DefaultConsistencyLevel",
187-
"deprecation": {
188-
"replacement": "spring.cassandra.request.serial-consistency",
189-
"level": "error"
190-
}
191-
},
192-
{
193-
"name": "spring.data.cassandra.request.throttler.drain-interval",
194-
"type": "java.time.Duration",
195-
"deprecation": {
196-
"replacement": "spring.cassandra.request.throttler.drain-interval",
197-
"level": "error"
198-
}
199-
},
200-
{
201-
"name": "spring.data.cassandra.request.throttler.max-concurrent-requests",
202-
"type": "java.lang.Integer",
203-
"deprecation": {
204-
"replacement": "spring.cassandra.request.throttler.max-concurrent-requests",
205-
"level": "error"
206-
}
207-
},
208-
{
209-
"name": "spring.data.cassandra.request.throttler.max-queue-size",
210-
"type": "java.lang.Integer",
211-
"deprecation": {
212-
"replacement": "spring.cassandra.request.throttler.max-queue-size",
213-
"level": "error"
214-
}
215-
},
216-
{
217-
"name": "spring.data.cassandra.request.throttler.max-requests-per-second",
218-
"type": "java.lang.Integer",
219-
"deprecation": {
220-
"replacement": "spring.cassandra.request.throttler.max-requests-per-second",
221-
"level": "error"
222-
}
223-
},
224-
{
225-
"name": "spring.data.cassandra.request.throttler.type",
226-
"defaultValue": "none",
227-
"deprecation": {
228-
"replacement": "spring.cassandra.request.throttler.type",
229-
"level": "error"
230-
}
231-
},
232-
{
233-
"name": "spring.data.cassandra.request.timeout",
234-
"defaultValue": "2s",
235-
"deprecation": {
236-
"replacement": "spring.cassandra.request.timeout",
237-
"level": "error"
238-
}
239-
},
240-
{
241-
"name": "spring.data.cassandra.retry-policy",
242-
"type": "java.lang.Class",
243-
"description": "Class name of the retry policy. The class must have a default constructor.",
244-
"deprecation": {
245-
"level": "error"
246-
}
247-
},
248-
{
249-
"name": "spring.data.cassandra.schema-action",
250-
"type": "java.lang.String",
251-
"deprecation": {
252-
"replacement": "spring.cassandra.schema-action",
253-
"level": "error"
254-
}
255-
},
256-
{
257-
"name": "spring.data.cassandra.session-name",
258-
"type": "java.lang.String",
259-
"deprecation": {
260-
"replacement": "spring.cassandra.session-name",
261-
"level": "error"
262-
}
263-
},
264-
{
265-
"name": "spring.data.cassandra.ssl",
266-
"type": "java.lang.Boolean",
267-
"deprecation": {
268-
"replacement": "spring.cassandra.ssl.enabled",
269-
"level": "error"
270-
}
271-
},
272-
{
273-
"name": "spring.data.cassandra.username",
274-
"type": "java.lang.String",
275-
"deprecation": {
276-
"replacement": "spring.cassandra.username",
277-
"level": "error"
278-
}
279-
},
28022
{
28123
"name": "spring.data.couchbase.consistency",
28224
"type": "org.springframework.data.couchbase.core.query.Consistency",

0 commit comments

Comments
 (0)