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

improved super handling

Browse Source
This commit is contained in:
Timo Westkämper 2012-09-04 12:40:14 +03:00
parent 6bdaa71de4
commit f1710fa060
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.mysema.codegen</groupId>
<artifactId>codegen</artifactId>
<version>0.5.2</version>
<version>0.5.3</version>
<name>Codegen</name>
<description>Code generation and compilation for Java</description>
<parent>

7
src/main/java/com/mysema/codegen/model/TypeSuper.java
View File

@ -41,7 +41,12 @@ public class TypeSuper extends TypeAdapter {
@Override
public String getGenericName(boolean asArgType, Set<String> packages, Set<String> classes) {
if (!asArgType) {
return "? super " + superType.getGenericName(true, packages, classes);
if (superType instanceof TypeExtends) {
return "?";
} else {
return "? super " + superType.getGenericName(true, packages, classes);
}
} else {
return super.getGenericName(asArgType, packages, classes);
}

9
src/test/java/com/mysema/codegen/model/TypeSuperTest.java
View File

@ -20,5 +20,14 @@ public class TypeSuperTest {
public void GetGenericName_As_ArgType() {
assertEquals("java.lang.Object", new TypeSuper(Types.STRING).getGenericName(true));
}
@Test
public void Comparable() {
// T extends Comparable<? super T>
Type comparable = new ClassType(Comparable.class);
Type type = new TypeExtends("T",
new SimpleType(comparable, new TypeSuper(new TypeExtends("T", comparable))));
assertEquals("? extends java.lang.Comparable<?>", type.getGenericName(false));
}
}