Skip to content

Commit 20038c0

Browse files
ulisseslimaulisseslima
authored
Merge pull request #18550 from panos-kakos/JAVA-44239-K
[JAVA-44239]
2 parents 293e4fc + eb15ed6 commit 20038c0

File tree

12 files changed

+331
-466
lines changed

12 files changed

+331
-466
lines changed

‎persistence-modules/spring-data-cassandra/pom.xml

Lines changed: 34 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -9,72 +9,65 @@
99

1010
<parent>
1111
<groupId>com.baeldung</groupId>
12-
<artifactId>parent-spring-5</artifactId>
12+
<artifactId>parent-boot-3</artifactId>
1313
<version>0.0.1-SNAPSHOT</version>
14-
<relativePath>../../parent-spring-5</relativePath>
14+
<relativePath>../../parent-boot-3</relativePath>
1515
</parent>
1616

1717
<dependencies>
1818
<dependency>
1919
<groupId>org.springframework.boot</groupId>
2020
<artifactId>spring-boot-starter-data-cassandra</artifactId>
21-
<version>${spring-boot-starter-data-cassandra.version}</version>
2221
</dependency>
2322
<dependency>
24-
<groupId>org.springframework</groupId>
25-
<artifactId>spring-aop</artifactId>
26-
<version>${spring.version}</version>
23+
<groupId>org.testcontainers</groupId>
24+
<artifactId>testcontainers</artifactId>
25+
<version>${testcontainers.version}</version>
26+
<scope>test</scope>
2727
</dependency>
2828
<dependency>
29-
<groupId>org.springframework</groupId>
30-
<artifactId>spring-test</artifactId>
31-
<version>${spring.version}</version>
29+
<groupId>org.testcontainers</groupId>
30+
<artifactId>cassandra</artifactId>
31+
<version>${testcontainers.version}</version>
3232
<scope>test</scope>
3333
</dependency>
3434
<dependency>
35-
<groupId>org.cassandraunit</groupId>
36-
<artifactId>cassandra-unit-spring</artifactId>
37-
<version>${cassandra-unit-spring.version}</version>
35+
<groupId>org.testcontainers</groupId>
36+
<artifactId>junit-jupiter</artifactId>
37+
<version>${testcontainers.version}</version>
3838
<scope>test</scope>
39-
<exclusions>
40-
<exclusion>
41-
<groupId>org.cassandraunit</groupId>
42-
<artifactId>cassandra-unit</artifactId>
43-
</exclusion>
44-
</exclusions>
4539
</dependency>
4640
<dependency>
47-
<groupId>org.cassandraunit</groupId>
48-
<artifactId>cassandra-unit-shaded</artifactId>
49-
<version>${cassandra-unit-shaded.version}</version>
41+
<groupId>uk.org.webcompere</groupId>
42+
<artifactId>system-stubs-jupiter</artifactId>
43+
<version>${system.stubs.version}</version>
5044
<scope>test</scope>
51-
<exclusions>
52-
<!-- junit4 dependency is excluded as it should to be resolved from -->
53-
<!-- junit-vintage-engine included in parent-modules. -->
54-
<exclusion>
55-
<groupId>junit</groupId>
56-
<artifactId>junit</artifactId>
57-
</exclusion>
58-
</exclusions>
5945
</dependency>
6046
<dependency>
61-
<groupId>org.hectorclient</groupId>
62-
<artifactId>hector-core</artifactId>
63-
<version>${hector-core.version}</version>
64-
<exclusions>
65-
<exclusion>
66-
<artifactId>commons-logging</artifactId>
67-
<groupId>commons-logging</groupId>
68-
</exclusion>
69-
</exclusions>
47+
<groupId>com.datastax.oss</groupId>
48+
<artifactId>java-driver-mapper-runtime</artifactId>
49+
<version>${java-driver-mapper-runtime.version}</version>
50+
</dependency>
51+
<dependency>
52+
<groupId>org.junit.jupiter</groupId>
53+
<artifactId>junit-jupiter-engine</artifactId>
54+
<version>${junit-jupiter.version}</version>
55+
<scope>test</scope>
56+
</dependency>
57+
<dependency>
58+
<groupId>org.junit.jupiter</groupId>
59+
<artifactId>junit-jupiter-api</artifactId>
60+
<version>${junit-jupiter.version}</version>
61+
<scope>test</scope>
7062
</dependency>
7163
</dependencies>
7264

7365
<properties>
74-
<spring-boot-starter-data-cassandra.version>1.3.2.RELEASE</spring-boot-starter-data-cassandra.version>
75-
<cassandra-unit-spring.version>2.1.9.2</cassandra-unit-spring.version>
76-
<cassandra-unit-shaded.version>2.1.9.2</cassandra-unit-shaded.version>
66+
<org.springframework.data.version>4.1.9</org.springframework.data.version>
67+
<testcontainers.version>1.19.5</testcontainers.version>
68+
<system.stubs.version>2.1.5</system.stubs.version>
7769
<hector-core.version>2.0-0</hector-core.version>
70+
<java-driver-mapper-runtime.version>4.17.0</java-driver-mapper-runtime.version>
7871
</properties>
7972

8073
</project>

‎persistence-modules/spring-data-cassandra/src/main/java/com/baeldung/spring/data/cassandra/SpringCassandraApplication.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
package com.baeldung.spring.data.cassandra;
2+
3+
import org.springframework.boot.SpringApplication;
4+
import org.springframework.boot.autoconfigure.SpringBootApplication;
5+
6+
@SpringBootApplication
7+
public class SpringCassandraApplication {
8+
9+
public static void main(String[] args) {
10+
SpringApplication.run(SpringCassandraApplication.class, args);
11+
}
12+
13+
}

‎persistence-modules/spring-data-cassandra/src/main/java/com/baeldung/spring/data/cassandra/config/CassandraConfig.java

Lines changed: 0 additions & 45 deletions
This file was deleted.

‎persistence-modules/spring-data-cassandra/src/main/java/com/baeldung/spring/data/cassandra/model/Book.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,12 @@
44
import java.util.Set;
55
import java.util.UUID;
66

7-
import org.springframework.cassandra.core.Ordering;
8-
import org.springframework.cassandra.core.PrimaryKeyType;
9-
import org.springframework.data.cassandra.mapping.Column;
10-
import org.springframework.data.cassandra.mapping.PrimaryKeyColumn;
11-
import org.springframework.data.cassandra.mapping.Table;
7+
import org.springframework.data.cassandra.core.cql.Ordering;
8+
import org.springframework.data.cassandra.core.cql.PrimaryKeyType;
9+
import org.springframework.data.cassandra.core.mapping.Column;
10+
import org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn;
11+
import org.springframework.data.cassandra.core.mapping.Table;
12+
1213

1314
@Table
1415
public class Book {
@@ -25,6 +26,9 @@ public class Book {
2526
@Column
2627
private Set<String> tags = new HashSet<>();
2728

29+
public Book() {
30+
}
31+
2832
public Book(final UUID id, final String title, final String publisher, final Set<String> tags) {
2933
this.id = id;
3034
this.title = title;

‎persistence-modules/spring-data-cassandra/src/main/java/com/baeldung/spring/data/cassandra/repository/BookRepository.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
package com.baeldung.spring.data.cassandra.repository;
22

3-
import com.baeldung.spring.data.cassandra.model.Book;
3+
import java.util.UUID;
4+
45
import org.springframework.data.cassandra.repository.CassandraRepository;
5-
import org.springframework.data.cassandra.repository.Query;
66
import org.springframework.stereotype.Repository;
77

8+
import com.baeldung.spring.data.cassandra.model.Book;
9+
810
@Repository
9-
public interface BookRepository extends CassandraRepository<Book> {
11+
public interface BookRepository extends CassandraRepository<Book, UUID> {
1012

11-
@Query("select * from book where title = ?0 and publisher=?1")
1213
Iterable<Book> findByTitleAndPublisher(String title, String publisher);
1314

1415
}

‎persistence-modules/spring-data-cassandra/src/main/resources/cassandra.properties

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1-
cassandra.contactpoints=127.0.0.1
2-
cassandra.port=9142
3-
cassandra.keyspace=testKeySpace
1+
spring.cassandra.keyspace-name=${CASSANDRA_KEYSPACE_NAME}
2+
spring.cassandra.contact-points=${CASSANDRA_CONTACT_POINTS}
3+
spring.cassandra.port=${CASSANDRA_PORT}
4+
spring.cassandra.local-datacenter=datacenter1

‎persistence-modules/spring-data-cassandra/src/test/java/com/baeldung/SpringContextTest.java

Lines changed: 0 additions & 67 deletions
This file was deleted.

0 commit comments

Comments
 (0)