475 add missing rest authentication by dhleong · Pull Request #711 · androidannotations/androidannotations · GitHub
Skip to content
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

475 add missing rest authentication #711

Merged
DayS merged 2 commits into from
Oct 12, 2013
Merged

475 add missing rest authentication #711

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2dcd4a1
Generate the headers entity for Delete/Head/Options and update tests
dhleong Aug 28, 2013
d1c95a8
Merge branch '475_Rest_Authentication' into 475_Add_Missing_Rest_Auth…
dhleong Sep 3, 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
5 changes: 5 additions & 0 deletions ...roidannotations/src/main/java/org/androidannotations/processing/rest/DeleteProcessor.java
View file
Open in desktop
6 changes: 6 additions & 0 deletions ...ndroidannotations/src/main/java/org/androidannotations/processing/rest/HeadProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
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 {

Expand Down Expand Up @@ -54,6 +55,11 @@ 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");
Expand Down
6 changes: 6 additions & 0 deletions ...oidannotations/src/main/java/org/androidannotations/processing/rest/OptionsProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
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 {

Expand Down Expand Up @@ -62,6 +63,11 @@ 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");
Expand Down
19 changes: 18 additions & 1 deletion ...tional-test-1-5-tests/src/test/java/org/androidannotations/test15/rest/MyServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,13 +242,30 @@ public void authenticatedRequests() {
String xtValue = "1234";
String sjsaidValue = "5678";

myService.setHeader("SomeFancyHeader", "fancyHeaderToken");
final String fancyHeaderName = "SomeFancyHeader";
final String fancyToken = "fancyHeaderToken";
myService.setHeader(fancyHeaderName, fancyToken);

addPendingResponse("[]", "xt", xtValue, "sjsaid", sjsaidValue);
myService.authenticate();

assertEquals(xtValue, myService.getCookie("xt"));
assertEquals(sjsaidValue, myService.getCookie("sjsaid"));

RestTemplate restTemplate = mock(RestTemplate.class);
myService.setRestTemplate(restTemplate);

// deletes
ArgumentMatcher<HttpEntity<Void>> matcher = new ArgumentMatcher<HttpEntity<Void>>() {

@Override
public boolean matches(Object argument) {
final String expected = fancyToken;
return expected.equals(((HttpEntity<?>) argument).getHeaders().get(fancyHeaderName).get(0));
}
};
addPendingResponse("");
myService.removeEvent(0);
verify(restTemplate).exchange(Mockito.anyString(), eq(HttpMethod.DELETE), argThat(matcher), Mockito.<Class<Object>> any(), Mockito.<Map<String, ?>> any());
}
}
1 change: 1 addition & 0 deletions ...tions/functional-test-1-5/src/main/java/org/androidannotations/test15/rest/MyService.java
View file
Open in desktop