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

Add stubs for intersection type handling

Browse Source
This commit is contained in:
Timo Westkämper 2014-04-30 17:10:23 +03:00
parent 6b1352ad31
commit ecc39d2760
3 changed files with 25 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
querydsl-apt/src/main/java/com/mysema/query/apt/AbstractQuerydslProcessor.java
View File

@ -558,7 +558,7 @@ public abstract class AbstractQuerydslProcessor extends AbstractProcessor {
@Override
public SourceVersion getSupportedSourceVersion() {
return SourceVersion.latest();
return SourceVersion.latestSupported();
}
private void serialize(Serializer serializer, Collection<EntityType> models) {

55
querydsl-apt/src/main/java/com/mysema/query/apt/ExtendedTypeFactory.java
View File

@ -13,48 +13,19 @@
*/
package com.mysema.query.apt;
import java.lang.annotation.Annotation;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.annotation.Nullable;
import javax.annotation.processing.ProcessingEnvironment;
import javax.lang.model.element.ElementKind;
import javax.lang.model.element.Modifier;
import javax.lang.model.element.TypeElement;
import javax.lang.model.type.ArrayType;
import javax.lang.model.type.DeclaredType;
import javax.lang.model.type.ErrorType;
import javax.lang.model.type.ExecutableType;
import javax.lang.model.type.NoType;
import javax.lang.model.type.NullType;
import javax.lang.model.type.PrimitiveType;
import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror;
import javax.lang.model.type.TypeVariable;
import javax.lang.model.type.TypeVisitor;
import javax.lang.model.type.WildcardType;
import javax.lang.model.util.AbstractTypeVisitor6;
import javax.lang.model.type.*;
import javax.lang.model.util.SimpleTypeVisitor6;
import java.lang.annotation.Annotation;
import java.util.*;
import com.mysema.codegen.model.SimpleType;
import com.mysema.codegen.model.Type;
import com.mysema.codegen.model.TypeCategory;
import com.mysema.codegen.model.TypeExtends;
import com.mysema.codegen.model.TypeSuper;
import com.mysema.codegen.model.Types;
import com.mysema.codegen.model.*;
import com.mysema.query.annotations.QueryExclude;
import com.mysema.query.codegen.EntityType;
import com.mysema.query.codegen.Property;
import com.mysema.query.codegen.QueryTypeFactory;
import com.mysema.query.codegen.Supertype;
import com.mysema.query.codegen.TypeMappings;
import com.mysema.query.codegen.*;
/**
* ExtendedTypeFactory is a factory for APT inspection based Type creation
@ -82,7 +53,7 @@ public final class ExtendedTypeFactory {
private boolean doubleIndexEntities = true;
private final TypeVisitor<Type, Boolean> visitor = new AbstractTypeVisitor6<Type, Boolean>() {
private final TypeVisitor<Type, Boolean> visitor = new SimpleTypeVisitor6<Type, Boolean>() {
@Override
public Type visitPrimitive(PrimitiveType primitiveType, Boolean p) {
@ -196,7 +167,9 @@ public final class ExtendedTypeFactory {
// TODO : return TypeMirror instead ?!?
private final TypeVisitor<List<String>, Boolean> keyBuilder = new AbstractTypeVisitor6<List<String>, Boolean>() {
private final TypeVisitor<List<String>, Boolean> keyBuilder = new SimpleTypeVisitor6<List<String>, Boolean>() {
private final List<String> defaultValue = Collections.singletonList("Object");
private List<String> visitBase(TypeMirror t) {
List<String> rv = new ArrayList<String>();
@ -215,7 +188,7 @@ public final class ExtendedTypeFactory {
@Override
public List<String> visitNull(NullType t, Boolean p) {
return Collections.singletonList("Object");
return defaultValue;
}
@Override
@ -274,7 +247,11 @@ public final class ExtendedTypeFactory {
@Override
public List<String> visitNoType(NoType t, Boolean p) {
return Collections.singletonList("Object");
return defaultValue;
}
public List<String> visitUnknown(TypeMirror t, Boolean p) {
return visitBase(t);
}
};

19
querydsl-apt/src/main/java/com/mysema/query/apt/TypeExtractor.java
View File

@ -14,16 +14,8 @@
package com.mysema.query.apt;
import javax.lang.model.element.TypeElement;
import javax.lang.model.type.ArrayType;
import javax.lang.model.type.DeclaredType;
import javax.lang.model.type.ErrorType;
import javax.lang.model.type.ExecutableType;
import javax.lang.model.type.NoType;
import javax.lang.model.type.NullType;
import javax.lang.model.type.PrimitiveType;
import javax.lang.model.type.TypeVariable;
import javax.lang.model.type.WildcardType;
import javax.lang.model.util.AbstractTypeVisitor6;
import javax.lang.model.type.*;
import javax.lang.model.util.SimpleTypeVisitor6;
/**
* TypeExtractor is a visitor implementation which a concrete type given a general {@link TypeElement}
@ -31,7 +23,7 @@ import javax.lang.model.util.AbstractTypeVisitor6;
* @author tiwe
*
*/
public class TypeExtractor extends AbstractTypeVisitor6<TypeElement, Void> {
public class TypeExtractor extends SimpleTypeVisitor6<TypeElement, Void> {
private final boolean skipEnum;
@ -119,6 +111,11 @@ public class TypeExtractor extends AbstractTypeVisitor6<TypeElement, Void> {
public TypeElement visitNoType(NoType t, Void p) {
return null;
}
@Override
public TypeElement visitUnknown(TypeMirror t, Void p) {
return null;
}
}