Skip to content
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

add: better support for generics #793

Closed
Artyomcool wants to merge 2 commits into from
Closed

add: better support for generics #793

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40a3de2
add: better support for generics
WeakestRef Nov 21, 2013
50f99c0
add: test for bean with generic param
Nov 27, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 69 additions & 0 deletions AndroidAnnotations/androidannotations/src/main/java/com/sun/codemodel/JSuperWildcard.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
package com.sun.codemodel;

import java.util.Iterator;
import java.util.List;

public class JSuperWildcard extends JClass {

private final JClass bound;

public JSuperWildcard(JClass bound) {
super(bound.owner());
this.bound = bound;
}

public String name() {
return "? super "+ bound.name();
}

public String fullName() {
return "? super "+ bound.fullName();
}

public JPackage _package() {
return null;
}

/**
* Returns the class bound of this variable.
*
* <p>
* If no bound is given, this method returns {@link Object}.
*/
public JClass _extends() {
if(bound !=null)
return bound;
else
return owner().ref(Object.class);
}

/**
* Returns the interface bounds of this variable.
*/
public Iterator<JClass> _implements() {
return bound._implements();
}

public boolean isInterface() {
return false;
}

public boolean isAbstract() {
return false;
}

protected JClass substituteParams(JTypeVar[] variables, List<JClass> bindings) {
JClass nb = bound.substituteParams(variables,bindings);
if(nb== bound)
return this;
else
return nb.wildcard();
}

public void generate(JFormatter f) {
if(bound._extends()==null)
f.p("?"); // instead of "? extends Object"
else
f.p("? super").g(bound);
}
}
2 changes: 1 addition & 1 deletion ...s/androidannotations/src/main/java/org/androidannotations/AndroidAnnotationProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ private boolean traceActivated() {
private ProcessResult processAnnotations(AnnotationElements validatedModel, IRClass rClass, AndroidSystemServices androidSystemServices, AndroidManifest androidManifest) throws ProcessingException, Exception {
timeStats.start("Process Annotations");
ModelProcessor modelProcessor = buildModelProcessor(rClass, androidSystemServices, androidManifest, validatedModel);
ProcessResult processResult = modelProcessor.process(validatedModel);
ProcessResult processResult = modelProcessor.process(processingEnv, validatedModel);
timeStats.stop("Process Annotations");
return processResult;
}
Expand Down
54 changes: 34 additions & 20 deletions ...ns/androidannotations/src/main/java/org/androidannotations/helper/APTCodeModelHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import javax.lang.model.element.VariableElement;
import javax.lang.model.type.ArrayType;
import javax.lang.model.type.DeclaredType;
import javax.lang.model.type.ExecutableType;
import javax.lang.model.type.TypeKind;
import javax.lang.model.type.TypeMirror;
import javax.lang.model.type.WildcardType;
Expand All @@ -59,6 +60,7 @@
import com.sun.codemodel.JMethod;
import com.sun.codemodel.JMod;
import com.sun.codemodel.JStatement;
import com.sun.codemodel.JSuperWildcard;
import com.sun.codemodel.JType;
import com.sun.codemodel.JTypeVar;
import com.sun.codemodel.JVar;
Expand Down Expand Up @@ -86,15 +88,18 @@ public JClass typeMirrorToJClass(TypeMirror type, EBeanHolder holder) {

return declaredClass;
} else if (type instanceof WildcardType) {
// TODO : At his time (01/2013), it is not possible to handle the
// super bound because code model does not offer a way to model
// statement like " ? super X"
// (see http://java.net/jira/browse/CODEMODEL-11)
WildcardType wildcardType = (WildcardType) type;

TypeMirror extendsBound = wildcardType.getExtendsBound();
TypeMirror bound = wildcardType.getExtendsBound();
if (bound == null) {
bound = wildcardType.getSuperBound();
if (bound == null) {
throw new IllegalArgumentException("There are should be 'extends' or 'super' in the wildcard");
}
return superWildcard(typeMirrorToJClass(bound, holder));
}

return typeMirrorToJClass(extendsBound, holder).wildcard();
return typeMirrorToJClass(bound, holder).wildcard();
} else if (type instanceof ArrayType) {
ArrayType arrayType = (ArrayType) type;

Expand All @@ -106,7 +111,11 @@ public JClass typeMirrorToJClass(TypeMirror type, EBeanHolder holder) {
}
}

public static class Parameter {
private JClass superWildcard(final JClass bound) {
return new JSuperWildcard(bound);
}

public static class Parameter {
public final String name;
public final JClass jClass;

Expand All @@ -118,16 +127,19 @@ public Parameter(String name, JClass jClass) {

public JMethod overrideAnnotatedMethod(ExecutableElement executableElement, EBeanHolder holder) {

TypeMirror gen = holder.beans().getOriginatingElements().getClassOriginatingElements(holder.generatedClass.fullName())[0].asType();
ExecutableType generalisedElement = (ExecutableType) holder.beans().getProcessingEnv().getTypeUtils().asMemberOf((DeclaredType) gen, executableElement);

String methodName = executableElement.getSimpleName().toString();

JClass returnType = typeMirrorToJClass(executableElement.getReturnType(), holder);
JClass returnType = typeMirrorToJClass(generalisedElement.getReturnType(), holder);

List<Parameter> parameters = new ArrayList<Parameter>();
for (VariableElement parameter : executableElement.getParameters()) {
String parameterName = parameter.getSimpleName().toString();
JClass parameterClass = typeMirrorToJClass(parameter.asType(), holder);
parameters.add(new Parameter(parameterName, parameterClass));
}
for (int i = 0; i < executableElement.getParameters().size(); i++) {
String parameterName = executableElement.getParameters().get(i).getSimpleName().toString();
JClass parameterClass = typeMirrorToJClass(generalisedElement.getParameterTypes().get(i), holder);
parameters.add(new Parameter(parameterName, parameterClass));
}

JMethod existingMethod = findAlreadyGeneratedMethod(holder.generatedClass, methodName, parameters);

Expand All @@ -139,12 +151,13 @@ public JMethod overrideAnnotatedMethod(ExecutableElement executableElement, EBea
method.annotate(Override.class);

List<JVar> methodParameters = new ArrayList<JVar>();
for (VariableElement parameter : executableElement.getParameters()) {
String parameterName = parameter.getSimpleName().toString();
JClass parameterClass = typeMirrorToJClass(parameter.asType(), holder);
JVar param = method.param(JMod.FINAL, parameterClass, parameterName);
methodParameters.add(param);
}
for (int i = 0; i < executableElement.getParameters().size(); i++) {
String parameterName = executableElement.getParameters().get(i).getSimpleName().toString();
JClass parameterClass = typeMirrorToJClass(generalisedElement.getParameterTypes().get(i), holder);

JVar param = method.param(JMod.FINAL, parameterClass, parameterName);
methodParameters.add(param);
}

for (TypeMirror superThrownType : executableElement.getThrownTypes()) {
JClass thrownType = typeMirrorToJClass(superThrownType, holder);
Expand All @@ -156,7 +169,7 @@ public JMethod overrideAnnotatedMethod(ExecutableElement executableElement, EBea
return method;
}

private JMethod findAlreadyGeneratedMethod(JDefinedClass definedClass, String methodName, List<Parameter> parameters) {
private JMethod findAlreadyGeneratedMethod(JDefinedClass definedClass, String methodName, List<Parameter> parameters) {
method: for (JMethod method : definedClass.methods()) {
if (method.name().equals(methodName) && method.params().size() == parameters.size()) {
int i = 0;
Expand Down Expand Up @@ -477,4 +490,5 @@ private JFieldVar addIntentBuilderFragmentConstructor(EBeanHolder holder, JClass
constructorBody.assign(holder.intentField, _new(holder.classes().INTENT).arg(contextField).arg(holder.generatedClass.dotclass()));
return fragmentField;
}

}
6 changes: 5 additions & 1 deletion ...ons/androidannotations/src/main/java/org/androidannotations/processing/BeanProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ public void process(Element element, JCodeModel codeModel, EBeanHolder holder) {
String fieldName = element.getSimpleName().toString();

String typeQualifiedName = elementType.toString();
int genericIndex = typeQualifiedName.indexOf("<");
if (genericIndex >= 0) {
typeQualifiedName = typeQualifiedName.substring(0, genericIndex);
}

JClass injectedClass = holder.refClass(typeQualifiedName + GENERATION_SUFFIX);

Expand All @@ -77,7 +81,7 @@ public void process(Element element, JCodeModel codeModel, EBeanHolder holder) {
body = body._if(beanField.eq(_null()))._then();
}

JInvocation getInstance = injectedClass.staticInvoke(GET_INSTANCE_METHOD_NAME).arg(holder.contextRef);
JInvocation getInstance = injectedClass.erasure().staticInvoke(GET_INSTANCE_METHOD_NAME).arg(holder.contextRef);
body.assign(beanField, getInstance);
}

Expand Down
4 changes: 4 additions & 0 deletions ...tions/androidannotations/src/main/java/org/androidannotations/processing/EBeanHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,4 +217,8 @@ public void wrapInitWithNotifier() {
resetPreviousNotifier(initBlock, previousNotifier);
}

public EBeansHolder beans() {
return eBeansHolder;
}

}
15 changes: 13 additions & 2 deletions ...ns/androidannotations/src/main/java/org/androidannotations/processing/EBeanProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import javax.lang.model.element.Element;
import javax.lang.model.element.ExecutableElement;
import javax.lang.model.element.TypeElement;
import javax.lang.model.element.TypeParameterElement;
import javax.lang.model.util.ElementFilter;

import org.androidannotations.annotations.EBean;
Expand Down Expand Up @@ -57,15 +58,25 @@ public void process(Element element, JCodeModel codeModel, EBeansHolder eBeansHo

TypeElement typeElement = (TypeElement) element;

String eBeanQualifiedName = typeElement.getQualifiedName().toString();
StringBuilder eBeanQualifiedName = new StringBuilder(typeElement.getQualifiedName());

String generatedBeanQualifiedName = eBeanQualifiedName + GENERATION_SUFFIX;

JDefinedClass generatedClass = codeModel._class(PUBLIC | FINAL, generatedBeanQualifiedName, ClassType.CLASS);

if (!typeElement.getTypeParameters().isEmpty()) {
eBeanQualifiedName.append("<");
for (TypeParameterElement typeParam : typeElement.getTypeParameters()) {
generatedClass.generify(typeParam.getSimpleName().toString());
eBeanQualifiedName.append(typeParam.getSimpleName()).append(", ");
}
int l = eBeanQualifiedName.length();
eBeanQualifiedName.replace(l - 2, l, ">");
}

EBeanHolder holder = eBeansHolder.create(element, EBean.class, generatedClass);

JClass eBeanClass = codeModel.directClass(eBeanQualifiedName);
JClass eBeanClass = codeModel.directClass(eBeanQualifiedName.toString());

holder.generatedClass._extends(eBeanClass);

Expand Down
12 changes: 10 additions & 2 deletions ...ions/androidannotations/src/main/java/org/androidannotations/processing/EBeansHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import java.util.Map;
import java.util.Set;

import javax.annotation.processing.ProcessingEnvironment;
import javax.lang.model.element.Element;

import org.androidannotations.helper.CanonicalNameConstants;
Expand All @@ -36,7 +37,11 @@

public class EBeansHolder {

public class Classes {
public ProcessingEnvironment getProcessingEnv() {
return processingEnv;
}

public class Classes {

/*
* Java
Expand Down Expand Up @@ -170,7 +175,10 @@ public class Classes {

private final OriginatingElements originatingElements = new OriginatingElements();

public EBeansHolder(JCodeModel codeModel) {
private final ProcessingEnvironment processingEnv;

public EBeansHolder(ProcessingEnvironment processingEnv, JCodeModel codeModel) {
this.processingEnv = processingEnv;
this.codeModel = codeModel;
classes = new Classes();
refClass(CanonicalNameConstants.STRING);
Expand Down
5 changes: 3 additions & 2 deletions ...ns/androidannotations/src/main/java/org/androidannotations/processing/ModelProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import java.util.List;
import java.util.Set;

import javax.annotation.processing.ProcessingEnvironment;
import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
import javax.lang.model.element.Modifier;
Expand Down Expand Up @@ -60,11 +61,11 @@ public void register(GeneratingElementProcessor processor) {
typeProcessors.add(processor);
}

public ProcessResult process(AnnotationElements validatedModel) throws ProcessingException, Exception {
public ProcessResult process(ProcessingEnvironment processingEnv, AnnotationElements validatedModel) throws ProcessingException, Exception {

JCodeModel codeModel = new JCodeModel();

EBeansHolder eBeansHolder = new EBeansHolder(codeModel);
EBeansHolder eBeansHolder = new EBeansHolder(processingEnv, codeModel);

for (GeneratingElementProcessor processor : typeProcessors) {
String annotationName = processor.getTarget();
Expand Down
5 changes: 4 additions & 1 deletion ...dAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/EBeanTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,10 @@ public void setup() {

@Test
public void activity_subclass_in_manifest_compiles() {
assertCompilationSuccessful(compileFiles(SomeActivity.class, SomeImplementation.class));
assertCompilationSuccessful(compileFiles(
SomeActivity.class,
SomeImplementation.class,
SomeGenericBean.class));
}

}
3 changes: 3 additions & 0 deletions ...notations/androidannotations/src/test/java/org/androidannotations/ebean/SomeActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,7 @@ public class SomeActivity extends Activity {
@Bean(SomeImplementation.class)
SomeInterface someInterface;

@Bean
SomeGenericBean<Object> objectSomeGenericBean;

}
14 changes: 14 additions & 0 deletions ...ations/androidannotations/src/test/java/org/androidannotations/ebean/SomeGenericBean.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package org.androidannotations.ebean;

import org.androidannotations.annotations.EBean;

import java.util.List;

@EBean
public class SomeGenericBean<T> {

void someMethod(List<? super T> list){

}

}