CodeCow/querydsl
1
0
Fork 0
mirror of https://github.com/querydsl/querydsl.git synced 2026-07-03 21:07:49 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

#853702 : fixed ArrayPath issues

Browse Source
This commit is contained in:
Timo Westkämper 2011-09-19 12:13:37 +03:00
parent 1b5f35f03b
commit 2de651eb28
3 changed files with 76 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
querydsl-apt/src/test/java/com/mysema/query/domain/ArrayExtTest.java Normal file
View File

@ -0,0 +1,70 @@
package com.mysema.query.domain;
import static org.junit.Assert.assertEquals;
import java.util.List;
import java.util.Map;
import org.junit.Test;
import com.mysema.query.annotations.QueryEntity;
import com.mysema.query.types.path.ArrayPath;
import com.mysema.query.types.path.ListPath;
import com.mysema.query.types.path.MapPath;
import com.mysema.query.types.path.StringPath;
public class ArrayExtTest {
private static final QArrayExtTest_BinaryFile binaryFile = QArrayExtTest_BinaryFile.binaryFile;
@QueryEntity
public class BinaryFile {
byte[] contentPart;
List<byte[]> list;
Map<String, byte[]> map1;
Map<byte[], String> map2;
}
@Test
public void BinaryFile_contentPart() {
assertEquals(ArrayPath.class, binaryFile.contentPart.getClass());
assertEquals(Byte[].class, binaryFile.contentPart.getType());
}
@Test
public void BinaryFile_list() {
assertEquals(ListPath.class, binaryFile.list.getClass());
assertEquals(List.class, binaryFile.list.getType());
assertEquals(Byte[].class, binaryFile.list.getParameter(0));
assertEquals(ArrayPath.class, binaryFile.list.get(0).getClass());
assertEquals(Byte[].class, binaryFile.list.get(0).getType());
}
@Test
public void BinaryFile_map1() {
assertEquals(MapPath.class, binaryFile.map1.getClass());
assertEquals(Map.class, binaryFile.map1.getType());
assertEquals(String.class, binaryFile.map1.getParameter(0));
assertEquals(Byte[].class, binaryFile.map1.getParameter(1));
assertEquals(ArrayPath.class, binaryFile.map1.get("").getClass());
assertEquals(Byte[].class, binaryFile.map1.get("").getType());
}
@Test
public void BinaryFile_map2() {
assertEquals(MapPath.class, binaryFile.map2.getClass());
assertEquals(Map.class, binaryFile.map2.getType());
assertEquals(Byte[].class, binaryFile.map2.getParameter(0));
assertEquals(String.class, binaryFile.map2.getParameter(1));
assertEquals(StringPath.class, binaryFile.map2.get(new Byte[0]).getClass());
assertEquals(String.class, binaryFile.map2.get(new Byte[0]).getType());
}
}

6
querydsl-core/src/main/java/com/mysema/query/codegen/TypeMappings.java
View File

@ -117,7 +117,11 @@ public final class TypeMappings {
private Type getQueryType(Map<TypeCategory, Type> types, Type type, EntityType model, boolean raw, boolean rawParameters, boolean extend){
Type exprType = types.get(type.getCategory());
return getQueryType(type, model, exprType, raw, rawParameters, extend);
if (type.getCategory() == TypeCategory.ARRAY && types == pathTypes) {
return getQueryType(type.getComponentType(), model, exprType, raw, rawParameters, extend);
} else {
return getQueryType(type, model, exprType, raw, rawParameters, extend);
}
}
public Type getQueryType(Type type, EntityType model, Type exprType, boolean raw, boolean rawParameters, boolean extend){

1
querydsl-core/src/main/java/com/mysema/query/types/path/Constants.java
View File

@ -12,6 +12,7 @@ import java.util.Set;
final class Constants {
private static final Set<Class<?>> typedClasses = new HashSet<Class<?>>(Arrays.<Class<?>>asList(
ArrayPath.class,
PathBuilder.class,
ComparablePath.class,
EnumPath.class,