enabled json

vpiduri · Jun 9, 2016 · b7eedce · b7eedce
1 parent c987a3e
commit b7eedce
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 17 deletions.
diff --git a/README.md b/README.md
@@ -32,14 +32,14 @@ REST Endpoints on OpenShift
 * Get a task by id
 
   ```
-  curl -u 'redhat:redhat1!' -H "Accept: application/xml" -X GET http://tasks-dev.10.1.2.10.xip.io/tasks/1
+  curl -u 'redhat:redhat1!' -H "Accept: application/json" -X GET http://tasks-dev.10.1.2.10.xip.io/tasks/1
   ```
 
 * Get all user tasks
 
   ```
 
-  curl -u 'redhat:redhat1!' -H "Accept: application/xml" -X GET http://tasks-dev.10.1.2.10.xip.io/tasks
+  curl -u 'redhat:redhat1!' -H "Accept: application/json" -X GET http://tasks-dev.10.1.2.10.xip.io/tasks
   ```
 
 * Delete a task by id

diff --git a/pom.xml b/pom.xml
@@ -102,15 +102,12 @@
             <artifactId>jboss-jaxrs-api_1.1_spec</artifactId>
             <scope>provided</scope>
         </dependency>
-        <!-- JSON: uncomment to include json support (note json is not part of the JAX-RS standard) -->
-        <!--
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jackson-provider</artifactId>
             <version>2.3.1.GA</version>
             <scope>provided</scope>
         </dependency>
-        -->
 
         <!-- Import the EJB API, we use provided scope as the API is included in JBoss EAP 6 -->
         <dependency>

diff --git a/src/main/java/org/jboss/as/quickstarts/tasksrs/model/Task.java b/src/main/java/org/jboss/as/quickstarts/tasksrs/model/Task.java
@@ -17,7 +17,7 @@
 package org.jboss.as.quickstarts.tasksrs.model;
 
 // JSON: uncomment to include json support (note json is not part of the JAX-RS standard)
-//import org.codehaus.jackson.annotate.JsonIgnore;
+import org.codehaus.jackson.annotate.JsonIgnore;
 
 import static javax.persistence.GenerationType.IDENTITY;
 
@@ -72,8 +72,7 @@ public void setId(Long id) {
     }
 
     @XmlTransient
-    // JSON: uncomment to include json support (note json is not part of the JAX-RS standard)
-//    @JsonIgnore
+    @JsonIgnore
     public User getOwner() {
         return owner;
     }

diff --git a/src/main/java/org/jboss/as/quickstarts/tasksrs/service/TaskResource.java b/src/main/java/org/jboss/as/quickstarts/tasksrs/service/TaskResource.java
@@ -80,9 +80,7 @@ public void deleteTaskById(@Context SecurityContext context, @PathParam("id") Lo
 
     @GET
     @Path("tasks/{id}")
-    // JSON: include "application/json" in the @Produces annotation to include json support
-    //@Produces({ "application/xml", "application/json" })
-    @Produces({ "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public Task getTaskById(@Context SecurityContext context, @PathParam("id") Long id) {
         User user = getUser(context);
 
@@ -91,18 +89,14 @@ public Task getTaskById(@Context SecurityContext context, @PathParam("id") Long
 
     @GET
     @Path("tasks/{title}")
-    // JSON: include "application/json" in the @Produces annotation to include json support
-    //@Produces({ "application/xml", "application/json" })
-    @Produces({ "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public List<Task> getTasksByTitle(@Context SecurityContext context, @PathParam("title") String title) {
         return getTasks(getUser(context), title);
     }
 
     @GET
     @Path("tasks")
-    // JSON: include "application/json" in the @Produces annotation to include json support
-    //@Produces({ "application/xml", "application/json" })
-    @Produces({ "application/xml" })
+    @Produces({ "application/xml", "application/json" })
     public List<Task> getTasks(@Context SecurityContext context) {
         return getTasks(getUser(context));
     }