fixed MultiValuedMap parameters

nimbusproject · Aug 10, 2010 · 5efba92 · 5efba92
1 parent 14fb1a4
commit 5efba92
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 6 deletions.
diff --git a/...va/source/src/org/nimbustools/messaging/query/v2009_08_15/CancelSpotInstanceRequests.java b/...va/source/src/org/nimbustools/messaging/query/v2009_08_15/CancelSpotInstanceRequests.java
@@ -4,7 +4,9 @@
 
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
+import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.UriInfo;
 
 import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.CancelSpotInstanceRequestsResponseType;
 import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.CancelSpotInstanceRequestsType;
@@ -30,8 +32,14 @@ public String getName() {
 
     @GET
     public CancelSpotInstanceRequestsResponseType handleGet(
-            MultivaluedMap<String, String> form) {
+                                                @Context UriInfo uriInfo) {
 
+        if (uriInfo == null) {
+            throw new IllegalArgumentException("uriInfo may not be null");
+        }
+
+        MultivaluedMap<String, String> form = uriInfo.getQueryParameters();
+
         final CancelSpotInstanceRequestsType request = new CancelSpotInstanceRequestsType();
         if(form != null && !form.isEmpty()){
             SpotInstanceRequestIdSetType spotInstanceRequestIdSet = 
@@ -49,8 +57,8 @@ public CancelSpotInstanceRequestsResponseType handleGet(
     }
     @POST
     public CancelSpotInstanceRequestsResponseType handlePost(
-            MultivaluedMap<String, String> form) {
-        return handleGet(form);
+                                                @Context UriInfo uriInfo) {
+        return handleGet(uriInfo);
     }    
 
 }
diff --git a/.../source/src/org/nimbustools/messaging/query/v2009_08_15/DescribeSpotInstanceRequests.java b/.../source/src/org/nimbustools/messaging/query/v2009_08_15/DescribeSpotInstanceRequests.java
@@ -7,7 +7,9 @@
 
 import javax.ws.rs.GET;
 import javax.ws.rs.POST;
+import javax.ws.rs.core.Context;
 import javax.ws.rs.core.MultivaluedMap;
+import javax.ws.rs.core.UriInfo;
 
 import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.DescribeSpotInstanceRequestsResponseType;
 import org.nimbustools.messaging.gt4_0_elastic.generated.v2010_06_15.DescribeSpotInstanceRequestsType;
@@ -34,8 +36,14 @@ public String getName() {
 
     @GET
     public DescribeSpotInstanceRequestsResponseType handleGet(
-                            MultivaluedMap<String, String> form) {
+                                            @Context UriInfo uriInfo) {
 
+        if (uriInfo == null) {
+            throw new IllegalArgumentException("uriInfo may not be null");
+        }
+
+        MultivaluedMap<String, String> form = uriInfo.getQueryParameters();        
+
         final DescribeSpotInstanceRequestsType request = new DescribeSpotInstanceRequestsType();
         if(form != null && !form.isEmpty()){
             SpotInstanceRequestIdSetType spotInstanceRequestIdSet = extractRequestIdSet(form);
@@ -71,8 +79,8 @@ public static SpotInstanceRequestIdSetType extractRequestIdSet(
 
     @POST
     public DescribeSpotInstanceRequestsResponseType handlePost(
-            MultivaluedMap<String, String> form) {
-        return handleGet(form);
+                                            @Context UriInfo uriInfo) {
+        return handleGet(uriInfo);
     }
 
 }