summaryrefslogtreecommitdiffstats
path: root/proxy/code/src
diff options
context:
space:
mode:
authorMike McCune <mmccune@gibson.pdx.redhat.com>2009-07-09 17:27:08 -0700
committerMike McCune <mmccune@gibson.pdx.redhat.com>2009-07-09 17:27:08 -0700
commit2941c32bbead4920315a8fad166a0d3ec4b0436f (patch)
tree96014d14d498c7d7661ac3a127562868d87be979 /proxy/code/src
parentcd305d823c9c45448b7b8e9b2ca5b515004ae217 (diff)
downloadcandlepin-2941c32bbead4920315a8fad166a0d3ec4b0436f.tar.gz
candlepin-2941c32bbead4920315a8fad166a0d3ec4b0436f.tar.xz
candlepin-2941c32bbead4920315a8fad166a0d3ec4b0436f.zip
json output!
Diffstat (limited to 'proxy/code/src')
-rw-r--r--proxy/code/src/org/fedoraproject/candlepin/api/BaseApi.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/proxy/code/src/org/fedoraproject/candlepin/api/BaseApi.java b/proxy/code/src/org/fedoraproject/candlepin/api/BaseApi.java
index 1e6f17b..eff841c 100644
--- a/proxy/code/src/org/fedoraproject/candlepin/api/BaseApi.java
+++ b/proxy/code/src/org/fedoraproject/candlepin/api/BaseApi.java
@@ -30,6 +30,7 @@ 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;
public abstract class BaseApi {
@@ -40,7 +41,8 @@ public abstract class BaseApi {
private static final Logger log = Logger.getLogger(BaseApi.class);
@GET @Path("/{uuid}")
- @Produces("text/plain")
+ // @Produces("text/plain")
+ @Produces(MediaType.APPLICATION_JSON)
public Object get(@PathParam("uuid") String uuid) {
Object o = ObjectFactory.get().
lookupByUUID(getApiClass(), uuid);
@@ -49,14 +51,15 @@ public abstract class BaseApi {
@GET @Path("/list")
@Produces("text/plain")
+ // @Produces(MediaType.APPLICATION_JSON)
public String list() {
StringBuffer retval = new StringBuffer();
List objects = ObjectFactory.get().listObjectsByClass(getApiClass());
+ //return objects;
for (int i = 0; i < objects.size(); i++) {
retval.append(objects.get(i).toString());
retval.append("\n");
}
-
return retval.toString();
}