Minor refacto

DayS · DayS · commit 3cb9f5378381 · 2013-10-11T17:44:40.000+02:00
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/DeleteProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/DeleteProcessor.java
@@ -20,8 +20,6 @@
 
 import org.androidannotations.annotations.rest.Delete;
 
-import com.sun.codemodel.JInvocation;
-
 public class DeleteProcessor extends MethodCrudProcessor {
 
 	public DeleteProcessor(ProcessingEnvironment processingEnv, RestImplementationsHolder restImplementationsHolder) {
@@ -39,8 +37,4 @@ public String retrieveUrlSuffix(Element element) {
 		return getAnnotation.value();
 	}
 
-	@Override
-	protected JInvocation addHttpEntityVar(JInvocation restCall, MethodProcessorHolder methodHolder) {
-		return restCall.arg(generateHttpEntityVar(methodHolder));
-	}
 }
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/HeadProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/HeadProcessor.java
@@ -27,7 +27,6 @@
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JExpr;
 import com.sun.codemodel.JExpression;
-import com.sun.codemodel.JInvocation;
 
 public class HeadProcessor extends MethodProcessor {
 
@@ -55,11 +54,6 @@ public void process(Element element, JCodeModel codeModel, EBeanHolder holder) t
 		generateRestTemplateCallBlock(new MethodProcessorHolder(holder, executableElement, urlSuffix, expectedClass, expectedClass, codeModel));
 	}
 
-	@Override
-	protected JInvocation addHttpEntityVar(JInvocation restCall, MethodProcessorHolder methodHolder) {
-		return restCall.arg(generateHttpEntityVar(methodHolder));
-	}
-
 	@Override
 	protected JExpression addResultCallMethod(JExpression restCall, MethodProcessorHolder methodHolder) {
 		return JExpr.invoke(restCall, "getHeaders");
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/MethodCrudProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/MethodCrudProcessor.java
@@ -251,11 +251,6 @@ protected String plainName(JClass jClass) {
 		return plainName;
 	}
 
-	@Override
-	protected JInvocation addHttpEntityVar(JInvocation restCall, MethodProcessorHolder methodHolder) {
-		return restCall.arg(generateHttpEntityVar(methodHolder));
-	}
-
 	@Override
 	protected JInvocation addResponseEntityArg(JInvocation restCall, MethodProcessorHolder methodHolder) {
 		JClass expectedClass = methodHolder.getExpectedClass();
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/MethodProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/MethodProcessor.java
@@ -182,12 +182,10 @@ protected void generateRestTemplateCallBlock(MethodProcessorHolder methodHolder)
 	}
 
 	/**
-	 * Add the HttpEntity attribute to restTemplate.exchange() method. By
-	 * default, the value will be <code>null</code> (for DELETE, HEAD and
-	 * OPTIONS method type)
+	 * Add the HttpEntity attribute to restTemplate.exchange() method.
 	 */
 	protected JInvocation addHttpEntityVar(JInvocation restCall, MethodProcessorHolder methodHolder) {
-		return restCall.arg(JExpr._null());
+		return restCall.arg(generateHttpEntityVar(methodHolder));
 	}
 
 	/**
diff --git a/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/OptionsProcessor.java b/AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/OptionsProcessor.java
@@ -29,7 +29,6 @@
 import com.sun.codemodel.JCodeModel;
 import com.sun.codemodel.JExpr;
 import com.sun.codemodel.JExpression;
-import com.sun.codemodel.JInvocation;
 
 public class OptionsProcessor extends MethodProcessor {
 
@@ -63,11 +62,6 @@ public void process(Element element, JCodeModel codeModel, EBeanHolder holder) t
 		generateRestTemplateCallBlock(new MethodProcessorHolder(holder, executableElement, urlSuffix, expectedClass, generatedReturnType, codeModel));
 	}
 
-	@Override
-	protected JInvocation addHttpEntityVar(JInvocation restCall, MethodProcessorHolder methodHolder) {
-		return restCall.arg(generateHttpEntityVar(methodHolder));
-	}
-
 	@Override
 	protected JExpression addResultCallMethod(JExpression restCall, MethodProcessorHolder methodHolder) {
 		restCall = JExpr.invoke(restCall, "getHeaders");

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,6 @@`
`20`	`20`
`21`	`21`	`import org.androidannotations.annotations.rest.Delete;`
`22`	`22`
`23`		`-import com.sun.codemodel.JInvocation;`
`24`		`-`
`25`	`23`	`public class DeleteProcessor extends MethodCrudProcessor {`
`26`	`24`
`27`	`25`	`public DeleteProcessor(ProcessingEnvironment processingEnv, RestImplementationsHolder restImplementationsHolder) {`
`@@ -39,8 +37,4 @@ public String retrieveUrlSuffix(Element element) {`
`39`	`37`	`return getAnnotation.value();`
`40`	`38`	`}`
`41`	`39`
`42`		`- @Override`
`43`		`- protected JInvocation addHttpEntityVar(JInvocation restCall, MethodProcessorHolder methodHolder) {`
`44`		`- return restCall.arg(generateHttpEntityVar(methodHolder));`
`45`		`- }`
`46`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -182,12 +182,10 @@ protected void generateRestTemplateCallBlock(MethodProcessorHolder methodHolder)`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`/**`
`185`		`- * Add the HttpEntity attribute to restTemplate.exchange() method. By`
`186`		`- * default, the value will be <code>null</code> (for DELETE, HEAD and`
`187`		`- * OPTIONS method type)`
	`185`	`+ * Add the HttpEntity attribute to restTemplate.exchange() method.`
`188`	`186`	`*/`
`189`	`187`	`protected JInvocation addHttpEntityVar(JInvocation restCall, MethodProcessorHolder methodHolder) {`
`190`		`- return restCall.arg(JExpr._null());`
	`188`	`+ return restCall.arg(generateHttpEntityVar(methodHolder));`
`191`	`189`	`}`
`192`	`190`
`193`	`191`	`/**`