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

DATACASS-375 - Map UUID to uuid.

Browse Source 
We now map Java's UUID by default to uuid instead of previously timeuuid. The uuid type is a better default after all and comes without the time type restriction.
This commit is contained in:
Mark Paluch
2017-07-05 15:26:18 +02:00
committed by John Blum
parent 6ebbb894c6
commit 57c034be64
4 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraSimpleTypeHolder.java
View File

@@ -20,6 +20,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.UUID;
import java.util.stream.Collectors;
import org.springframework.data.mapping.model.SimpleTypeHolder;
@@ -48,6 +49,7 @@ public class CassandraSimpleTypeHolder extends SimpleTypeHolder {
private static final Map<DataType.Name, DataType> nameToDataType;
static {
CodecRegistry codecRegistry = CodecRegistry.DEFAULT_INSTANCE;
Map<Class<?>, Class<?>> primitiveWrappers = new HashMap<>(8);
@@ -97,8 +99,8 @@ public class CassandraSimpleTypeHolder extends SimpleTypeHolder {
/**
* @return the map between {@link Class} and {@link DataType}.
* @param codecRegistry the Cassandra codec registry
* @param primitiveWrappers map of primitive to wrapper type
* @param codecRegistry the Cassandra codec registry.
* @param primitiveWrappers map of primitive to wrapper type.
*/
private static Map<Class<?>, DataType> classToDataType(CodecRegistry codecRegistry,
Map<Class<?>, Class<?>> primitiveWrappers) {
@@ -122,13 +124,16 @@ public class CassandraSimpleTypeHolder extends SimpleTypeHolder {
classToDataType.put(Long.class, DataType.bigint());
classToDataType.put(long.class, DataType.bigint());
// override UUID to timeuuid as regular uuid is the favored default
classToDataType.put(UUID.class, DataType.uuid());
return classToDataType;
}
/**
* Returns a {@link Set} containing all Cassandra primitive types.
*
* @param codecRegistry the Cassandra codec registry
* @param codecRegistry the Cassandra codec registry.
* @return the set of Cassandra primitive types.
*/
private static Set<Class<?>> getCassandraPrimitiveTypes(CodecRegistry codecRegistry) {

18
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentPropertyUnitTests.java
View File

@@ -21,6 +21,7 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.reflect.Field;
import java.util.Date;
import java.util.UUID;
import org.junit.Test;
import org.springframework.core.annotation.AliasFor;
@@ -95,6 +96,16 @@ public class BasicCassandraPersistentPropertyUnitTests {
assertThat(persistentProperty.findAnnotation(CassandraType.class)).isNotNull();
}
@Test // DATACASS-375
public void uuidShouldMapToUUIDByDefault() {
CassandraPersistentProperty uuidProperty = getPropertyFor(TypeWithUUIDColumn.class, "uuid");
CassandraPersistentProperty timeUUIDProperty = getPropertyFor(TypeWithUUIDColumn.class, "timeUUID");
assertThat(uuidProperty.getDataType().getName()).isEqualTo(Name.UUID);
assertThat(timeUUIDProperty.getDataType().getName()).isEqualTo(Name.TIMEUUID);
}
private CassandraPersistentProperty getPropertyFor(Class<?> type, String fieldName) {
Field field = ReflectionUtils.findField(type, fieldName);
@@ -162,4 +173,11 @@ public class BasicCassandraPersistentPropertyUnitTests {
static class TypeWithComposedCassandraTypeAnnotation {
@ComposedCassandraTypeAnnotation String column;
}
static class TypeWithUUIDColumn {
UUID uuid;
@CassandraType(type = Name.TIMEUUID) UUID timeUUID;
}
}

2
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/AllPossibleTypes.java
View File

@@ -50,7 +50,7 @@ public class AllPossibleTypes {
private InetAddress inet;
@CassandraType(type = Name.UUID) private UUID uuid;
private UUID uuid;
@CassandraType(type = Name.INT) private Number justNumber;

9
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/domain/UserToken.java
View File

@@ -19,14 +19,11 @@ import lombok.Data;
import java.util.UUID;
import org.springframework.data.cassandra.core.mapping.CassandraType;
import org.springframework.data.cassandra.core.mapping.Column;
import org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn;
import org.springframework.data.cassandra.core.mapping.Table;
import org.springframework.data.cql.core.PrimaryKeyType;
import com.datastax.driver.core.DataType.Name;
/**
* @author Mark Paluch
*/
@@ -34,10 +31,8 @@ import com.datastax.driver.core.DataType.Name;
@Data
public class UserToken {
@PrimaryKeyColumn(name = "user_id", type = PrimaryKeyType.PARTITIONED,
ordinal = 0) @CassandraType(type = Name.UUID) private UUID userId;
@PrimaryKeyColumn(name = "auth_token", type = PrimaryKeyType.CLUSTERED,
ordinal = 1) @CassandraType(type = Name.UUID) private UUID token;
@PrimaryKeyColumn(name = "user_id", type = PrimaryKeyType.PARTITIONED, ordinal = 0) private UUID userId;
@PrimaryKeyColumn(name = "auth_token", type = PrimaryKeyType.CLUSTERED, ordinal = 1) private UUID token;
@Column("user_comment") String userComment;
String adminComment;