Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

Add generics support on RestTemplate methods #330

Merged
mathieuboniface merged 20 commits into from
Feb 4, 2013
Merged

Add generics support on RestTemplate methods #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
2fd3ca5
Add generics support on RestTemplate methods
DayS Oct 1, 2012
6aeef78
Fix a ClassCastException
DayS Oct 2, 2012
5af22d6
Refactoring of Get and Post processors
DayS Oct 2, 2012
ea5503b
Add unit tests for generics rest methods
DayS Oct 2, 2012
8b29b74
Fix EBeanHolder.parseClass() to use a buffer. A partial copy of JCode…
DayS Oct 7, 2012
434b528
Refactoring of Get and Post processors
DayS Oct 7, 2012
5121f83
Extract custom JCodeModel code into a new class
DayS Oct 9, 2012
aa80b6a
Refactoring and comment rest processors
DayS Nov 9, 2012
996d4d1
Fix runtime mapping of generics
DayS Nov 9, 2012
c392526
Handle generics of generics
DayS Nov 13, 2012
74547ca
Handle array of generics
DayS Nov 14, 2012
5193249
Handle generics of class
DayS Nov 14, 2012
bfaf275
Add integration tests for test rest methods
DayS Nov 14, 2012
e7cd689
Remove temporary logs
DayS Nov 14, 2012
5197bfd
Fix EBeansHolder.refClass method to handle generics. Fix rest-templat…
DayS Nov 21, 2012
ac2fa84
Merge branch 'develop' into 220_rest_template_generics
DayS Nov 21, 2012
f68ae5b
Handle wildcard on EBeansHolder.refClass(). TypeVar throws exception
DayS Nov 25, 2012
9f72516
Merge branch 'develop' into 220_rest_template_generics
DayS Dec 4, 2012
36a289a
Add missing license header
DayS Jan 29, 2013
fb6432c
Refactoring code and remove the TypeNameParser fork class from codemodel
mathieuboniface Jan 31, 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
16 changes: 8 additions & 8 deletions 16 ...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 @@ -549,14 +549,14 @@ private ModelProcessor buildModelProcessor(IRClass rClass, AndroidSystemServices
modelProcessor.register(new ExtraProcessor(processingEnv));
modelProcessor.register(new FragmentArgProcessor(processingEnv));
modelProcessor.register(new SystemServiceProcessor(androidSystemServices));
RestImplementationsHolder restImplementationHolder = new RestImplementationsHolder();
modelProcessor.register(new RestProcessor(processingEnv, restImplementationHolder));
modelProcessor.register(new GetProcessor(processingEnv, restImplementationHolder));
modelProcessor.register(new PostProcessor(processingEnv, restImplementationHolder));
modelProcessor.register(new PutProcessor(processingEnv, restImplementationHolder));
modelProcessor.register(new DeleteProcessor(processingEnv, restImplementationHolder));
modelProcessor.register(new HeadProcessor(processingEnv, restImplementationHolder));
modelProcessor.register(new OptionsProcessor(processingEnv, restImplementationHolder));
RestImplementationsHolder restImplementationsHolder = new RestImplementationsHolder();
modelProcessor.register(new RestProcessor(processingEnv, restImplementationsHolder));
modelProcessor.register(new GetProcessor(processingEnv, restImplementationsHolder));
modelProcessor.register(new PostProcessor(processingEnv, restImplementationsHolder));
modelProcessor.register(new PutProcessor(processingEnv, restImplementationsHolder));
modelProcessor.register(new DeleteProcessor(processingEnv, restImplementationsHolder));
modelProcessor.register(new HeadProcessor(processingEnv, restImplementationsHolder));
modelProcessor.register(new OptionsProcessor(processingEnv, restImplementationsHolder));
modelProcessor.register(new AppProcessor());
modelProcessor.register(new OptionsMenuProcessor(processingEnv, rClass));
modelProcessor.register(new OptionsItemProcessor(processingEnv, rClass));
Expand Down
12 changes: 12 additions & 0 deletions 12 ...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 @@ -34,9 +34,11 @@
import javax.lang.model.type.ArrayType;
import javax.lang.model.type.DeclaredType;
import javax.lang.model.type.TypeMirror;
import javax.lang.model.type.WildcardType;

import org.androidannotations.processing.EBeanHolder;
import org.androidannotations.processing.EBeansHolder.Classes;

import com.sun.codemodel.JBlock;
import com.sun.codemodel.JCatchBlock;
import com.sun.codemodel.JClass;
Expand Down Expand Up @@ -78,6 +80,16 @@ 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();

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

Expand Down
7 changes: 7 additions & 0 deletions 7 ...ndroidannotations/src/main/java/org/androidannotations/helper/CanonicalNameConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,23 @@

import java.net.URI;
import java.sql.SQLException;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Set;

public final class CanonicalNameConstants {

/*
* Java
*/
public static final String OBJECT = Object.class.getCanonicalName();
public static final String URI = URI.class.getCanonicalName();
public static final String MAP = Map.class.getCanonicalName();
public static final String SET = Set.class.getCanonicalName();
public static final String LIST = List.class.getCanonicalName();
public static final String COLLECTION = Collection.class.getCanonicalName();
public static final String COLLECTIONS = Collections.class.getCanonicalName();
public static final String STRING = String.class.getCanonicalName();
public static final String CHAR_SEQUENCE = CharSequence.class.getCanonicalName();
Expand Down
15 changes: 15 additions & 0 deletions 15 ...oidAnnotations/androidannotations/src/main/java/org/androidannotations/helper/Option.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/**
* Copyright (C) 2010-2012 eBusiness Information, Excilys Group
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
* use this file except in compliance with the License. You may obtain a copy of
* the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed To in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations under
* the License.
*/
package org.androidannotations.helper;

/**
Expand Down
4 changes: 4 additions & 0 deletions 4 ...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 @@ -140,6 +140,10 @@ public JClass refClass(Class<?> clazz) {
return eBeansHolder.refClass(clazz);
}

public JDefinedClass definedClass(String fullyQualifiedClassName) {
return eBeansHolder.definedClass(fullyQualifiedClassName);
}

public void generateApiClass(Element originatingElement, Class<?> apiClass) {
eBeansHolder.generateApiClass(originatingElement, apiClass);
}
Expand Down
34 changes: 32 additions & 2 deletions 34 ...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 @@ -30,6 +30,7 @@
import org.androidannotations.helper.CanonicalNameConstants;

import com.sun.codemodel.JClass;
import com.sun.codemodel.JClassAlreadyExistsException;
import com.sun.codemodel.JCodeModel;
import com.sun.codemodel.JDefinedClass;

Expand Down Expand Up @@ -178,6 +179,10 @@ public EBeanHolder getEBeanHolder(Element element) {
return eBeanHolders.get(element);
}

public JClass refClass(Class<?> clazz) {
return codeModel.ref(clazz);
}

public JClass refClass(String fullyQualifiedClassName) {

int arrayCounter = 0;
Expand All @@ -200,8 +205,33 @@ public JClass refClass(String fullyQualifiedClassName) {
return refClass;
}

public JClass refClass(Class<?> clazz) {
return codeModel.ref(clazz);
public JDefinedClass definedClass(String fullyQualifiedClassName) {
JDefinedClass refClass = (JDefinedClass) loadedClasses.get(fullyQualifiedClassName);
if (refClass == null) {
try {
refClass = codeModel._class(fullyQualifiedClassName);
} catch (JClassAlreadyExistsException e) {
refClass = (JDefinedClass) refClass(fullyQualifiedClassName);
}
loadedClasses.put(fullyQualifiedClassName, refClass);
}
return refClass;
}

/**
* Return a unique JClass reference by using {@link JCodeModel#ref(String)}
* and keeping a buffer.
*
* @param fullyQualifiedClassName
* @return
*/
JClass uniqueClass(String fullyQualifiedClassName) {

@mathieuboniface mathieuboniface Feb 4, 2013

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Dead code here. This method is never called, can you delete it ?

JClass refClass = loadedClasses.get(fullyQualifiedClassName);
if (refClass == null) {
refClass = codeModel.directClass(fullyQualifiedClassName);
loadedClasses.put(fullyQualifiedClassName, refClass);
}
return refClass;
}

public JCodeModel codeModel() {
Expand Down
33 changes: 3 additions & 30 deletions 33 ...roidannotations/src/main/java/org/androidannotations/processing/rest/DeleteProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,13 @@

import org.androidannotations.annotations.rest.Delete;
import org.androidannotations.processing.EBeanHolder;
import com.sun.codemodel.JBlock;

import com.sun.codemodel.JCodeModel;
import com.sun.codemodel.JExpr;
import com.sun.codemodel.JInvocation;
import com.sun.codemodel.JVar;

public class DeleteProcessor extends MethodProcessor {

private EBeanHolder holder;

public DeleteProcessor(ProcessingEnvironment processingEnv, RestImplementationsHolder restImplementationHolder) {
super(processingEnv, restImplementationHolder);
public DeleteProcessor(ProcessingEnvironment processingEnv, RestImplementationsHolder restImplementationsHolder) {
super(processingEnv, restImplementationsHolder);
}

@Override
Expand All @@ -45,7 +40,6 @@ public Class<? extends Annotation> getTarget() {
@Override
public void process(Element element, JCodeModel codeModel, EBeanHolder holder) throws Exception {

this.holder = holder;
ExecutableElement executableElement = (ExecutableElement) element;

Delete deleteAnnotation = element.getAnnotation(Delete.class);
Expand All @@ -54,25 +48,4 @@ public void process(Element element, JCodeModel codeModel, EBeanHolder holder) t
generateRestTemplateCallBlock(new MethodProcessorHolder(holder, executableElement, urlSuffix, null, null, codeModel));
}

@Override
protected JInvocation addHttpEntityVar(JInvocation restCall, MethodProcessorHolder methodHolder) {
return restCall.arg(JExpr._null());
}

@Override
protected JInvocation addResponseEntityArg(JInvocation restCall, MethodProcessorHolder methodHolder) {
return restCall.arg(JExpr._null());

}

@Override
protected JInvocation addResultCallMethod(JInvocation restCall, MethodProcessorHolder methodHolder) {
return restCall;
}

@Override
protected JVar addHttpHeadersVar(JBlock body, ExecutableElement executableElement) {
return generateHttpHeadersVar(holder, body, executableElement);
}

}
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.