Got persistence working.

Reza Rahman · Reza Rahman · commit 92a1b2d06a4d · 2014-07-14T19:58:06.000-04:00
diff --git a/actionbazaar/pom.xml b/actionbazaar/pom.xml
@@ -44,6 +44,20 @@
 			<version>2.5.1</version>
 			<scope>compile</scope>
 		</dependency>
+        <dependency>
+            <groupId>org.glassfish.jersey.containers</groupId>
+            <artifactId>jersey-container-servlet-core</artifactId>
+            <version>2.0</version>
+            <type>jar</type>
+            <scope>provided</scope>
+        </dependency>		
+        <dependency>
+            <groupId>org.glassfish.jersey.media</groupId>
+            <artifactId>jersey-media-moxy</artifactId>
+            <version>2.0</version>
+            <type>jar</type>
+            <scope>provided</scope>
+        </dependency>		
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
diff --git a/actionbazaar/src/main/java/com/actionbazaar/application/BidService.java b/actionbazaar/src/main/java/com/actionbazaar/application/BidService.java
@@ -3,7 +3,7 @@
 import com.actionbazaar.domain.Bid;
 
 public interface BidService {
-	public void addBid(Bid bid);
+	public Bid addBid(Bid bid);
 
 	public Bid getBid(Long id);
 
diff --git a/actionbazaar/src/main/java/com/actionbazaar/application/DefaultBidService.java b/actionbazaar/src/main/java/com/actionbazaar/application/DefaultBidService.java
@@ -13,8 +13,8 @@ public class DefaultBidService implements BidService {
 	private BidDao bidDao;
 
 	@Override
-	public void addBid(Bid bid) {
-		bidDao.addBid(bid);
+	public Bid addBid(Bid bid) {
+		return bidDao.addBid(bid);
 	}
 
 	@Override
diff --git a/actionbazaar/src/main/java/com/actionbazaar/interfaces/rest/BidRestService.java b/actionbazaar/src/main/java/com/actionbazaar/interfaces/rest/BidRestService.java
@@ -15,26 +15,27 @@
 import com.actionbazaar.domain.Bid;
 
 @Stateless
-@Path("/bid")
+@Path("/bids")
 public class BidRestService {
 
 	@EJB
 	private BidService bidService;
 
 	@POST
-	@Consumes("text/xml")
+	@Consumes("application/json")
 	public void addBid(Bid bid) {
 		bidService.addBid(bid);
 	}
 
 	@GET
-	@Produces("text/xml")
+	@Produces("application/json")
+	
 	public Bid getBid(@QueryParam("id") Long id) {
 		return bidService.getBid(id);
 	}
 
 	@PUT
-	@Consumes("text/xml")
+	@Consumes("application/json")
 	public void updateBid(@QueryParam("id") Long id, Bid bid) {
 		bidService.updateBid(bid);
 	}
diff --git a/actionbazaar/src/main/java/com/actionbazaar/interfaces/rest/JsonMoxyConfigurationContextResolver.java b/actionbazaar/src/main/java/com/actionbazaar/interfaces/rest/JsonMoxyConfigurationContextResolver.java
@@ -0,0 +1,25 @@
+package com.actionbazaar.interfaces.rest;
+
+import java.util.HashMap;
+import java.util.Map;
+import javax.ws.rs.ext.ContextResolver;
+import javax.ws.rs.ext.Provider;
+import org.glassfish.jersey.moxy.json.MoxyJsonConfig;
+
+@Provider
+// TODO See if this can be removed.
+public class JsonMoxyConfigurationContextResolver
+        implements ContextResolver<MoxyJsonConfig> {
+
+    @Override
+    public MoxyJsonConfig getContext(Class<?> objectType) {
+        MoxyJsonConfig configuration = new MoxyJsonConfig();
+
+        Map<String, String> namespacePrefixMapper = new HashMap<>(1);
+        namespacePrefixMapper.put("http://www.w3.org/2001/XMLSchema-instance", "xsi");
+        configuration.setNamespacePrefixMapper(namespacePrefixMapper);
+        configuration.setNamespaceSeparator(':');
+
+        return configuration;
+    }
+}
diff --git a/actionbazaar/src/main/java/com/actionbazaar/interfaces/rest/RestConfiguration.java b/actionbazaar/src/main/java/com/actionbazaar/interfaces/rest/RestConfiguration.java
@@ -0,0 +1,26 @@
+package com.actionbazaar.interfaces.rest;
+
+import javax.ws.rs.ApplicationPath;
+
+import org.glassfish.jersey.moxy.json.MoxyJsonFeature;
+import org.glassfish.jersey.server.ResourceConfig;
+import org.glassfish.jersey.server.ServerProperties;
+
+/**
+ * JAX-RS configuration.
+ */
+@ApplicationPath("rest")
+public class RestConfiguration extends ResourceConfig {
+
+	public RestConfiguration() {
+		// Resources
+		packages(new String[] { BidRestService.class.getPackage().getName() });
+		// Enable Bean Validation error messages.
+		property(ServerProperties.BV_SEND_ERROR_IN_RESPONSE, true);
+		// Providers - JSON.
+		register(new MoxyJsonFeature());
+		register(new JsonMoxyConfigurationContextResolver()); // TODO See if
+																// this can be
+																// removed.
+	}
+}
diff --git a/actionbazaar/src/main/java/com/actionbazaar/repository/BidDao.java b/actionbazaar/src/main/java/com/actionbazaar/repository/BidDao.java
@@ -3,7 +3,7 @@
 import com.actionbazaar.domain.Bid;
 
 public interface BidDao {
-	public void addBid(Bid bid);
+	public Bid addBid(Bid bid);
 
 	public Bid getBid(Long id);
 
diff --git a/actionbazaar/src/main/java/com/actionbazaar/repository/DefaultBidDao.java b/actionbazaar/src/main/java/com/actionbazaar/repository/DefaultBidDao.java
@@ -11,8 +11,10 @@ public class DefaultBidDao implements BidDao {
 	private EntityManager entityManager;
 
 	@Override
-	public void addBid(Bid bid) {
+	public Bid addBid(Bid bid) {
 		entityManager.persist(bid);
+		
+		return bid;
 	}
 
 	@Override
diff --git a/actionbazaar/src/main/resources/META-INF/persistence.xml b/actionbazaar/src/main/resources/META-INF/persistence.xml
@@ -3,7 +3,7 @@
 	xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
 	<persistence-unit name="action-bazaar-unit">
-		<jta-data-source>java:comp/env/jdbc/ActionBazaarDB</jta-data-source>
+		<jta-data-source>jdbc/ActionBazaarDB</jta-data-source>
 		<properties>
 			<property name="javax.persistence.schema-generation.database.action"
 				value="drop-and-create" />
diff --git a/actionbazaar/src/main/webapp/WEB-INF/web.xml b/actionbazaar/src/main/webapp/WEB-INF/web.xml
@@ -19,10 +19,4 @@
 	<welcome-file-list>
 		<welcome-file>add_bid.jsf</welcome-file>
 	</welcome-file-list>
-	<data-source>
-		<name>java:comp/env/jdbc/ActionBazaarDB</name>
-		<class-name>org.apache.derby.jdbc.EmbeddedDriver</class-name>
-		<url>jdbc:derby:/tmp/actionbazaar-database;create=true
-		</url>
-	</data-source>
 </web-app>
diff --git a/actionbazaar/src/main/webapp/WEB-INF/weblogic.xml b/actionbazaar/src/main/webapp/WEB-INF/weblogic.xml
@@ -0,0 +1,10 @@
+<weblogic-web-app xmlns="http://xmlns.oracle.com/weblogic/weblogic-web-app"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://xmlns.oracle.com/weblogic/weblogic-web-app 
+           http://xmlns.oracle.com/weblogic/weblogic-web-app/1.7/weblogic-web-app.xsd">
+	<library-ref>
+		<library-name>jax-rs</library-name>
+		<specification-version>2.0</specification-version>
+		<exact-match>false</exact-match>
+	</library-ref>
+</weblogic-web-app>
diff --git a/actionbazaar/src/test/java/com/actionbazaar/application/BidServiceTest.java b/actionbazaar/src/test/java/com/actionbazaar/application/BidServiceTest.java
@@ -0,0 +1,85 @@
+package com.actionbazaar.application;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import javax.ejb.EJB;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.junit.InSequence;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.EmptyAsset;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.actionbazaar.domain.Bid;
+import com.actionbazaar.repository.BidDao;
+import com.actionbazaar.repository.DefaultBidDao;
+
+@RunWith(Arquillian.class)
+public class BidServiceTest {
+
+	private static Long bidId;
+
+	@Deployment
+	public static WebArchive createDeployment() {
+		return ShrinkWrap
+				.create(WebArchive.class, "actionbazaar-test.war")
+				.addClasses(BidService.class, DefaultBidService.class,
+						BidDao.class, DefaultBidDao.class, Bid.class)
+				.addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
+				.addAsResource("test-persistence.xml",
+						"META-INF/persistence.xml");
+	}
+
+	@EJB
+	private BidService bidService;
+
+	@Test
+	@InSequence(1)
+	public void testAddBid() {
+		// Save a new bid.
+		Bid bid = new Bid();
+		bid.setBidder("rrahman");
+		bid.setItem("Test item");
+		bid.setAmount(100.50);
+
+		bidService.addBid(bid);
+
+		// Make sure it was correctly saved.
+		bidId = bid.getId();
+
+		bid = bidService.getBid(bidId);
+
+		assertEquals("rrahman", bid.getBidder());
+		assertEquals("Test item", bid.getItem());
+		assertEquals(new Double(100.50), bid.getAmount());
+	}
+
+	@Test
+	@InSequence(2)
+	public void testUpdateBid() {
+		// Update bid.
+		Bid bid = bidService.getBid(bidId);
+		bid.setAmount(101.50);
+		bidService.updateBid(bid);
+
+		// Make sure bid was updated.
+		bid = bidService.getBid(bidId);
+
+		assertEquals("rrahman", bid.getBidder());
+		assertEquals("Test item", bid.getItem());
+		assertEquals(new Double(101.50), bid.getAmount());
+	}
+
+	@Test
+	@InSequence(3)
+	public void testDeleteBid() {
+		Bid bid = bidService.getBid(bidId);
+		bidService.deleteBid(bid);
+		
+		assertNull(bidService.getBid(bidId));		
+	}
+}
diff --git a/actionbazaar/src/test/java/com/actionbazaar/application/BidServiceUnitTest.java b/actionbazaar/src/test/java/com/actionbazaar/application/BidServiceUnitTest.java
@@ -0,0 +1,66 @@
+package com.actionbazaar.application;
+
+import static org.junit.Assert.assertNotNull;
+
+import javax.ejb.EJB;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import com.actionbazaar.application.BidService;
+import com.actionbazaar.application.DefaultBidService;
+import com.actionbazaar.domain.Bid;
+import com.actionbazaar.repository.BidDao;
+import com.actionbazaar.repository.DefaultBidDao;
+import com.actionbazaar.repository.MockBidDao;
+
+@RunWith(Arquillian.class)
+public class BidServiceUnitTest {
+
+	@Deployment
+	public static WebArchive createDeployment() {
+		return ShrinkWrap
+				.create(WebArchive.class, "test.war")
+				.addClasses(BidService.class, DefaultBidService.class,
+						BidDao.class, DefaultBidDao.class, MockBidDao.class,
+						Bid.class)
+				.addAsWebInfResource("test-beans.xml", "beans.xml")
+				.addAsResource("test-persistence.xml", "META-INF/persistence.xml");
+	}
+
+	@EJB
+	private BidService bidService;
+
+	@Test
+	public void testAddBid() {
+		Bid bid = new Bid();
+		bid.setBidder("rrahman");
+		bid.setItem("Test item");
+		bid.setAmount(100.50);
+
+		bidService.addBid(bid);
+	}
+
+	@Test
+	public void testGetBid() {
+		Bid bid = bidService.getBid(1L);
+		assertNotNull(bid);
+	}
+
+	@Test
+	public void testUpdateBid() {
+		Bid bid = bidService.getBid(1L);
+		bid.setAmount(101.50);
+		bidService.updateBid(bid);
+	}
+
+	@Test
+	public void testDeleteBid() {
+		Bid bid = bidService.getBid(1L);
+		bidService.deleteBid(bid);
+	}
+}
diff --git a/actionbazaar/src/test/java/com/actionbazaar/interfaces/web/AddBidTest.java b/actionbazaar/src/test/java/com/actionbazaar/interfaces/web/AddBidTest.java
diff --git a/actionbazaar/src/test/java/com/actionbazaar/repository/MockBidDao.java b/actionbazaar/src/test/java/com/actionbazaar/repository/MockBidDao.java
diff --git a/actionbazaar/src/test/resources/test-persistence.xml b/actionbazaar/src/test/resources/test-persistence.xml

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,8 @@ public class DefaultBidService implements BidService {`
`13`	`13`	`private BidDao bidDao;`
`14`	`14`
`15`	`15`	`@Override`
`16`		`- public void addBid(Bid bid) {`
`17`		`- bidDao.addBid(bid);`
	`16`	`+ public Bid addBid(Bid bid) {`
	`17`	`+ return bidDao.addBid(bid);`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`@Override`