@@ -69,6 +69,6 @@
  * @see Rest
  */
 @Retention(RetentionPolicy.CLASS)
-@Target(ElementType.FIELD)
+@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })
 public @interface RestService {
 }
@@ -23,46 +23,61 @@
 import org.androidannotations.AndroidAnnotationsEnvironment;
 import org.androidannotations.ElementValidation;
 import org.androidannotations.handler.BaseAnnotationHandler;
+import org.androidannotations.handler.MethodInjectionHandler;
+import org.androidannotations.helper.InjectHelper;
 import org.androidannotations.holder.EComponentHolder;
 import org.androidannotations.rest.spring.annotations.Rest;
 import org.androidannotations.rest.spring.annotations.RestService;
 
 import com.helger.jcodemodel.AbstractJClass;
+import com.helger.jcodemodel.IJAssignmentTarget;
 import com.helger.jcodemodel.JBlock;
 import com.helger.jcodemodel.JExpr;
-import com.helger.jcodemodel.JFieldRef;
 
-public class RestServiceHandler extends BaseAnnotationHandler<EComponentHolder> {
+public class RestServiceHandler extends BaseAnnotationHandler<EComponentHolder>implements MethodInjectionHandler<EComponentHolder> {
+
+	private final InjectHelper<EComponentHolder> injectHelper;
 
 	public RestServiceHandler(AndroidAnnotationsEnvironment environment) {
 		super(RestService.class, environment);
+		injectHelper = new InjectHelper<>(validatorHelper, this);
 	}
 
 	@Override
 	public void validate(Element element, ElementValidation validation) {
-		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, validation);
+		injectHelper.validate(RestService.class, element, validation);
 
 		validatorHelper.isNotPrivate(element, validation);
 
-		validatorHelper.typeHasAnnotation(Rest.class, element, validation);
+		Element param = injectHelper.getParam(element);
+		validatorHelper.typeHasAnnotation(Rest.class, param, validation);
 	}
 
 	@Override
 	public void process(Element element, EComponentHolder holder) {
-		String fieldName = element.getSimpleName().toString();
+		injectHelper.process(element, holder);
+	}
+
+	@Override
+	public JBlock getInvocationBlock(EComponentHolder holder) {
+		return holder.getInitBodyInjectionBlock();
+	}
 
-		TypeMirror fieldTypeMirror = element.asType();
+	@Override
+	public void assignValue(JBlock targetBlock, IJAssignmentTarget fieldRef, EComponentHolder holder, Element element, Element param) {
+		TypeMirror fieldTypeMirror = param.asType();
 		TypeMirror erasedFieldTypeMirror = getProcessingEnvironment().getTypeUtils().erasure(fieldTypeMirror);
 		String interfaceName = erasedFieldTypeMirror.toString();
 
 		String generatedClassName = interfaceName + classSuffix();
 
 		AbstractJClass clazz = codeModelHelper.narrowGeneratedClass(getJClass(generatedClassName), fieldTypeMirror);
 
-		JBlock methodBody = holder.getInitBodyInjectionBlock();
-
-		JFieldRef field = JExpr.ref(fieldName);
+		targetBlock.add(fieldRef.assign(JExpr._new(clazz).arg(holder.getContextRef())));
+	}
 
-		methodBody.assign(field, JExpr._new(clazz).arg(holder.getContextRef()));
+	@Override
+	public void validateEnclosingElement(Element element, ElementValidation valid) {
+		validatorHelper.enclosingElementHasEnhancedComponentAnnotation(element, valid);
 	}
 }
Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,6 @@`
`69`	`69`	`* @see Rest`
`70`	`70`	`*/`
`71`	`71`	`@Retention(RetentionPolicy.CLASS)`
`72`		`-@Target(ElementType.FIELD)`
	`72`	`+@Target({ ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER })`
`73`	`73`	`public @interface RestService {`
`74`	`74`	`}`