From 375015808dac72e76008e23a88029226f7aa56fd Mon Sep 17 00:00:00 2001
From: timis1 <12120641+timis1@users.noreply.github.com>
Date: Sat, 9 Mar 2024 16:46:05 +0200
Subject: [PATCH] JAVA-29179 Upgrade spring-data-cassandra-2 to Spring Boot 3
(#16066)
---
.../spring-data-cassandra-2/pom.xml | 13 ++++++-----
.../src/main/resources/application.properties | 8 +++----
.../ProductRepositoryNestedLiveTest.java | 23 +++++++++++--------
.../baeldung/objectmapper/MapperLiveTest.java | 9 ++++----
.../CassandraNestedLiveTest.java | 19 ++++++++-------
.../CassandraSimpleLiveTest.java | 9 ++++----
.../src/test/resources/application.properties | 10 ++++----
7 files changed, 46 insertions(+), 45 deletions(-)
diff --git a/persistence-modules/spring-data-cassandra-2/pom.xml b/persistence-modules/spring-data-cassandra-2/pom.xml
index e6f7691c17..91702f49da 100644
--- a/persistence-modules/spring-data-cassandra-2/pom.xml
+++ b/persistence-modules/spring-data-cassandra-2/pom.xml
@@ -11,9 +11,9 @@
com.baeldung
- parent-boot-2
+ parent-boot-3
0.0.1-SNAPSHOT
- ../../parent-boot-2
+ ../../parent-boot-3
@@ -63,7 +63,7 @@
com.datastax.oss
java-driver-mapper-runtime
- 4.15.0
+ 4.17.0
org.junit.jupiter
@@ -99,10 +99,11 @@
- 3.4.15
- 1.19.0
- 1.1.0
+ 4.1.9
+ 1.19.5
+ 2.1.5
5.9.3
+ org.baeldung.springcassandra.SpringCassandraApplication
\ No newline at end of file
diff --git a/persistence-modules/spring-data-cassandra-2/src/main/resources/application.properties b/persistence-modules/spring-data-cassandra-2/src/main/resources/application.properties
index bea2021070..20a107cb53 100644
--- a/persistence-modules/spring-data-cassandra-2/src/main/resources/application.properties
+++ b/persistence-modules/spring-data-cassandra-2/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-spring.data.cassandra.keyspace-name=${CASSANDRA_KEYSPACE_NAME}
-spring.data.cassandra.contact-points=${CASSANDRA_CONTACT_POINTS}
-spring.data.cassandra.port=${CASSANDRA_PORT}
-spring.data.cassandra.local-datacenter=datacenter1
\ No newline at end of file
+spring.cassandra.keyspace-name=${CASSANDRA_KEYSPACE_NAME}
+spring.cassandra.contact-points=${CASSANDRA_CONTACT_POINTS}
+spring.cassandra.port=${CASSANDRA_PORT}
+spring.cassandra.local-datacenter=datacenter1
\ No newline at end of file
diff --git a/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/cassandra/inquery/ProductRepositoryNestedLiveTest.java b/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/cassandra/inquery/ProductRepositoryNestedLiveTest.java
index 3d99782afd..531a0241da 100644
--- a/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/cassandra/inquery/ProductRepositoryNestedLiveTest.java
+++ b/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/cassandra/inquery/ProductRepositoryNestedLiveTest.java
@@ -14,6 +14,8 @@ import org.testcontainers.containers.CassandraContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
+import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.UUID;
@@ -30,14 +32,14 @@ class ProductRepositoryNestedLiveTest {
private static final String KEYSPACE_NAME = "mynamespace";
@Container
- private static final CassandraContainer cassandra = (CassandraContainer) new CassandraContainer("cassandra:3.11.2")
+ private static final CassandraContainer> cassandra = new CassandraContainer<>("cassandra:3.11.2")
.withExposedPorts(9042);
@BeforeAll
static void setupCassandraConnectionProperties() {
- System.setProperty("spring.data.cassandra.keyspace-name", KEYSPACE_NAME);
- System.setProperty("spring.data.cassandra.contact-points", cassandra.getHost());
- System.setProperty("spring.data.cassandra.port", String.valueOf(cassandra.getMappedPort(9042)));
+ System.setProperty("spring.cassandra.keyspace-name", KEYSPACE_NAME);
+ System.setProperty("spring.cassandra.contact-points", cassandra.getHost());
+ System.setProperty("spring.cassandra.port", String.valueOf(cassandra.getMappedPort(9042)));
createKeyspace(cassandra.getCluster());
}
@@ -72,9 +74,9 @@ class ProductRepositoryNestedLiveTest {
Product product3 = new Product(productId3, "Banana", "Banana v1", 5.5);
Product product4 = new Product(productId3, "Banana v2", "Banana v2", 15.5);
- productRepository.saveAll(List.of(product1, product2, product3, product4));
+ productRepository.saveAll(Arrays.asList(product1, product2, product3, product4));
- List existingProducts = productRepository.findByProductIds(List.of(productId1, productId2));
+ List existingProducts = productRepository.findByProductIds(Arrays.asList(productId1, productId2));
assertEquals(2, existingProducts.size());
assertTrue(existingProducts.contains(product1));
assertTrue(existingProducts.contains(product2));
@@ -89,10 +91,10 @@ class ProductRepositoryNestedLiveTest {
Product product3 = new Product(productId2, "Banana", "Banana v1", 5.5);
Product product4 = new Product(productId2, "Banana v2", "Banana v2", 15.5);
- productRepository.saveAll(List.of(product1, product2, product3, product4));
+ productRepository.saveAll(Arrays.asList(product1, product2, product3, product4));
List existingProducts = productRepository.findByProductIdAndNames(productId1,
- List.of(product1.getProductName(), product2.getProductName()));
+ Arrays.asList(product1.getProductName(), product2.getProductName()));
assertEquals(2, existingProducts.size());
assertTrue(existingProducts.contains(product1));
assertTrue(existingProducts.contains(product2));
@@ -107,10 +109,11 @@ class ProductRepositoryNestedLiveTest {
Product product3 = new Product(productId2, "Banana", "Banana v1", 5.5);
Product product4 = new Product(productId2, "Banana v2", "Banana v2", 15.5);
- productRepository.saveAll(List.of(product1, product2, product4));
+ productRepository.saveAll(Arrays.asList(product1, product2, product4));
List existingProducts = productRepository.findByProductIdAndNames(productId1,
- List.of(product3.getProductName()));
+ Collections.singletonList(product3.getProductName())
+ );
assertEquals(0, existingProducts.size());
}
}
diff --git a/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/objectmapper/MapperLiveTest.java b/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/objectmapper/MapperLiveTest.java
index 50681d36c5..bac503b50f 100644
--- a/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/objectmapper/MapperLiveTest.java
+++ b/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/objectmapper/MapperLiveTest.java
@@ -25,13 +25,13 @@ public class MapperLiveTest {
private static final String KEYSPACE_NAME = "baeldung";
@Container
- private static final CassandraContainer cassandra = (CassandraContainer) new CassandraContainer("cassandra:3.11.2").withExposedPorts(9042);
+ private static final CassandraContainer> cassandra = new CassandraContainer<>("cassandra:3.11.2").withExposedPorts(9042);
@BeforeAll
static void setupCassandraConnectionProperties() {
- System.setProperty("spring.data.cassandra.keyspace-name", KEYSPACE_NAME);
- System.setProperty("spring.data.cassandra.contact-points", cassandra.getHost());
- System.setProperty("spring.data.cassandra.port", String.valueOf(cassandra.getMappedPort(9042)));
+ System.setProperty("spring.cassandra.keyspace-name", KEYSPACE_NAME);
+ System.setProperty("spring.cassandra.contact-points", cassandra.getHost());
+ System.setProperty("spring.cassandra.port", String.valueOf(cassandra.getMappedPort(9042)));
setupCassandra(new InetSocketAddress(cassandra.getHost(), cassandra.getMappedPort(9042)), cassandra.getLocalDatacenter());
}
@@ -92,5 +92,4 @@ public class MapperLiveTest {
.all();
Assertions.assertEquals(1, retrievedUsers.size());
}
-
}
\ No newline at end of file
diff --git a/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/springcassandra/CassandraNestedLiveTest.java b/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/springcassandra/CassandraNestedLiveTest.java
index 60f733794d..53787790d8 100644
--- a/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/springcassandra/CassandraNestedLiveTest.java
+++ b/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/springcassandra/CassandraNestedLiveTest.java
@@ -14,6 +14,7 @@ import org.testcontainers.containers.CassandraContainer;
import org.testcontainers.junit.jupiter.Container;
import org.testcontainers.junit.jupiter.Testcontainers;
+import java.util.Collections;
import java.util.List;
import java.util.UUID;
@@ -28,14 +29,14 @@ class CassandraNestedLiveTest {
private static final String KEYSPACE_NAME = "test";
@Container
- private static final CassandraContainer cassandra = (CassandraContainer) new CassandraContainer("cassandra:3.11.2")
+ private static final CassandraContainer> cassandra = new CassandraContainer<>("cassandra:3.11.2")
.withExposedPorts(9042);
@BeforeAll
static void setupCassandraConnectionProperties() {
- System.setProperty("spring.data.cassandra.keyspace-name", KEYSPACE_NAME);
- System.setProperty("spring.data.cassandra.contact-points", cassandra.getContainerIpAddress());
- System.setProperty("spring.data.cassandra.port", String.valueOf(cassandra.getMappedPort(9042)));
+ System.setProperty("spring.cassandra.keyspace-name", KEYSPACE_NAME);
+ System.setProperty("spring.cassandra.contact-points", cassandra.getContainerIpAddress());
+ System.setProperty("spring.cassandra.port", String.valueOf(cassandra.getMappedPort(9042)));
createKeyspace(cassandra.getCluster());
}
@@ -70,7 +71,7 @@ class CassandraNestedLiveTest {
carRepository.save(newCar);
- List savedCars = carRepository.findAllById(List.of(carId));
+ List savedCars = carRepository.findAllById(Collections.singletonList(carId));
assertThat(savedCars.get(0)).isEqualTo(newCar);
}
@@ -82,7 +83,7 @@ class CassandraNestedLiveTest {
existingCar.setModel("X-Trail");
carRepository.save(existingCar);
- List savedCars = carRepository.findAllById(List.of(carId));
+ List savedCars = carRepository.findAllById(Collections.singletonList(carId));
assertThat(savedCars.get(0).getModel()).isEqualTo("X-Trail");
}
@@ -93,10 +94,8 @@ class CassandraNestedLiveTest {
carRepository.delete(existingCar);
- List savedCars = carRepository.findAllById(List.of(carId));
- assertThat(savedCars.isEmpty()).isTrue();
+ List savedCars = carRepository.findAllById(Collections.singletonList(carId));
+ assertThat(savedCars).isEmpty();
}
-
}
-
}
diff --git a/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/springcassandra/CassandraSimpleLiveTest.java b/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/springcassandra/CassandraSimpleLiveTest.java
index 02dc1f5a87..9d5b31ed03 100644
--- a/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/springcassandra/CassandraSimpleLiveTest.java
+++ b/persistence-modules/spring-data-cassandra-2/src/test/java/org/baeldung/springcassandra/CassandraSimpleLiveTest.java
@@ -20,14 +20,14 @@ class CassandraSimpleLiveTest {
private static final String KEYSPACE_NAME = "test";
@Container
- private static final CassandraContainer cassandra = (CassandraContainer) new CassandraContainer("cassandra:3.11.2")
+ private static final CassandraContainer> cassandra = new CassandraContainer<>("cassandra:3.11.2")
.withExposedPorts(9042);
@BeforeAll
static void setupCassandraConnectionProperties() {
- System.setProperty("spring.data.cassandra.keyspace-name", KEYSPACE_NAME);
- System.setProperty("spring.data.cassandra.contact-points", cassandra.getContainerIpAddress());
- System.setProperty("spring.data.cassandra.port", String.valueOf(cassandra.getMappedPort(9042)));
+ System.setProperty("spring.cassandra.keyspace-name", KEYSPACE_NAME);
+ System.setProperty("spring.cassandra.contact-points", cassandra.getContainerIpAddress());
+ System.setProperty("spring.cassandra.port", String.valueOf(cassandra.getMappedPort(9042)));
createKeyspace(cassandra.getCluster());
}
@@ -43,5 +43,4 @@ class CassandraSimpleLiveTest {
void givenCassandraContainer_whenSpringContextIsBootstrapped_thenContainerIsRunningWithNoExceptions() {
assertThat(cassandra.isRunning()).isTrue();
}
-
}
diff --git a/persistence-modules/spring-data-cassandra-2/src/test/resources/application.properties b/persistence-modules/spring-data-cassandra-2/src/test/resources/application.properties
index 58f1fe2ab7..e6bc7b47f4 100644
--- a/persistence-modules/spring-data-cassandra-2/src/test/resources/application.properties
+++ b/persistence-modules/spring-data-cassandra-2/src/test/resources/application.properties
@@ -1,5 +1,5 @@
-spring.data.cassandra.keyspace-name=${CASSANDRA_KEYSPACE_NAME}
-spring.data.cassandra.contact-points=${CASSANDRA_CONTACT_POINTS}
-spring.data.cassandra.port=${CASSANDRA_PORT}
-spring.data.cassandra.local-datacenter=datacenter1
-spring.data.cassandra.schema-action=create_if_not_exists
\ No newline at end of file
+spring.cassandra.keyspace-name=${CASSANDRA_KEYSPACE_NAME}
+spring.cassandra.contact-points=${CASSANDRA_CONTACT_POINTS}
+spring.cassandra.port=${CASSANDRA_PORT}
+spring.cassandra.local-datacenter=datacenter1
+spring.cassandra.schema-action=create_if_not_exists
\ No newline at end of file