Spring/spring-data-cassandra
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACASS-329 - Set up 2.0 development.

Browse Source
This commit is contained in:
Mark Paluch
2016-09-13 17:42:56 +02:00
parent 8ff1f0e3fc
commit 3c80b2cb80
5 changed files with 27 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pom.xml
View File

@@ -6,13 +6,13 @@
<parent>
<groupId>org.springframework.data.build</groupId>
<artifactId>spring-data-parent</artifactId>
<version>1.9.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
<relativePath>../spring-data-build/parent/pom.xml</relativePath>
</parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-cassandra-parent</artifactId>
<version>1.5.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Spring Data for Apache Cassandra</name>
@@ -76,8 +76,7 @@
<failsafe.version>2.16</failsafe.version>
<multithreadedtc.version>1.01</multithreadedtc.version>
<project.type>multi</project.type>
<springdata.commons>1.13.0.BUILD-SNAPSHOT</springdata.commons>
<assertj>3.5.2</assertj>
<springdata.commons>2.0.0.BUILD-SNAPSHOT</springdata.commons>
</properties>
<repositories>
@@ -186,7 +185,7 @@
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
<version>4.2.0.Final</version>
<version>5.2.4.Final</version>
<scope>test</scope>
</dependency>

15
spring-cql/pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-cassandra-parent</artifactId>
<version>1.5.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -18,10 +18,6 @@
<description>Raw Cassandra CQL Support for Spring Core</description>
<url>https://github.com/spring-projects/spring-data-cassandra/tree/master/spring-cql</url>
<properties>
<validation>1.0.0.GA</validation>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework</groupId>
@@ -48,6 +44,15 @@
<artifactId>spring-data-commons</artifactId>
<version>${springdata.commons}</version>
</dependency>
<!-- Reactor -->
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
<version>${reactor}</version>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.datastax.cassandra</groupId>
<artifactId>cassandra-driver-core</artifactId>

2
spring-data-cassandra-distribution/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-cassandra-parent</artifactId>
<version>1.5.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

12
spring-data-cassandra/pom.xml
View File

@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-cassandra-parent</artifactId>
<version>1.5.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -19,7 +19,7 @@
<url>https://github.com/spring-projects/spring-data-cassandra/tree/master/spring-data-cassandra</url>
<properties>
<validation>1.0.0.GA</validation>
<validation>1.1.0.Final</validation>
</properties>
<dependencies>
@@ -71,6 +71,14 @@
<optional>true</optional>
</dependency>
<!-- Reactor -->
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
<version>${reactor}</version>
<optional>true</optional>
</dependency>
<!-- CDI -->
<dependency>
<groupId>javax.enterprise</groupId>

4
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java
View File

@@ -471,8 +471,8 @@ public class MappingCassandraConverter extends AbstractCassandraConverter
CassandraPersistentProperty idProperty = entity.getIdProperty();
if (idProperty != null) {
return accessor.getProperty(idProperty, idProperty.isCompositePrimaryKey() ? idProperty.getType()
: getCodec(idProperty).getJavaType().getRawType());
return accessor.getProperty(idProperty, (Class<?>) (idProperty.isCompositePrimaryKey() ? idProperty.getType()
: getCodec(idProperty).getJavaType().getRawType()));
}
// if the class doesn't have an id property, then it's using MapId