Made submission of handling reports synchronously registering handling events.

dddsample/src/main/java/se/citerus/dddsample/infrastructure/messaging/jms/HandlingEventRegistrationAttemptConsumer.java

-package se.citerus.dddsample.infrastructure.messaging.jms;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import se.citerus.dddsample.application.HandlingEventService;
-import se.citerus.dddsample.interfaces.handling.HandlingEventRegistrationAttempt;
-
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.ObjectMessage;
-
-/**
- * Consumes handling event registration attempt messages and delegates to
- * proper registration.
- * 
- */
-public class HandlingEventRegistrationAttemptConsumer implements MessageListener {
-
-  private HandlingEventService handlingEventService;
-  private static final Log logger = LogFactory.getLog(HandlingEventRegistrationAttemptConsumer.class);
-
-  @Override
-  public void onMessage(final Message message) {
-    try {
-      final ObjectMessage om = (ObjectMessage) message;
-      HandlingEventRegistrationAttempt attempt = (HandlingEventRegistrationAttempt) om.getObject();
-      handlingEventService.registerHandlingEvent(
-        attempt.getCompletionTime(),
-        attempt.getTrackingId(),
-        attempt.getVoyageNumber(),
-        attempt.getUnLocode(),
-        attempt.getType()
-      );
-    } catch (Exception e) {
-      logger.error(e, e);
-    }
-  }
-
-  public void setHandlingEventService(HandlingEventService handlingEventService) {
-    this.handlingEventService = handlingEventService;
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/interfaces/handling/HandlingEventRegistrationAttempt.java

-package se.citerus.dddsample.interfaces.handling;
-
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import se.citerus.dddsample.domain.model.location.UnLocode;
-import se.citerus.dddsample.domain.model.voyage.VoyageNumber;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * This is a simple transfer object for passing incoming handling event
- * registration attempts to proper the registration procedure.
- *
- * It is used as a message queue element. 
- *
- */
-public final class HandlingEventRegistrationAttempt implements Serializable {
-
-  private final Date registrationTime;
-  private final Date completionTime;
-  private final TrackingId trackingId;
-  private final VoyageNumber voyageNumber;
-  private final HandlingEvent.Type type;
-  private final UnLocode unLocode;
-
-  public HandlingEventRegistrationAttempt(final Date registrationDate,
-                                          final Date completionDate,
-                                          final TrackingId trackingId,
-                                          final VoyageNumber voyageNumber,
-                                          final HandlingEvent.Type type,
-                                          final UnLocode unLocode) {
-    this.registrationTime = registrationDate;
-    this.completionTime = completionDate;
-    this.trackingId = trackingId;
-    this.voyageNumber = voyageNumber;
-    this.type = type;
-    this.unLocode = unLocode;
-  }
-
-  public Date getCompletionTime() {
-    return new Date(completionTime.getTime());
-  }
-
-  public TrackingId getTrackingId() {
-    return trackingId;
-  }
-
-  public VoyageNumber getVoyageNumber() {
-    return voyageNumber;
-  }
-
-  public HandlingEvent.Type getType() {
-    return type;
-  }
-
-  public UnLocode getUnLocode() {
-    return unLocode;
-  }
-
-  public Date getRegistrationTime() {
-    return registrationTime;
-  }
-
-  @Override
-  public String toString() {
-    return ToStringBuilder.reflectionToString(this, ToStringStyle.MULTI_LINE_STYLE);
-  }
-  
-}

dddsample/src/main/java/se/citerus/dddsample/interfaces/handling/file/UploadDirectoryScanner.java

 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.InitializingBean;
-import se.citerus.dddsample.application.ApplicationEvents;
+import se.citerus.dddsample.application.HandlingEventService;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.domain.model.location.UnLocode;
 import se.citerus.dddsample.domain.model.voyage.VoyageNumber;
-import se.citerus.dddsample.interfaces.handling.HandlingEventRegistrationAttempt;
 import static se.citerus.dddsample.interfaces.handling.HandlingReportParser.*;
 
 import java.io.File;
 
   private File uploadDirectory;
   private File parseFailureDirectory;
+  private HandlingEventService handlingEventService;
 
   private final static Log logger = LogFactory.getLog(UploadDirectoryScanner.class);
-  private ApplicationEvents applicationEvents;
 
   @Override
   public void run() {
     final UnLocode unLocode = parseUnLocode(unLocodeStr, errors);
 
     if (errors.isEmpty()) {
-      final HandlingEventRegistrationAttempt attempt = new HandlingEventRegistrationAttempt(new Date(), date, trackingId, voyageNumber, eventType, unLocode);
-      applicationEvents.receivedHandlingEventRegistrationAttempt(attempt);
+      handlingEventService.registerHandlingEvent(date, trackingId, voyageNumber, unLocode, eventType);
     } else {
       throw new Exception(errors.toString());
     }
     this.parseFailureDirectory = parseFailureDirectory;
   }
 
-  public void setApplicationEvents(ApplicationEvents applicationEvents) {
-    this.applicationEvents = applicationEvents;
+  public void setHandlingEventService(HandlingEventService handlingEventService) {
+    this.handlingEventService = handlingEventService;
   }
 }

dddsample/src/main/java/se/citerus/dddsample/interfaces/handling/ws/HandlingReportServiceImpl.java

 import com.aggregator.HandlingReportService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import se.citerus.dddsample.application.ApplicationEvents;
+import se.citerus.dddsample.application.HandlingEventService;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
+import se.citerus.dddsample.domain.model.handling.CannotCreateHandlingEventException;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.domain.model.location.UnLocode;
 import se.citerus.dddsample.domain.model.voyage.VoyageNumber;
-import se.citerus.dddsample.interfaces.handling.HandlingEventRegistrationAttempt;
 import static se.citerus.dddsample.interfaces.handling.HandlingReportParser.*;
 
 import javax.jws.WebParam;
 import javax.jws.WebService;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+import java.util.*;
 
 /**
  * This web service endpoint implementation performs basic validation and parsing
- * of incoming data, and in case of a valid registration attempt, sends an asynchronous message
- * with the informtion to the handling event registration system for proper registration.
- *  
+ * of an incoming handling report, and attempts to register proper handling events
+ * by calling the application layer.
  */
 @WebService(endpointInterface = "com.aggregator.HandlingReportService")
 public class HandlingReportServiceImpl implements HandlingReportService {
 
-  private ApplicationEvents applicationEvents;
+  private HandlingEventService handlingEventService;
   private final static Log logger = LogFactory.getLog(HandlingReportServiceImpl.class);
 
   @Override
   public void submitReport(@WebParam(name = "arg0", targetNamespace = "") HandlingReport handlingReport) throws HandlingReportErrors_Exception {
-    final List<String> errors = new ArrayList<String>();
+    final List<String> validationErrors = new ArrayList<String>();
 
-    final Date completionTime = parseCompletionTime(handlingReport, errors);
-    final VoyageNumber voyageNumber = parseVoyageNumber(handlingReport.getVoyageNumber(), errors);
-    final HandlingEvent.Type type = parseEventType(handlingReport.getType(), errors);
-    final UnLocode unLocode = parseUnLocode(handlingReport.getUnLocode(), errors);
+    final Date completionTime = parseCompletionTime(handlingReport, validationErrors);
+    final VoyageNumber voyageNumber = parseVoyageNumber(handlingReport.getVoyageNumber(), validationErrors);
+    final HandlingEvent.Type type = parseEventType(handlingReport.getType(), validationErrors);
+    final UnLocode unLocode = parseUnLocode(handlingReport.getUnLocode(), validationErrors);
 
+    final Map<String,String> allErrors = new HashMap<String, String>();
     for (String trackingIdStr : handlingReport.getTrackingIds()) {
-      final TrackingId trackingId = parseTrackingId(trackingIdStr, errors);
+      final TrackingId trackingId = parseTrackingId(trackingIdStr, validationErrors);
 
-      if (errors.isEmpty()) {
-        final Date registrationTime = new Date();
-        final HandlingEventRegistrationAttempt attempt = new HandlingEventRegistrationAttempt(
-          registrationTime, completionTime, trackingId, voyageNumber, type, unLocode
-        );
-
-        applicationEvents.receivedHandlingEventRegistrationAttempt(attempt);
+      if (validationErrors.isEmpty()) {
+        try {
+          handlingEventService.registerHandlingEvent(completionTime, trackingId, voyageNumber, unLocode, type);
+        } catch (CannotCreateHandlingEventException e) {
+          logger.error(e, e);
+          allErrors.put(trackingIdStr, e.getMessage());
+        }
       } else {
-        logger.error("Parse error in handling report: " + errors);
-        final HandlingReportErrors faultInfo = new HandlingReportErrors();
-        throw new HandlingReportErrors_Exception(errors.toString(), faultInfo);
+        logger.error("Parse error in handling report: " + validationErrors);
+        allErrors.put(trackingIdStr, validationErrors.toString());
       }
     }
 
+    if (!allErrors.isEmpty()) {
+      final HandlingReportErrors faultInfo = new HandlingReportErrors();
+      throw new HandlingReportErrors_Exception(createErrorMessage(allErrors), faultInfo);
+    }
+  }
+
+  private String createErrorMessage(final Map<String, String> allErrors) {
+    final StringBuilder sb = new StringBuilder("--- BEGIN HANDLING REPORT ERRORS ---\n");
+    for (Map.Entry<String, String> e : allErrors.entrySet()) {
+      sb.append(e.getKey()).append(" : ").append(e.getValue()).append("\n");
+    }
+    sb.append("--- END HANDLING REPORT ERRORS ---");
+    return sb.toString();
   }
 
-  public void setApplicationEvents(ApplicationEvents applicationEvents) {
-    this.applicationEvents = applicationEvents;
+  public void setHandlingEventService(final HandlingEventService handlingEventService) {
+    this.handlingEventService = handlingEventService;
   }
 
 }

dddsample/src/main/resources/context-interfaces.xml

   <jaxws:endpoint id="jax-ws.http" implementor="#handlingReportService" address="/RegisterEvent"/>
 
   <bean id="handlingReportService" class="se.citerus.dddsample.interfaces.handling.ws.HandlingReportServiceImpl">
-    <property name="applicationEvents" ref="applicationEvents"/>
+    <property name="handlingEventService" ref="handlingEventService"/>
   </bean>
 
 
   <bean id="uploadDirectoryScanner" class="se.citerus.dddsample.interfaces.handling.file.UploadDirectoryScanner">
     <property name="uploadDirectory" value="/tmp/upload"/>
     <property name="parseFailureDirectory" value="/tmp/failed"/>
-    <property name="applicationEvents" ref="applicationEvents"/>
+    <property name="handlingEventService" ref="handlingEventService"/>
   </bean>
 
   <bean id="handlingReportConsumptionSupport" class="se.citerus.dddsample.interfaces.handling.HandlingReportParser"/>