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

#251 fixed code generation

Browse Source
This commit is contained in:
Timo Westkämper 2012-10-22 09:07:41 +03:00
parent 7592601355
commit 7adac10d9e
2 changed files with 41 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -0,0 +1,29 @@
package com.mysema.query.domain;
import org.junit.Test;
import com.mysema.query.annotations.QueryEntity;
import com.mysema.query.annotations.QuerySupertype;
public class RawTest {
@QuerySupertype
public static class SuperClass<T extends Comparable<T>> {
public String property;
}
@SuppressWarnings("rawtypes")
@QueryEntity
public static class Entity extends SuperClass {
public String property2;
}
@Test
public void test() {
}
}

22
querydsl-codegen/src/main/java/com/mysema/query/codegen/EntitySerializer.java
View File

@ -120,29 +120,31 @@ public class EntitySerializer implements Serializer{
String thisOrSuper = hasEntityFields ? THIS : SUPER;
String additionalParams = getAdditionalConstructorParameter(model);
// 1
// String
constructorsForVariables(writer, model);
// 2
// Path
writer.suppressWarnings("all");
Type simpleModel = new SimpleType(model);
if (model.isFinal()) {
Type type = new ClassType(Path.class, model);
Type type = new ClassType(Path.class, simpleModel);
writer.beginConstructor(new Parameter("path", type));
} else {
Type type = new ClassType(Path.class, new TypeExtends(model));
Type type = new ClassType(Path.class, new TypeExtends(simpleModel));
writer.beginConstructor(new Parameter("path", type));
}
}
if (!hasEntityFields) {
if (stringOrBoolean) {
writer.line("super(path.getMetadata());");
} else {
writer.line("super(path.getType(), path.getMetadata()" +additionalParams+");");
writer.line("super((Class)path.getType(), path.getMetadata()" +additionalParams+");");
}
} else {
writer.line("this(path.getType(), path.getMetadata(), path.getMetadata().isRoot() ? INITS : PathInits.DEFAULT);");
writer.line("this((Class)path.getType(), path.getMetadata(), path.getMetadata().isRoot() ? INITS : PathInits.DEFAULT);");
}
writer.end();
// 3
// PathMetadata
if (hasEntityFields) {
writer.beginConstructor(PATH_METADATA);
writer.line("this(metadata, metadata.isRoot() ? INITS : PathInits.DEFAULT);");
@ -161,7 +163,7 @@ public class EntitySerializer implements Serializer{
writer.end();
}
// 4
// PathMetadata, PathInits
if (hasEntityFields) {
if (!localName.equals(genericName)) {
writer.suppressWarnings("all");
@ -172,7 +174,7 @@ public class EntitySerializer implements Serializer{
writer.end();
}
// 5
// Class, PathMetadata, PathInits
if (hasEntityFields) {
Type type = new ClassType(Class.class, new TypeExtends(model));
writer.beginConstructor(new Parameter("type", type), PATH_METADATA, PATH_INITS);