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

fixed problem where empty query string doesn't work: Issue 576

This commit is contained in:
Adrian Cole 2011-07-08 02:05:19 -07:00
parent b037be29fa
commit 7f1a543fb6
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/org/jclouds/http/utils/ModifyRequest.java
View File

@ -168,8 +168,9 @@ public class ModifyRequest {
while (pairs.hasNext()) {
Map.Entry<String, String> pair = pairs.next();
formBuilder.append(Strings2.urlEncode(pair.getKey(), skips));
if (pair.getValue() != null && !pair.getValue().equals("")) {
if (pair.getValue() != null)
formBuilder.append("=");
if (pair.getValue() != null && !pair.getValue().equals("")) {
formBuilder.append(Strings2.urlEncode(pair.getValue(), skips));
}
if (pairs.hasNext())

15
core/src/test/java/org/jclouds/rest/internal/RestAnnotationProcessorTest.java
View File

@ -1865,6 +1865,11 @@ public class RestAnnotationProcessorTest extends BaseRestClientTest {
@QueryParams(keys = "acl")
ListenableFuture<String> getQueryNull(@PathParam("id") String id);
@GET
@Path("/{id}")
@QueryParams(keys = "acl", values="")
ListenableFuture<String> getQueryEmpty(@PathParam("id") String id);
@PUT
@Path("/{id}")
ListenableFuture<String> put(@PathParam("id") @ParamParser(FirstCharacter.class) String id,
@ -1948,6 +1953,16 @@ public class RestAnnotationProcessorTest extends BaseRestClientTest {
assertEquals(request.getHeaders().size(), 0);
}
public void testCreateGetQueryEmpty() throws SecurityException, NoSuchMethodException {
Method method = TestRequest.class.getMethod("getQueryEmpty", String.class);
HttpRequest request = factory(TestRequest.class).createRequest(method, new Object[] { "1" });
assertEquals(request.getEndpoint().getHost(), "localhost");
assertEquals(request.getEndpoint().getPath(), "/1");
assertEquals(request.getEndpoint().getQuery(), "acl=");
assertEquals(request.getMethod(), HttpMethod.GET);
assertEquals(request.getHeaders().size(), 0);
}
public class PayloadOptions extends BaseHttpRequestOptions {
@Override
public String buildStringPayload() {