refactoring sample/test for a cleaner usage

Author: arun-gupta

pom.xml

@@ -93,6 +93,12 @@
                     <version>3.0.5.Final</version>
                     <scope>test</scope>
                 </dependency>
+                <dependency>
+                    <groupId>org.jboss.resteasy</groupId>
+                    <artifactId>resteasy-jaxb-provider</artifactId>
+                    <version>3.0.5.Final</version>
+                    <scope>test</scope>
+                </dependency>
             </dependencies>
         </profile>
     </profiles>

src/main/java/org/javaee7/sample/Person.java

@@ -1,26 +1,31 @@
 package org.javaee7.sample;
 
-import javax.enterprise.context.RequestScoped;
-import javax.inject.Inject;
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
+import javax.xml.bind.annotation.XmlRootElement;
 
-@RequestScoped
-@Path("persons")
+/**
+ * @author arungupta
+ */
+@XmlRootElement
 public class Person {
+    private String name;
 
-    @Inject
-    PersonDatabase database;
+    public Person() {
+    }
+
+    public Person(String name) {
+        this.name = name;
+    }
+    
+    public String getName() {
+        return name;
+    }
 
-    @GET
-    public String get() {
-        return database.currentList().toString();
+    public void setName(String name) {
+        this.name = name;
     }
 
-    @GET
-    @Path("{id}")
-    public String get(@PathParam("id") int id) {
-        return database.getPerson(id);
+    @Override
+    public String toString() {
+        return name;
     }
-}
+}

src/main/java/org/javaee7/sample/PersonDatabase.java

@@ -10,35 +10,30 @@
 @Singleton
 public class PersonDatabase {
 
-    List<String> persons;
+    List<Person> persons;
 
     @PostConstruct
     public void init() {
-        persons = Arrays.asList("Penny", "Leonard", "Sheldon", "Amy", "Howard", "Bernadette", "Raj", "Priya");
+        persons = Arrays.asList(
+                new Person("Penny"), 
+                new Person("Leonard"), 
+                new Person("Sheldon"), 
+                new Person("Amy"), 
+                new Person("Howard"), 
+                new Person("Bernadette"), 
+                new Person("Raj"), 
+                new Person("Priya"));
     }
 
-    public List<String> currentList() {
-        return persons;
+    public Person[] currentList() {
+        return persons.toArray(new Person[0]);
     }
 
-    public String getPerson(int id) {
+    public Person getPerson(int id) {
         if (id < persons.size()) {
             return persons.get(id);
         }
 
         throw new NotFoundException("Person with id \"" + id + "\" not found.");
     }
-
-    public void addPerson(String name) {
-        persons.add(name);
-    }
-
-    public void deletePerson(String name) {
-        if (persons.contains(name)) {
-            persons.remove(name);
-        }
-
-        throw new NotFoundException("Person with name \"" + name + "\" not found.");
-    }
-
 }

src/main/java/org/javaee7/sample/PersonResource.java

@@ -0,0 +1,29 @@
+package org.javaee7.sample;
+
+import javax.enterprise.context.RequestScoped;
+import javax.inject.Inject;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+
+//@RequestScoped
+@Path("persons")
+public class PersonResource {
+
+    @Inject
+    PersonDatabase database;
+
+    @GET
+    @Produces("application/xml")
+    public Person[] get() {
+        return database.currentList();
+    }
+
+    @GET
+    @Path("{id}")
+    @Produces("application/xml")
+    public Person get(@PathParam("id") int id) {
+        return database.getPerson(id);
+    }
+}

src/test/java/org/javaee7/sample/PersonTest.java

@@ -3,9 +3,11 @@
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
+import java.util.StringTokenizer;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.test.api.ArquillianResource;
@@ -37,24 +39,25 @@ public static WebArchive createDeployment() {
     public void setUp() throws MalformedURLException {
         Client client = ClientBuilder.newClient();
         target = client.target(URI.create(new URL(base, "resources/persons").toExternalForm()));
+        target.register(Person.class);
     }
 
     /**
      * Test of get method, of class Person.
      */
-//    @Test
+    @Test
     public void testGetAll() {
-        String[] list = target.request().get(String[].class);
-        assertEquals(8, list.length);
+        Person[] persons = target.request().get(Person[].class);
+        assertEquals(8, persons.length);
 
-        assertEquals("Penny", list[0]);
-        assertEquals("Leonard", list[1]);
-        assertEquals("Sheldon", list[2]);
-        assertEquals("Amy", list[3]);
-        assertEquals("Howard", list[4]);
-        assertEquals("Bernadette", list[5]);
-        assertEquals("Raj", list[6]);
-        assertEquals("Priya", list[7]);
+        assertEquals("Penny", persons[0].getName());
+        assertEquals("Leonard", persons[1].getName());
+        assertEquals("Sheldon", persons[2].getName());
+        assertEquals("Amy", persons[3].getName());
+        assertEquals("Howard", persons[4].getName());
+        assertEquals("Bernadette", persons[5].getName());
+        assertEquals("Raj", persons[6].getName());
+        assertEquals("Priya", persons[7].getName());
     }
 
     /**
@@ -64,11 +67,11 @@ public void testGetAll() {
     public void testGetOne() {
         WebTarget target2 = target.path("{id}");
 
-        String response = target2.resolveTemplate("id", 0).request().get(String.class);
-        assertEquals("Penny", response);
+        Person response = target2.resolveTemplate("id", 0).request().get(Person.class);
+        assertEquals("Penny", response.getName());
 
-        response = target2.resolveTemplate("id", 1).request().get(String.class);
-        assertEquals("Leonard", response);
+        response = target2.resolveTemplate("id", 1).request().get(Person.class);
+        assertEquals("Leonard", response.getName());
     }
 
 }

src/test/resources/arquillian.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<arquillian xmlns="http://jboss.org/schema/arquillian" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
+  <container qualifier="arquillian-wildfly-remote"/>
+</arquillian>