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

generic beans hierarchy #867

Merged
DayS merged 6 commits into from
Jan 11, 2014
Merged

generic beans hierarchy #867

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
091888c
add: support for generics in beans
Jan 9, 2014
ac5ada6
add: some extra tests
Jan 9, 2014
e7de065
fix: integrated with method generics params
Jan 9, 2014
dfa270d
fix: removed debug info
Jan 9, 2014
993a680
fix: work around for buggy eclipse JDT-APT implementation of Types.as…
Jan 11, 2014
eb80ac3
fix: case for parametrized bean with type bounds, added tests for suc…
Jan 11, 2014
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
Prev Previous commit
Next Next commit
fix: integrated with method generics params
  • Loading branch information
Drozdov Artyom
Drozdov Artyom committed Jan 9, 2014
commit e7de0657d90443b172c5052063a0a7186f375740
30 changes: 11 additions & 19 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 @@ -23,13 +23,13 @@
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.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.TypeVariable;
import javax.lang.model.type.WildcardType;
import javax.lang.model.util.ElementFilter;
import javax.lang.model.util.Types;
Expand Down Expand Up @@ -123,15 +123,15 @@ public JMethod overrideAnnotatedMethod(ExecutableElement executableElement, Gene

DeclaredType generatedClass = (DeclaredType) holder.getAnnotatedElement().asType();
Types typeUtils = holder.processingEnvironment().getTypeUtils();
ExecutableType generalisedElement = (ExecutableType) typeUtils.asMemberOf(generatedClass, executableElement);
ExecutableType executableType = (ExecutableType) typeUtils.asMemberOf(generatedClass, executableElement);

String methodName = executableElement.getSimpleName().toString();
JClass returnType = typeMirrorToJClass(generalisedElement.getReturnType(), holder);
JClass returnType = typeMirrorToJClass(executableType.getReturnType(), holder);

List<Parameter> parameters = new ArrayList<Parameter>();
for (int i = 0; i < executableElement.getParameters().size(); i++) {
VariableElement parameter = executableElement.getParameters().get(i);
TypeMirror parameterType = generalisedElement.getParameterTypes().get(i);
TypeMirror parameterType = executableType.getParameterTypes().get(i);

String parameterName = parameter.getSimpleName().toString();
JClass parameterClass = typeMirrorToJClass(parameterType, holder);
Expand All @@ -147,6 +147,13 @@ public JMethod overrideAnnotatedMethod(ExecutableElement executableElement, Gene
JMethod method = holder.getGeneratedClass().method(JMod.PUBLIC, returnType, methodName);
method.annotate(Override.class);

System.out.println(executableType.getTypeVariables());
for (TypeVariable typeParameter : executableType.getTypeVariables()) {
TypeMirror bound = typeParameter.getUpperBound();
JClass jClassBounds = typeMirrorToJClass(bound, holder);
method.generify(typeParameter.toString(), jClassBounds);
}

for (Parameter parameter : parameters) {
method.param(JMod.FINAL, parameter.jClass, parameter.name);
}
Expand All @@ -156,21 +163,6 @@ public JMethod overrideAnnotatedMethod(ExecutableElement executableElement, Gene
method._throws(thrownType);
}

for (TypeParameterElement typeParameter : executableElement.getTypeParameters()) {
List<? extends TypeMirror> bounds = typeParameter.getBounds();

JClass jClassBounds;
if (bounds.isEmpty()) {
jClassBounds = holder.classes().OBJECT;
} else {
// Currently Codemodel can't generate generics with multiple
// classes like this <T extends Number & Serializable>.
// So we only take the first class
jClassBounds = typeMirrorToJClass(bounds.get(0), holder);
}
method.generify(typeParameter.toString(), jClassBounds);
}

callSuperMethod(method, holder, method.body());

return method;
Expand Down
9 changes: 6 additions & 3 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
Expand Up @@ -2,6 +2,7 @@

import org.androidannotations.annotations.Background;
import org.androidannotations.annotations.EBean;
import org.androidannotations.annotations.UiThread;

import java.util.List;

Expand All @@ -10,16 +11,18 @@ public class SomeGenericBean<T> {

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

}

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

}

@Background
<N extends T> void someParameterizedMetnod(List<? super N> lst, List<? extends N> lst2) {
<N extends T> void someParameterizedMethod(List<? super N> lst, List<? extends N> lst2) {
}

@UiThread
<T, S extends Number> void emptyUiMethod(List<? extends T> param, List<? super S> param2) {
}


}
7 changes: 3 additions & 4 deletions ...functional-test-1-5/src/main/java/org/androidannotations/test15/ActivityWithGenerics.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,9 @@
@EActivity
public class ActivityWithGenerics extends Activity {

// @UiThread
// <T, S extends Number & List<String>> void emptyUiMethod(T param, S param2) {
// // Not possible due to Codemodel's constraints
// }
//@UiThread
//<T, S extends Number & List<String>> void emptyUiMethod(T param, S param2) {
//}

@UiThread
<T, S extends Number> void emptyUiMethod(List<? extends T> param, List<? super S> param2) {
Expand Down