Skip to content

Commit 615bce8

Browse files
lalith-blalith-b
committed
Refactored and removed unnecessary codes.
Added response handler for REST Methods "DELETE" and "PUT"
1 parent a124a5b commit 615bce8

3 files changed

Lines changed: 6 additions & 47 deletions

File tree

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/DeleteProcessor.java‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,10 @@
1717

1818
import javax.annotation.processing.ProcessingEnvironment;
1919
import javax.lang.model.element.Element;
20-
import javax.lang.model.element.ExecutableElement;
2120

2221
import org.androidannotations.annotations.rest.Delete;
23-
import org.androidannotations.processing.EBeanHolder;
2422

25-
import com.sun.codemodel.JCodeModel;
26-
27-
public class DeleteProcessor extends MethodProcessor {
23+
public class DeleteProcessor extends GetPostProcessor {
2824

2925
public DeleteProcessor(ProcessingEnvironment processingEnv, RestImplementationsHolder restImplementationsHolder) {
3026
super(processingEnv, restImplementationsHolder);
@@ -36,14 +32,9 @@ public String getTarget() {
3632
}
3733

3834
@Override
39-
public void process(Element element, JCodeModel codeModel, EBeanHolder holder) throws Exception {
40-
41-
ExecutableElement executableElement = (ExecutableElement) element;
42-
43-
Delete deleteAnnotation = element.getAnnotation(Delete.class);
44-
String urlSuffix = deleteAnnotation.value();
45-
46-
generateRestTemplateCallBlock(new MethodProcessorHolder(holder, executableElement, urlSuffix, null, null, codeModel));
35+
public String retrieveUrlSuffix(Element element) {
36+
Delete getAnnotation = element.getAnnotation(Delete.class);
37+
return getAnnotation.value();
4738
}
4839

4940
}

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/processing/rest/PutProcessor.java‎

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,8 @@
1717

1818
import javax.annotation.processing.ProcessingEnvironment;
1919
import javax.lang.model.element.Element;
20-
import javax.lang.model.element.ExecutableElement;
2120

2221
import org.androidannotations.annotations.rest.Put;
23-
import org.androidannotations.helper.CanonicalNameConstants;
24-
import org.androidannotations.processing.EBeanHolder;
25-
26-
import com.sun.codemodel.JBlock;
27-
import com.sun.codemodel.JClass;
28-
import com.sun.codemodel.JExpr;
29-
import com.sun.codemodel.JExpression;
30-
import com.sun.codemodel.JInvocation;
31-
import com.sun.codemodel.JVar;
3222

3323
public class PutProcessor extends GetPostProcessor {
3424

@@ -47,26 +37,4 @@ public String retrieveUrlSuffix(Element element) {
4737
return getAnnotation.value();
4838
}
4939

50-
@Override
51-
protected JExpression generateHttpEntityVar(MethodProcessorHolder methodHolder) {
52-
ExecutableElement executableElement = (ExecutableElement) methodHolder.getElement();
53-
EBeanHolder holder = methodHolder.getHolder();
54-
JClass httpEntity = holder.refClass(CanonicalNameConstants.HTTP_ENTITY);
55-
56-
JBlock body = methodHolder.getBody();
57-
JVar httpHeadersVar = generateHttpHeadersVar(methodHolder, holder, body, executableElement);
58-
59-
boolean hasHeaders = httpHeadersVar != null;
60-
61-
if (hasHeaders) {
62-
JInvocation newHttpEntityVarCall = JExpr._new(httpEntity.narrow(Object.class));
63-
newHttpEntityVarCall.arg(httpHeadersVar);
64-
65-
String httpEntityVarName = "requestEntity";
66-
67-
return body.decl(httpEntity.narrow(Object.class), httpEntityVarName, newHttpEntityVarCall);
68-
} else {
69-
return JExpr._null();
70-
}
71-
}
7240
}

‎AndroidAnnotations/androidannotations/src/main/java/org/androidannotations/validation/rest/DeleteValidator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ public boolean validate(Element element, AnnotationElements validatedElements) {
5656

5757
validatorHelper.throwsOnlyRestClientException(executableElement, valid);
5858

59-
validatorHelper.returnTypeIsVoid(executableElement, valid);
59+
validatorHelper.doesNotReturnPrimitive(executableElement, valid);
6060

61-
restAnnotationHelper.urlVariableNamesExistInParametersAndHasNoOneMoreParameter(executableElement, valid);
61+
restAnnotationHelper.urlVariableNamesExistInParametersAndHasOnlyOneMoreParameter(executableElement, valid);
6262

6363
return valid.isValid();
6464
}

0 commit comments

Comments
 (0)