Improved report submission and reporting service. Core now deploys correctly.

dddsample/external/reporting-api/pom.xml

@@ -12,4 +12,10 @@
   <name>External: Reporting API</name>
   <version>${project.parent.version}</version>
   <description>Reporting API</description>
+  <dependencies>
+    <dependency>
+      <groupId>javax.ws.rs</groupId>
+      <artifactId>jsr311-api</artifactId>
+    </dependency>
+  </dependencies>
 </project>

dddsample/external/reporting-api/src/main/java/se/citerus/dddsample/reporting/api/ReportSubmission.java

@@ -1,9 +1,17 @@
 package se.citerus.dddsample.reporting.api;
 
+import javax.ws.rs.*;
+
+@Consumes({"application/json", "application/xml"})
+@Path("/")
 public interface ReportSubmission {
 
-  void reportCargo(CargoDetails cargoDetails);
+  @PUT
+  @Path("/cargo")
+  void submitCargoDetails(CargoDetails cargoDetails);
 
-  void reportHandling(String trackingId, Handling handling);
+  @POST
+  @Path("/cargo/{trackingId}/handled")
+  void submitHandling(@PathParam("trackingId") String trackingId, Handling handling);
 
 }

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

@@ -1,80 +1,21 @@
 package com.reporting;
 
-import com.reporting.db.ReportDAO;
-import com.reporting.reports.CargoReport;
-import com.reporting.reports.VoyageReport;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.transaction.annotation.Transactional;
-import se.citerus.dddsample.reporting.api.CargoDetails;
-import se.citerus.dddsample.reporting.api.Handling;
-import se.citerus.dddsample.reporting.api.ReportSubmission;
-
-import javax.ws.rs.*;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
 import javax.ws.rs.core.Response;
-import java.text.ParseException;
-
-import static com.reporting.Constants.US_DATETIME;
-import static javax.ws.rs.core.Response.ok;
-import static javax.ws.rs.core.Response.status;
 
-@Produces({"application/json", "application/pdf"})
-@Consumes({"application/json", "application/xml"})
+@Produces({"application/json", "application/pdf", "application/xml"})
 @Path("/")
-public class ReportingService implements ReportSubmission {
-
-  private ReportDAO reportDAO;
-  private static final Log LOG = LogFactory.getLog(ReportingService.class);
-
-  public ReportingService(ReportDAO reportDAO) {
-    this.reportDAO = reportDAO;
-  }
+public interface ReportingService {
 
   @GET
   @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();
-  }
+  public Response getCargoReport(@PathParam("trackingId") String trackingId, @PathParam("format") String format);
 
   @GET
   @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();
-  }
-
-  @Override
-  @PUT
-  @Path("/cargo")
-  @Transactional
-  public void reportCargo(CargoDetails cargoDetails) {
-    reportDAO.storeCargoDetals(cargoDetails);
-    LOG.info("Stored cargo: " + cargoDetails);
-  }
-
-  @Override
-  @POST
-  @Path("/cargo/{trackingId}/handled")
-  @Transactional
-  public void reportHandling(@PathParam("trackingId") String trackingId, Handling handling) {
-    reportDAO.storeHandling(trackingId, handling);
-    LOG.info("Stored handling of cargo " + trackingId + ": " + handling);
-  }
-
-  @SuppressWarnings({"UnusedDeclaration"})
-  ReportingService() {
-    // Needed by CGLIB
-  }
+  public Response getVoyageReport(@PathParam("voyageNumber") String voyageNumber, @PathParam("format") String format);
 
 }

dddsample/external/reporting/src/main/java/com/reporting/ReportingServiceImpl.java

@@ -0,0 +1,80 @@
+package com.reporting;
+
+import com.reporting.db.ReportDAO;
+import com.reporting.reports.CargoReport;
+import com.reporting.reports.VoyageReport;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.transaction.annotation.Transactional;
+import se.citerus.dddsample.reporting.api.CargoDetails;
+import se.citerus.dddsample.reporting.api.Handling;
+import se.citerus.dddsample.reporting.api.ReportSubmission;
+
+import javax.ws.rs.core.Response;
+import java.text.ParseException;
+import java.util.Date;
+
+import static com.reporting.Constants.US_DATETIME;
+import static javax.ws.rs.core.Response.ok;
+import static javax.ws.rs.core.Response.status;
+
+public class ReportingServiceImpl implements ReportSubmission, ReportingService {
+
+  private ReportDAO reportDAO;
+  private static final Log LOG = LogFactory.getLog(ReportingServiceImpl.class);
+
+  public ReportingServiceImpl(ReportDAO reportDAO) {
+    this.reportDAO = reportDAO;
+  }
+
+  @Override
+  public Response getCargoReport(String trackingId, String format) {
+    CargoReport cargoReport = reportDAO.loadCargoReport(trackingId);
+    if (cargoReport == null) return status(404).build();
+
+    Date date = parseDate(cargoReport.getCargo().getLastUpdatedOn());
+    return ok(cargoReport).
+      type("application/" + format).
+      lastModified(date).
+      build();
+  }
+
+  @Override
+  public Response getVoyageReport(String voyageNumber, String format) {
+    VoyageReport voyageReport = reportDAO.loadVoyageReport(voyageNumber);
+    if (voyageReport == null) return status(404).build();
+
+    return ok(voyageReport).
+      type("application/" + format).
+      lastModified(parseDate(voyageReport.getVoyage().getLastUpdatedOn())).
+      build();
+  }
+
+  @Override
+  @Transactional
+  public void submitCargoDetails(CargoDetails cargoDetails) {
+    reportDAO.storeCargoDetals(cargoDetails);
+    LOG.info("Stored cargo: " + cargoDetails);
+  }
+
+  @Override
+  @Transactional
+  public void submitHandling(String trackingId, Handling handling) {
+    reportDAO.storeHandling(trackingId, handling);
+    LOG.info("Stored handling of cargo " + trackingId + ": " + handling);
+  }
+
+  private Date parseDate(String lastUpdatedOn) {
+    try {
+      return US_DATETIME.parse(lastUpdatedOn);
+    } catch (ParseException e) {
+      throw new RuntimeException(e);
+    }
+  }
+
+  @SuppressWarnings({"UnusedDeclaration"})
+  ReportingServiceImpl() {
+    // Needed by CGLIB
+  }
+
+}

dddsample/external/reporting/src/main/resources/context.xml

@@ -19,7 +19,7 @@
     <constructor-arg ref="dataSource"/>
   </bean>
 
-  <bean id="reportingService" class="com.reporting.ReportingService">
+  <bean id="reportingService" class="com.reporting.ReportingServiceImpl">
     <constructor-arg ref="reportDAO"/>
   </bean>
 

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/infrastructure/reporting/ReportsUpdater.java → dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/infrastructure/reporting/ReportPusher.java

@@ -1,11 +1,9 @@
 package se.citerus.dddsample.tracking.core.infrastructure.reporting;
 
-import org.apache.cxf.jaxrs.client.WebClient;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import se.citerus.dddsample.reporting.api.CargoDetails;
 import se.citerus.dddsample.reporting.api.Handling;
+import se.citerus.dddsample.reporting.api.ReportSubmission;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.Cargo;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.CargoRepository;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingId;
@@ -13,43 +11,38 @@ import se.citerus.dddsample.tracking.core.domain.model.handling.EventSequenceNum
 import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEventRepository;
 
-@Service
-public class ReportsUpdater {
+public class ReportPusher {
 
-  private WebClient webClient;
   private CargoRepository cargoRepository;
   private HandlingEventRepository handlingEventRepository;
-  private String handlingPath;
-  private String cargoDetailsPath;
+  private ReportSubmission reportSubmission;
 
-  @Autowired
-  public ReportsUpdater(final WebClient webClient,
-                        final CargoRepository cargoRepository,
-                        final HandlingEventRepository handlingEventRepository,
-                        final String handlingPath,
-                        final String cargoDetailsPath) {
-    this.webClient = webClient;
+  public ReportPusher(final ReportSubmission reportSubmission,
+                      final CargoRepository cargoRepository,
+                      final HandlingEventRepository handlingEventRepository) {
+    this.reportSubmission = reportSubmission;
     this.cargoRepository = cargoRepository;
     this.handlingEventRepository = handlingEventRepository;
-    this.handlingPath = handlingPath;
-    this.cargoDetailsPath = cargoDetailsPath;
   }
 
   @Transactional
   public void reportHandlingEvent(final EventSequenceNumber sequenceNumber) {
     HandlingEvent handlingEvent = handlingEventRepository.find(sequenceNumber);
-    Handling handling = toHandling(handlingEvent);
-    webClient.path(handlingPath).post(handling);
+    Handling handling = assembleFrom(handlingEvent);
+    String trackingIdString = handlingEvent.cargo().trackingId().stringValue();
+
+    reportSubmission.submitHandling(trackingIdString, handling);
   }
 
   @Transactional
   public void reportCargoUpdate(final TrackingId trackingId) {
     Cargo cargo = cargoRepository.find(trackingId);
-    CargoDetails cargoDetails = toCargoDetails(cargo);
-    webClient.path(cargoDetailsPath).post(cargoDetails);
+    CargoDetails cargoDetails = assembleFrom(cargo);
+
+    reportSubmission.submitCargoDetails(cargoDetails);
   }
 
-  private Handling toHandling(HandlingEvent handlingEvent) {
+  private Handling assembleFrom(HandlingEvent handlingEvent) {
     Handling handling = new Handling();
     handling.setLocation(handlingEvent.location().name());
     handling.setType(handlingEvent.activity().type().name());
@@ -57,7 +50,7 @@ public class ReportsUpdater {
     return handling;
   }
 
-  private CargoDetails toCargoDetails(Cargo cargo) {
+  private CargoDetails assembleFrom(Cargo cargo) {
     CargoDetails cargoDetails = new CargoDetails();
     cargoDetails.setTrackingId(cargo.trackingId().stringValue());
     cargoDetails.setFinalDestination(cargo.routeSpecification().destination().name());
@@ -66,4 +59,8 @@ public class ReportsUpdater {
     return cargoDetails;
   }
 
+  ReportPusher() {
+    // Needed by CGLIB
+  }
+
 }

dddsample/tracking/core/src/main/resources/contexts/context-infrastructure-messaging.xml

@@ -27,8 +27,20 @@
     <jms:listener destination="CargoUpdateTopic" ref="misdirectedNotifierListener"/>
     <jms:listener destination="CargoUpdateTopic" ref="readyToClaimNotfierListener"/>
     <jms:listener destination="CargoHandledTopic" ref="cargoUpdaterListener"/>
+    <jms:listener destination="CargoHandledTopic" ref="reportHandlingListener"/>
+    <jms:listener destination="CargoUpdateTopic" ref="reportCargoUpdateListener"/>
   </jms:listener-container>
 
+  <bean id="reportHandlingListener" class="org.springframework.jms.listener.adapter.MessageListenerAdapter">
+    <property name="delegate" ref="reportPusher"/>
+    <property name="defaultListenerMethod" value="reportHandlingEvent"/>
+  </bean>
+
+  <bean id="reportCargoUpdateListener" class="org.springframework.jms.listener.adapter.MessageListenerAdapter">
+    <property name="delegate" ref="reportPusher"/>
+    <property name="defaultListenerMethod" value="reportCargoUpdate"/>
+  </bean>
+
   <bean id="misdirectedNotifierListener" class="org.springframework.jms.listener.adapter.MessageListenerAdapter">
     <property name="delegate" ref="misdirectedNotifier"/>
     <property name="defaultListenerMethod" value="alertIfMisdirected"/>

dddsample/tracking/core/src/main/resources/contexts/context-infrastructure-reporting.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:context="http://www.springframework.org/schema/context"
+       xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+                           http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd
+                           http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
+
+  <import resource="classpath:META-INF/cxf/cxf-extension-jaxrs-binding.xml"/>
+
+  <jaxrs:client id="reportSubmission"
+                serviceClass="se.citerus.dddsample.reporting.api.ReportSubmission"
+                address="http://localhost:8080/reporting/rest"/>
+
+  <bean id="reportPusher" class="se.citerus.dddsample.tracking.core.infrastructure.reporting.ReportPusher">
+    <constructor-arg ref="reportSubmission"/>
+    <constructor-arg ref="cargoRepositoryHibernate"/>
+    <constructor-arg ref="handlingEventRepositoryHibernate"/>
+  </bean>
+
+</beans>

dddsample/tracking/core/src/main/resources/contexts/context-infrastructure.xml

@@ -7,5 +7,6 @@
   <import resource="context-infrastructure-persistence.xml"/>
   <import resource="context-infrastructure-messaging.xml"/>
   <import resource="context-infrastructure-routing.xml"/>
+  <import resource="context-infrastructure-reporting.xml"/>
 
 </beans>

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/infrastructure/reporting/ReportsUpdaterTest.java

@@ -1,34 +1,36 @@
 package se.citerus.dddsample.tracking.core.infrastructure.reporting;
 
-import org.apache.cxf.jaxrs.client.WebClient;
 import org.junit.Before;
 import org.junit.Test;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.*;
 import se.citerus.dddsample.reporting.api.CargoDetails;
 import se.citerus.dddsample.reporting.api.Handling;
-import static se.citerus.dddsample.tracking.core.application.util.DateTestUtil.toDate;
+import se.citerus.dddsample.reporting.api.ReportSubmission;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.Cargo;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.CargoRepository;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.RouteSpecification;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingId;
 import se.citerus.dddsample.tracking.core.domain.model.handling.*;
-import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.HONGKONG;
-import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.ROTTERDAM;
 import se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory.CargoRepositoryInMem;
 import se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory.HandlingEventRepositoryInMem;
 import se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory.LocationRepositoryInMem;
 import se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory.VoyageRepositoryInMem;
 
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static se.citerus.dddsample.tracking.core.application.util.DateTestUtil.toDate;
+import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.HONGKONG;
+import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.ROTTERDAM;
+
 public class ReportsUpdaterTest {
 
-  ReportsUpdater reportsUpdater;
-  WebClient client;
+  ReportPusher reportPusher;
+  ReportSubmission reportSubmission;
   EventSequenceNumber eventSequenceNumber;
 
   @Before
   public void setUp() {
-    client = mock(WebClient.class);
+    reportSubmission = mock(ReportSubmission.class);
     CargoRepository cargoRepository = new CargoRepositoryInMem();
     HandlingEventRepository handlingEventRepository = new HandlingEventRepositoryInMem();
     HandlingEventFactory handlingEventFactory = new HandlingEventFactory(cargoRepository, new VoyageRepositoryInMem(), new LocationRepositoryInMem());
@@ -45,15 +47,13 @@ public class ReportsUpdaterTest {
 
     cargo.handled(handlingEvent.activity());
 
-    reportsUpdater = new ReportsUpdater(client, cargoRepository, handlingEventRepository, "/handling", "/cargo");
+    reportPusher = new ReportPusher(reportSubmission, cargoRepository, handlingEventRepository);
     eventSequenceNumber = handlingEvent.sequenceNumber();
   }
 
   @Test
   public void reportCargoUpdate() {
-    when(client.path("/cargo")).thenReturn(client);
-
-    reportsUpdater.reportCargoUpdate(new TrackingId("ABC"));
+    reportPusher.reportCargoUpdate(new TrackingId("ABC"));
 
     CargoDetails expected = new CargoDetails();
     expected.setTrackingId("ABC");
@@ -61,20 +61,19 @@ public class ReportsUpdaterTest {
     expected.setFinalDestination("Rotterdam");
     expected.setCurrentStatus("IN_PORT");
 
-    verify(client).post(eq(expected));
+    verify(reportSubmission).submitCargoDetails(eq(expected));
   }
 
   @Test
   public void reportHandling() {
-    when(client.path("/handling")).thenReturn(client);
-
-    reportsUpdater.reportHandlingEvent(eventSequenceNumber);
+    reportPusher.reportHandlingEvent(eventSequenceNumber);
     
     Handling expected = new Handling();
     expected.setLocation("Hongkong");
     expected.setType("RECEIVE");
     expected.setVoyage("");
-    verify(client).post(eq(expected));
+
+    verify(reportSubmission).submitHandling(eq("ABC"), eq(expected));
   }
 
 }