Added PDF support to web frontend, using URL suffix. Cleaned up a few dependencies.

dddsample/external/reporting/pom.xml

@@ -41,7 +41,6 @@
     <dependency>
       <groupId>org.apache.cxf</groupId>
       <artifactId>cxf-rt-transports-http-jetty</artifactId>
-      <version>2.2.2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.cxf</groupId>
@@ -62,7 +61,6 @@
     <dependency>
       <groupId>com.lowagie</groupId>
       <artifactId>itext</artifactId>
-      <version>2.1.7</version>
     </dependency>
   </dependencies>
   <build>

dddsample/external/reporting/src/main/java/com/reporting2/ReportingService.java

@@ -25,23 +25,25 @@ public class ReportingService {
   }
 
   @GET
-  @Path("/cargo/{trackingId}")
-  public Response getCargoReport(@PathParam("trackingId") String trackingId) throws ParseException {
+  @Path("/cargo/{trackingId}.{format}")
+  public Response getCargoReport(@PathParam("trackingId") String trackingId, @PathParam("format") String format) throws ParseException {
     CargoReport cargoReport = reportDAO.loadCargoReport(trackingId);
     if (cargoReport == null) return status(404).build();
 
     return ok(cargoReport).
+      type("application/" + format).
       lastModified(US_DATETIME.parse(cargoReport.getCargo().getLastUpdatedOn())).
       build();
   }
 
   @GET
-  @Path("/voyage/{voyageNumber}")
-  public Response getVoyageReport(@PathParam("voyageNumber") String voyageNumber) throws ParseException {
+  @Path("/voyage/{voyageNumber}.{format}")
+  public Response getVoyageReport(@PathParam("voyageNumber") String voyageNumber, @PathParam("format") String format) throws ParseException {
     VoyageReport voyageReport = reportDAO.loadVoyageReport(voyageNumber);
     if (voyageReport == null) return status(404).build();
 
     return ok(voyageReport).
+      type("application/" + format).
       lastModified(US_DATETIME.parse(voyageReport.getVoyage().getLastUpdatedOn())).
       build();
   }
@@ -50,12 +52,14 @@ public class ReportingService {
   @Path("/cargo")
   public void reportCargoDetails(CargoDetails cargoDetails) {
     // TODO
+    System.out.println("Received " + cargoDetails);
   }
 
   @PUT
   @Path("/cargo/{trackingId}/handled")
   public void reportHandling(@PathParam("trackingId") String trackingId, Handling handling) {
     // TODO
+    System.out.println("Received " + trackingId + " : " + handling);
   }
 
   ReportingService() {

dddsample/external/reporting/src/main/java/com/reporting2/pdf/PDFMessageBodyWriter.java

@@ -17,6 +17,8 @@ public abstract class PDFMessageBodyWriter<T> implements MessageBodyWriter<T> {
 
   public long getSize(T t, Class<?> type, Type genericType, Annotation[] annotations, MediaType mt) {
     ByteArrayOutputStream baos = new ByteArrayOutputStream();
+    // TODO creates document twice, not optimal, but this class must be stateless.
+    // Could probably be worked around using a ThreadLocal, but it's beyond the scope of the sample app.
     writeDocumentToStream(t, baos);
     return baos.toByteArray().length;
   }

dddsample/external/reporting/src/main/webapp/index.jsp

@@ -21,14 +21,16 @@
 
     function search() {
       $.ajax({
-          url: "http://localhost:8080/reporting/rest/cargo/" + $("#query").val(),
+          url: "http://localhost:8080/reporting/rest/cargo/" + $("#query").val() + ".json",
           type: 'GET',
           contentType: 'application/json',
           success: function(response) {
             var json = eval('(' + response + ')');
             var cargo = json.cargoReport.cargo;
             $('#result').empty();
+            var pdfUrl = "http://localhost:8080/reporting/rest/cargo/" + $("#query").val() + ".pdf"
             $('#result').
+              append('<p><a href="' + pdfUrl + '">Download PDF</a></p>').
               append('<h2>Cargo ' + cargo.trackingId + '</h2>').
               append('<p>Destination: ' + cargo.finalDestination + ' (at ' + cargo.arrivalDeadline + ')</p>')
 

dddsample/external/reporting/src/test/java/temp/pkg/ReportServiceTest.java

@@ -10,6 +10,7 @@ import org.junit.runner.RunWith;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.net.URL;
 import java.net.URLConnection;
@@ -20,8 +21,10 @@ public class ReportServiceTest {
 
   @Test
   public void cargoReport() throws Exception {
-    JSONObject json = readJSON("/report/cargo/ABC");
-    JSONObject cargo = json.getJSONObject("cargo");
+    JSONObject json = readJSON("/cargo/ABC.json");
+    JSONObject cargoReport = json.getJSONObject("cargoReport");
+
+    JSONObject cargo = cargoReport.getJSONObject("cargo");
     
     assertEquals("ABC", cargo.get("trackingId"));
     assertEquals("Hongkong", cargo.get("receivedIn"));
@@ -30,10 +33,10 @@ public class ReportServiceTest {
     assertEquals("6/12/09 6:30 PM", cargo.get("eta"));
     assertEquals("Onboard voyage", cargo.get("currentStatus"));
     assertEquals("V0100", cargo.get("currentVoyage"));
-    assertEquals("Tokyo", cargo.get("currentLocation"));
+    //assertEquals("Tokyo", cargo.get("currentLocation"));
     assertEquals("6/8/09 2:23 PM", cargo.get("lastUpdatedOn"));
 
-    JSONArray handlings = cargo.getJSONArray("handlings");
+    JSONArray handlings = cargoReport.getJSONArray("handlings");
     assertEquals(4, handlings.length());
 
     verifyHandling(handlings.getJSONObject(0), "Receive", "Hongkong", null);
@@ -44,19 +47,21 @@ public class ReportServiceTest {
 
   @Test
   public void cargoPDFReport() throws Exception {
-    String pdf = readPDF("/report/cargo/ABC");
+    String pdf = readPDF("/cargo/ABC.pdf");
     assertTrue(pdf.length() > 0);
   }
 
-  @Test
+  @Test(expected = FileNotFoundException.class)
   public void cargoNotFound() throws Exception {
-    assertEquals("", readString("/report/cargo/NOSUCH"));
+    readJSON("/cargo/NOSUCH.json");
   }
 
   @Test
   public void voyageReportWithCargos() throws Exception {
-    JSONObject json = readJSON("/report/voyage/V0100");
-    JSONObject voyage = json.getJSONObject("voyage");
+    JSONObject json = readJSON("/voyage/V0100.json");
+    JSONObject voyageReport = json.getJSONObject("voyageReport");
+
+    JSONObject voyage = voyageReport.getJSONObject("voyage");
 
     assertEquals("V0100", voyage.get("voyageNumber"));
     assertEquals("Honolulu", voyage.get("nextStop"));
@@ -65,15 +70,17 @@ public class ReportServiceTest {
     assertEquals(1400, voyage.get("delayedByMinutes"));
     assertEquals("6/6/09 2:01 PM", voyage.get("lastUpdatedOn"));
 
-    JSONObject cargo = voyage.getJSONObject("onboardCargos");
+    JSONObject cargo = voyageReport.getJSONObject("onboardCargos");
     assertEquals("ABC", cargo.get("trackingId"));
     assertEquals("Stockholm", cargo.get("finalDestination"));
   }
 
   @Test
   public void voyageReport() throws Exception {
-    JSONObject json = readJSON("/report/voyage/V0200");
-    JSONObject voyage = json.getJSONObject("voyage");
+    JSONObject json = readJSON("/voyage/V0200.json");
+    JSONObject voyageReport = json.getJSONObject("voyageReport");
+
+    JSONObject voyage = voyageReport.getJSONObject("voyage");
 
     assertEquals("V0200", voyage.get("voyageNumber"));
     assertEquals("Seattle", voyage.get("nextStop"));
@@ -81,17 +88,17 @@ public class ReportServiceTest {
     assertEquals("In transit", voyage.get("currentStatus"));
     assertEquals(0, voyage.get("delayedByMinutes"));
     assertEquals("6/6/09 2:01 PM", voyage.get("lastUpdatedOn"));
-    assertFalse(voyage.has("onboardCargos"));
+    assertFalse(voyageReport.has("onboardCargos"));
   }
 
-  @Test
+  @Test(expected = FileNotFoundException.class)
   public void voyageNotFound() throws Exception {
-    assertEquals("", readString("/report/voyage/NOSUCH"));
+    readJSON("/voyage/NOSUCH.json");
   }
 
   @Test
   public void voyagePDFReport() throws Exception {
-    String pdf = readPDF("/report/voyage/V0200");
+    String pdf = readPDF("/voyage/V0200.pdf");
     assertTrue(pdf.length() > 0);
   }
 
@@ -108,21 +115,13 @@ public class ReportServiceTest {
   private JSONObject readJSON(String path) throws IOException, JSONException {
     URL url = new URL("http://localhost:14000" + path);
     URLConnection urlConnection = url.openConnection();
-    urlConnection.setRequestProperty("Accept", "application/json");
     String jsonString = IOUtils.toString(urlConnection.getInputStream());
     return new JSONObject(jsonString);
   }
 
-  private String readString(String path) throws IOException {
-    URL url = new URL("http://localhost:14000" + path);
-    URLConnection urlConnection = url.openConnection();
-    return IOUtils.toString(urlConnection.getInputStream());
-  }
-
   private String readPDF(String path) throws IOException {
     URL url = new URL("http://localhost:14000" + path);
     URLConnection urlConnection = url.openConnection();
-    urlConnection.setRequestProperty("Accept", "application/pdf");
     return IOUtils.toString(urlConnection.getInputStream());
   }
 

dddsample/external/reporting/src/test/resources/context-cxf.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xsi:schemaLocation="
+        http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd
+        http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-2.5.xsd
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+  <util:properties id="cfg" location="classpath:app.properties"/>
+
+  <import resource="classpath:META-INF/cxf/cxf.xml"/>
+  <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
+  <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml"/>
+  <import resource="classpath:META-INF/cxf/cxf-extension-http-jetty.xml"/>
+
+  <jaxrs:server address="http://localhost:14000">
+    <jaxrs:serviceBeans>
+      <ref bean="reportingService"/>
+    </jaxrs:serviceBeans>
+    <jaxrs:providers>
+      <bean class="com.reporting2.pdf.PDFCargoReportProvider"/>
+      <bean class="com.reporting2.pdf.PDFVoyageReportProvider"/>
+    </jaxrs:providers>
+  </jaxrs:server>
+
+</beans>

dddsample/pom.xml

@@ -105,6 +105,10 @@
             </descriptorRefs>
           </configuration>
         </plugin>
+        <plugin>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.4.2</version>
+        </plugin>
       </plugins>
     </pluginManagement>
   </build>
@@ -161,12 +165,6 @@
       <version>1.8.0</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-all</artifactId>
-      <version>1.1</version>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <dependencyManagement>
@@ -180,6 +178,23 @@
         <groupId>org.springframework</groupId>
         <artifactId>spring-web</artifactId>
         <version>${spring.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-core</artifactId>
+        <version>${spring.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+          </exclusion>
+        </exclusions>
       </dependency>
       <dependency>
         <groupId>org.springframework</groupId>
@@ -286,15 +301,31 @@
       </dependency>
       <dependency>
         <groupId>org.apache.cxf</groupId>
+        <artifactId>cxf-rt-transports-http-jetty</artifactId>
+        <version>${cxf.version}</version>
+        <scope>test</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-jdk14</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-rt-frontend-jaxrs</artifactId>
         <version>${cxf.version}</version>
-        <scope>runtime</scope>
       </dependency>
       <dependency>
         <groupId>javax.ws.rs</groupId>
         <artifactId>jsr311-api</artifactId>
         <version>1.0</version>
       </dependency>
+      <dependency>
+        <groupId>com.lowagie</groupId>
+        <artifactId>itext</artifactId>
+        <version>2.1.7</version>
+      </dependency>
     </dependencies>
   </dependencyManagement>