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

1440 rest parameterized type reference #1546

Merged
yDelouis merged 4 commits into from
Sep 20, 2015
Merged

1440 rest parameterized type reference #1546

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c0a4b24
Use ParameterizedTypeReference in REST method calls
WonderCsabo Jun 15, 2015
87be909
fix generation of ParameterizedTypeReference subclasses for arrays of…
dodgex Sep 13, 2015
3b5ee5d
add additional test case for arrays of generic types
dodgex Sep 13, 2015
c04444c
remove unnecessary code
dodgex Sep 13, 2015
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 generation of ParameterizedTypeReference subclasses for arrays of… 
… generic types
  • Loading branch information
@dodgex
dodgex committed Sep 20, 2015
commit 87be90981aabfb5d2ab5898e87f8f330c0359caf
26 changes: 19 additions & 7 deletions ...-spring/src/main/java/org/androidannotations/rest/spring/helper/RestAnnotationHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,10 +287,9 @@ public JExpression getResponseClass(Element element, RestHolder holder) {
JExpression responseClassExpr = nullCastedToNarrowedClass(holder);
TypeMirror returnType = executableElement.getReturnType();
if (returnType.getKind() != TypeKind.VOID) {
if (getElementUtils().getTypeElement(RestSpringClasses.PARAMETERIZED_TYPE_REFERENCE) != null //
&& returnType.getKind() == TypeKind.DECLARED && !((DeclaredType) returnType).getTypeArguments().isEmpty() //
&& !returnType.toString().startsWith(RestSpringClasses.RESPONSE_ENTITY)) {
return createParameterizedTypeReferenceAnonymousSubclassInstance(returnType, holder);
if (getElementUtils().getTypeElement(RestSpringClasses.PARAMETERIZED_TYPE_REFERENCE) != null && !returnType.toString().startsWith(RestSpringClasses.RESPONSE_ENTITY)
&& checkIfParameterizedTypeReferenceShouldBeUsed(returnType)) {
return createParameterizedTypeReferenceAnonymousSubclassInstance(returnType);
}

JClass responseClass = retrieveResponseClass(returnType, holder);
Expand All @@ -301,9 +300,22 @@ public JExpression getResponseClass(Element element, RestHolder holder) {
return responseClassExpr;
}

public JExpression createParameterizedTypeReferenceAnonymousSubclassInstance(TypeMirror returnType, RestHolder holder) {
JClass narrowedTypeReference = holder.getEnvironment().getJClass(RestSpringClasses.PARAMETERIZED_TYPE_REFERENCE).narrow(codeModelHelper.typeMirrorToJClass(returnType));
JDefinedClass anonymousClass = holder.getEnvironment().getCodeModel().anonymousClass(narrowedTypeReference);
private boolean checkIfParameterizedTypeReferenceShouldBeUsed(TypeMirror returnType) {
switch (returnType.getKind()) {
case DECLARED:
return !((DeclaredType) returnType).getTypeArguments().isEmpty();

case ARRAY:
ArrayType arrayType = (ArrayType) returnType;
TypeMirror componentType = arrayType.getComponentType();
return checkIfParameterizedTypeReferenceShouldBeUsed(componentType);
}
return false;
}

public JExpression createParameterizedTypeReferenceAnonymousSubclassInstance(TypeMirror returnType) {
JClass narrowedTypeReference = getEnvironment().getJClass(RestSpringClasses.PARAMETERIZED_TYPE_REFERENCE).narrow(codeModelHelper.typeMirrorToJClass(returnType));
JDefinedClass anonymousClass = getEnvironment().getCodeModel().anonymousClass(narrowedTypeReference);
return JExpr._new(anonymousClass);
}

Expand Down