Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1355 from jclouds/consider-form-param 

consider @FormParam on @Delegate calls
This commit is contained in:
Adrian Cole 2013-02-24 23:36:15 -08:00
parent 55925e4bf6 d9c4cf2d39
commit 1c17f59073
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
View File

@ -220,8 +220,13 @@ public class RestAnnotationProcessor implements Function<Invocation, HttpRequest
if (caller != null) if (caller != null)
tokenValues.putAll(addPathAndGetTokens(caller, uriBuilder)); tokenValues.putAll(addPathAndGetTokens(caller, uriBuilder));
tokenValues.putAll(addPathAndGetTokens(invocation, uriBuilder)); tokenValues.putAll(addPathAndGetTokens(invocation, uriBuilder));
Multimap<String, Object> formParams;
Multimap<String, Object> formParams = addFormParams(tokenValues, invocation); if (caller != null) {
formParams = addFormParams(tokenValues, caller);
formParams.putAll(addFormParams(tokenValues, invocation));
} else {
formParams = addFormParams(tokenValues, invocation);
}
Multimap<String, Object> queryParams = addQueryParams(tokenValues, invocation); Multimap<String, Object> queryParams = addQueryParams(tokenValues, invocation);
Multimap<String, String> headers = buildHeaders(tokenValues, invocation); Multimap<String, String> headers = buildHeaders(tokenValues, invocation);

18
core/src/test/java/org/jclouds/rest/annotationparsing/DelegateAnnotationExpectTest.java
View File

@ -21,6 +21,7 @@ package org.jclouds.rest.annotationparsing;
import static org.jclouds.providers.AnonymousProviderMetadata.forClientMappedToAsyncClientOnEndpoint; import static org.jclouds.providers.AnonymousProviderMetadata.forClientMappedToAsyncClientOnEndpoint;
import static org.testng.Assert.assertTrue; import static org.testng.Assert.assertTrue;
import javax.ws.rs.FormParam;
import javax.ws.rs.HEAD; import javax.ws.rs.HEAD;
import javax.ws.rs.POST; import javax.ws.rs.POST;
import javax.ws.rs.Path; import javax.ws.rs.Path;
@ -52,6 +53,8 @@ import com.google.inject.Module;
public class DelegateAnnotationExpectTest extends BaseRestClientExpectTest<DelegateAnnotationExpectTest.DelegatingApi> { public class DelegateAnnotationExpectTest extends BaseRestClientExpectTest<DelegateAnnotationExpectTest.DelegatingApi> {
static interface DelegatingApi { static interface DelegatingApi {
@Delegate
DiskApi getDiskApiForProjectForm(@FormParam("project") String projectName);
@Delegate @Delegate
@Path("/projects/{project}") @Path("/projects/{project}")
@ -59,6 +62,8 @@ public class DelegateAnnotationExpectTest extends BaseRestClientExpectTest<Deleg
} }
static interface DelegatingAsyncApi { static interface DelegatingAsyncApi {
@Delegate
DiskAsyncApi getDiskApiForProjectForm(@FormParam("project") String projectName);
@Delegate @Delegate
@Path("/projects/{project}") @Path("/projects/{project}")
@ -66,12 +71,17 @@ public class DelegateAnnotationExpectTest extends BaseRestClientExpectTest<Deleg
} }
static interface DiskApi { static interface DiskApi {
void form();
void syncAll(); void syncAll();
boolean exists(@PathParam("disk") String diskName); boolean exists(@PathParam("disk") String diskName);
} }
static interface DiskAsyncApi { static interface DiskAsyncApi {
@POST
ListenableFuture<Void> form();
@POST @POST
@Payload("<Sync>{project}</Sync>") @Payload("<Sync>{project}</Sync>")
ListenableFuture<Void> syncAll(); ListenableFuture<Void> syncAll();
@ -82,6 +92,14 @@ public class DelegateAnnotationExpectTest extends BaseRestClientExpectTest<Deleg
public ListenableFuture<Boolean> exists(@PathParam("disk") String diskName); public ListenableFuture<Boolean> exists(@PathParam("disk") String diskName);
} }
public void testDelegatingCallTakesIntoConsiderationAndCalleeFormParam() {
DelegatingApi client = requestSendsResponse(HttpRequest.builder().method("POST").endpoint("http://mock")
.addFormParam("project", "prod").build(), HttpResponse.builder().statusCode(200).build());
client.getDiskApiForProjectForm("prod").form();
}
public void testDelegatingCallTakesIntoConsiderationAndCalleePayloadParam() { public void testDelegatingCallTakesIntoConsiderationAndCalleePayloadParam() {
DelegatingApi client = requestSendsResponse( DelegatingApi client = requestSendsResponse(