greg/helenus
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/noorq/casser.git

Browse source 
Conflicts:
	src/main/java/com/noorq/casser/mapping/CasserMappingProperty.java
	src/test/java/com/noorq/casser/test/integration/core/udtcollection/UDTCollectionTest.java
This commit is contained in:
Albert Shift 2015-04-13 13:04:03 -07:00
commit 129562e4a8
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/com/noorq/casser/mapping/CasserMappingProperty.java
View file

@ -76,9 +76,10 @@ public final class CasserMappingProperty implements CasserProperty {
this.keyInfo = new KeyInformation(getter);
this.columnType = resolveColumnType(keyInfo, isStatic);
this.genericJavaType = getter.getGenericReturnType();
this.javaType = getter.getReturnType();
this.dataType = resolveAbstractDataType(getter, this.genericJavaType, this.javaType, this.columnType);
}
@ -212,7 +213,7 @@ public final class CasserMappingProperty implements CasserProperty {
AbstractDataType abstractDataType = getDataType();
if (abstractDataType instanceof UDTDataType) {
UDTDataType udtDataType = (UDTDataType) abstractDataType;
if (isUDTValue(javaType)) {
@ -387,6 +388,7 @@ public final class CasserMappingProperty implements CasserProperty {
if (type instanceof Class<?>) {
Class<?> javaType = (Class<?>) type;
dataType = SimpleDataTypes.getDataTypeByJavaClass(javaType);
if (dataType == null) {
IdentityName udtName = MappingUtil.getUserDefinedTypeName(javaType, false);
@ -396,6 +398,7 @@ public final class CasserMappingProperty implements CasserProperty {
}
}
}
if (dataType == null) {

1
src/test/java/com/noorq/casser/test/integration/core/udtcollection/UDTCollectionTest.java
View file

@ -18,6 +18,7 @@ package com.noorq.casser.test.integration.core.udtcollection;
import org.junit.BeforeClass;
import org.junit.Test;
import com.datastax.driver.core.DataType;
import com.datastax.driver.core.Session;
import com.datastax.driver.core.schemabuilder.Create;