refactored querydsl-apt packages

This commit is contained in:
Timo Westkämper 2009-03-10 15:01:53 +00:00
parent ed118618c5
commit eeee5717a8
9 changed files with 49 additions and 21 deletions

View File

@ -8,8 +8,8 @@ package com.mysema.query.apt.general;
import java.util.Set;
import java.util.TreeSet;
import com.mysema.query.apt.Constructor;
import com.mysema.query.apt.Type;
import com.mysema.query.apt.model.Constructor;
import com.mysema.query.apt.model.Type;
import com.sun.mirror.declaration.ClassDeclaration;
import com.sun.mirror.declaration.ConstructorDeclaration;
import com.sun.mirror.util.SimpleDeclarationVisitor;

View File

@ -8,10 +8,12 @@ package com.mysema.query.apt.general;
import java.util.HashMap;
import java.util.Map;
import com.mysema.query.apt.Field;
import com.mysema.query.apt.Type;
import com.mysema.query.apt.model.Field;
import com.mysema.query.apt.model.Type;
import com.sun.mirror.declaration.ClassDeclaration;
import com.sun.mirror.declaration.FieldDeclaration;
import com.sun.mirror.declaration.InterfaceDeclaration;
import com.sun.mirror.declaration.MethodDeclaration;
import com.sun.mirror.declaration.Modifier;
import com.sun.mirror.util.SimpleDeclarationVisitor;
@ -31,6 +33,12 @@ public class EntityVisitor extends SimpleDeclarationVisitor {
last = new Type(d);
types.put(d.getQualifiedName(), last);
}
@Override
public void visitInterfaceDeclaration(InterfaceDeclaration d){
last = new Type(d);
types.put(d.getQualifiedName(), last);
}
@Override
public void visitFieldDeclaration(FieldDeclaration d) {
@ -39,5 +47,12 @@ public class EntityVisitor extends SimpleDeclarationVisitor {
last.addField(new Field(d));
}
}
@Override
public void visitMethodDeclaration(MethodDeclaration d) {
if (!d.getModifiers().contains(Modifier.STATIC)){
// TODO
}
}
}

View File

@ -16,7 +16,7 @@ import java.util.HashMap;
import java.util.Map;
import com.mysema.query.apt.FreeMarkerSerializer;
import com.mysema.query.apt.Type;
import com.mysema.query.apt.model.Type;
import com.sun.mirror.apt.AnnotationProcessor;
import com.sun.mirror.apt.AnnotationProcessorEnvironment;
import com.sun.mirror.declaration.AnnotationTypeDeclaration;

View File

@ -3,12 +3,13 @@
* All rights reserved.
*
*/
package com.mysema.query.apt.util;
package com.mysema.query.apt.general;
import java.util.Iterator;
import java.util.Locale;
import com.mysema.query.apt.Field;
import com.mysema.query.apt.model.Field;
import com.mysema.query.apt.model.Field.Type;
import com.sun.mirror.type.*;
import com.sun.mirror.util.SimpleTypeVisitor;

View File

@ -3,7 +3,7 @@
* All rights reserved.
*
*/
package com.mysema.query.apt;
package com.mysema.query.apt.model;
import java.util.ArrayList;
import java.util.Collection;
@ -25,6 +25,7 @@ public class Constructor {
}
public Constructor(ConstructorDeclaration co) {
// TODO : remove Declaration dependency
parameters = new ArrayList<Parameter>(co.getParameters().size());
for (ParameterDeclaration pa : co.getParameters()) {
parameters.add(new Parameter(pa));

View File

@ -3,9 +3,9 @@
* All rights reserved.
*
*/
package com.mysema.query.apt;
package com.mysema.query.apt.model;
import com.mysema.query.apt.util.TypeInfo;
import com.mysema.query.apt.general.TypeInfo;
import com.sun.mirror.declaration.FieldDeclaration;
/**
@ -43,6 +43,7 @@ public class Field implements Comparable<Field> {
* @param field
*/
public Field(FieldDeclaration field) {
// TODO : remove Declaration dependency
TypeInfo typeInfo = new TypeInfo(field.getType());
this.name = javaSafe(field.getSimpleName());
this.realName = realName(name);

View File

@ -3,9 +3,9 @@
* All rights reserved.
*
*/
package com.mysema.query.apt;
package com.mysema.query.apt.model;
import com.mysema.query.apt.util.TypeInfo;
import com.mysema.query.apt.general.TypeInfo;
import com.sun.mirror.declaration.ParameterDeclaration;
/**
@ -23,6 +23,7 @@ public class Parameter implements Comparable<Parameter> {
}
public Parameter(ParameterDeclaration pa) {
// TODO : remove Declaration dependency
name = pa.getSimpleName();
typeName = new TypeInfo(pa.getType()).getFullName();
}

View File

@ -3,14 +3,12 @@
* All rights reserved.
*
*/
package com.mysema.query.apt;
package com.mysema.query.apt.model;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
import java.util.TreeSet;
import java.util.*;
import com.sun.mirror.declaration.ClassDeclaration;
import com.sun.mirror.declaration.InterfaceDeclaration;
/**
* TypeDecl represents a query domain type.
@ -51,11 +49,22 @@ public class Type implements Comparable<Type> {
String superType;
public Type(ClassDeclaration d) {
// TODO : remove Declaration dependency
this.simpleName = d.getSimpleName();
this.name = d.getQualifiedName();
this.packageName = d.getPackage().getQualifiedName();
this.superType = d.getSuperclass().getDeclaration().getQualifiedName();
}
public Type(InterfaceDeclaration d){
// TODO : remove Declaration dependency
this.simpleName = d.getSimpleName();
this.name = d.getQualifiedName();
this.packageName = d.getPackage().getQualifiedName();
if (!d.getSuperinterfaces().isEmpty()){
this.superType = d.getSuperinterfaces().iterator().next().getDeclaration().getQualifiedName();
}
}
public Type(String superType, String name, String simpleName) {
this.superType = superType;

View File

@ -13,10 +13,10 @@ import java.util.Map;
import org.junit.Test;
import com.mysema.query.apt.Constructor;
import com.mysema.query.apt.Field;
import com.mysema.query.apt.Parameter;
import com.mysema.query.apt.Type;
import com.mysema.query.apt.model.Constructor;
import com.mysema.query.apt.model.Field;
import com.mysema.query.apt.model.Parameter;
import com.mysema.query.apt.model.Type;
/**
* HibernateProcessorTest provides.