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

DATACASS-375 - Polish.

Browse Source 
Resolves gh-109.
This commit is contained in:
John Blum
2017-07-06 16:27:35 -07:00
parent 57c034be64
commit 64a0380e86
4 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -108,6 +108,7 @@ public class CassandraSimpleTypeHolder extends SimpleTypeHolder {
Map<Class<?>, DataType> classToDataType = new HashMap<>(16);
DataType.allPrimitiveTypes().forEach(dataType -> {
Class<?> javaType = codecRegistry.codecFor(dataType).getJavaType().getRawType();
classToDataType.put(javaType, dataType);
@@ -116,7 +117,7 @@ public class CassandraSimpleTypeHolder extends SimpleTypeHolder {
.ifPresent(primitiveType -> classToDataType.put(primitiveType, dataType));
});
// override String to text datatype as String is used multiple times
// override String to text DataType as String is used multiple times
classToDataType.put(String.class, DataType.text());
// map Long to bigint as counter columns (last type aver multiple overrides) are a special use case
@@ -124,7 +125,7 @@ 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
// override UUID to timeuuid as regular uuid as the favored default
classToDataType.put(UUID.class, DataType.uuid());
return classToDataType;
@@ -159,12 +160,6 @@ public class CassandraSimpleTypeHolder extends SimpleTypeHolder {
* @return
*/
public static DataType getDataTypeFor(Class<?> javaClass) {
if (javaClass.isEnum()) {
return DataType.varchar();
}
return classToDataType.get(javaClass);
return (javaClass.isEnum() ? DataType.varchar() : classToDataType.get(javaClass));
}
}

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

@@ -15,7 +15,7 @@
*/
package org.springframework.data.cassandra.core.mapping;
import static org.assertj.core.api.Assertions.*;
import static org.assertj.core.api.Assertions.assertThat;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
@@ -24,6 +24,7 @@ import java.util.Date;
import java.util.UUID;
import org.junit.Test;
import org.springframework.core.annotation.AliasFor;
import org.springframework.data.cql.core.CqlIdentifier;
import org.springframework.data.mapping.model.Property;

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

@@ -15,11 +15,6 @@
*/
package org.springframework.data.cassandra.domain;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.net.InetAddress;
@@ -30,6 +25,11 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import org.springframework.data.cassandra.core.convert.CassandraTypeMappingIntegrationTest.Condition;
import org.springframework.data.cassandra.core.mapping.CassandraType;
import org.springframework.data.cassandra.core.mapping.PrimaryKey;
@@ -92,20 +92,20 @@ public class AllPossibleTypes {
private List<Condition> listOfEnum;
// supported by conversion
java.time.Instant instant;
java.time.LocalDate localDate;
java.time.LocalDateTime localDateTime;
java.time.LocalTime localTime;
java.time.Instant instant;
java.time.ZoneId zoneId;
org.joda.time.DateTime jodaDateTime;
org.joda.time.LocalDate jodaLocalDate;
org.joda.time.LocalDateTime jodaLocalDateTime;
org.joda.time.DateTime jodaDateTime;
org.threeten.bp.Instant bpInstant;
org.threeten.bp.LocalDate bpLocalDate;
org.threeten.bp.LocalDateTime bpLocalDateTime;
org.threeten.bp.LocalTime bpLocalTime;
org.threeten.bp.Instant bpInstant;
org.threeten.bp.ZoneId bpZoneId;
}

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

@@ -15,10 +15,10 @@
*/
package org.springframework.data.cassandra.domain;
import lombok.Data;
import java.util.UUID;
import lombok.Data;
import org.springframework.data.cassandra.core.mapping.Column;
import org.springframework.data.cassandra.core.mapping.PrimaryKeyColumn;
import org.springframework.data.cassandra.core.mapping.Table;
@@ -36,4 +36,5 @@ public class UserToken {
@Column("user_comment") String userComment;
String adminComment;
}