diff options
author | jesus m. rodriguez <jesusr@redhat.com> | 2009-11-17 13:31:22 -0500 |
---|---|---|
committer | jesus m. rodriguez <jesusr@redhat.com> | 2009-11-17 13:31:22 -0500 |
commit | f53008c9f5f8ed01dc3dfa4c3bfcb7d97644f758 (patch) | |
tree | b1855d62a9f4fddc83be7b852460d329ab7e486d | |
parent | 94447c3713a3ad70a891bd295e68822ccf9f61a1 (diff) | |
parent | 0b6e5469af00e30a11370d6a9402d59d9e74c2df (diff) | |
download | candlepin-f53008c9f5f8ed01dc3dfa4c3bfcb7d97644f758.tar.gz candlepin-f53008c9f5f8ed01dc3dfa4c3bfcb7d97644f758.tar.xz candlepin-f53008c9f5f8ed01dc3dfa4c3bfcb7d97644f758.zip |
Merge branch 'master' into buildr
-rwxr-xr-x | proxy/code/scripts/test-consumerapi.py | 3 | ||||
-rw-r--r-- | proxy/src/main/java/org/fedoraproject/candlepin/resource/ConsumerResource.java | 29 |
2 files changed, 32 insertions, 0 deletions
diff --git a/proxy/code/scripts/test-consumerapi.py b/proxy/code/scripts/test-consumerapi.py index 5249b77..8896245 100755 --- a/proxy/code/scripts/test-consumerapi.py +++ b/proxy/code/scripts/test-consumerapi.py @@ -41,3 +41,6 @@ print("get info: %s" % rsp) # #print("Status: %d Response: %s" % (response.status, response.reason)) #conn.close() + +#print("delete product from consumer") +#conn.request("DELETE", '/candlepin/consumer/%s/product/%s' % ()) diff --git a/proxy/src/main/java/org/fedoraproject/candlepin/resource/ConsumerResource.java b/proxy/src/main/java/org/fedoraproject/candlepin/resource/ConsumerResource.java index 718da5d..5e0f939 100644 --- a/proxy/src/main/java/org/fedoraproject/candlepin/resource/ConsumerResource.java +++ b/proxy/src/main/java/org/fedoraproject/candlepin/resource/ConsumerResource.java @@ -19,14 +19,19 @@ import org.fedoraproject.candlepin.model.Consumer; import org.fedoraproject.candlepin.model.ConsumerInfo; import org.fedoraproject.candlepin.model.ConsumerType; import org.fedoraproject.candlepin.model.ObjectFactory; +import org.fedoraproject.candlepin.model.Product; + +import org.apache.log4j.Logger; import java.util.ArrayList; import java.util.List; import javax.ws.rs.Consumes; +import javax.ws.rs.DELETE; import javax.ws.rs.GET; import javax.ws.rs.POST; import javax.ws.rs.Path; +import javax.ws.rs.PathParam; import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; @@ -36,6 +41,8 @@ import javax.ws.rs.core.MediaType; @Path("/consumer") public class ConsumerResource extends BaseResource { + private static Logger log = Logger.getLogger(ConsumerResource.class); + /** * default ctor */ @@ -97,4 +104,26 @@ public class ConsumerResource extends BaseResource { System.out.println(ci.getMetadata()); return ci; } + + /** + * removes the product whose id matches pid, from the consumer, cid. + * @param cid Consumer ID to affect + * @param pid Product ID to remove from Consumer. + */ + @DELETE @Path("{cid}/products/{pid}") + public void delete(@PathParam("cid") String cid, + @PathParam("pid") String pid) { + System.out.println("cid " + cid + " pid = " + pid); + Consumer c = (Consumer) ObjectFactory.get().lookupByUUID(Consumer.class, cid); + if (!c.getConsumedProducts().remove(pid)) { + log.error("no product " + pid + " found."); + } + } + + @GET @Path("{cid}/products/{pid}") + @Produces({ MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML }) + public Product getProduct(@PathParam("cid") String cid, + @PathParam("pid") String pid) { + return null; + } } |