More Cleanup

dddsample/src/main/java/com/aggregator/HandlingReport.java

@@ -1,160 +0,0 @@
-package com.aggregator;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.XMLGregorianCalendar;
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * <p>Java class for handlingReport complex type.
- * <p/>
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p/>
- * <pre>
- * &lt;complexType name="handlingReport">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="completionTime" type="{http://www.w3.org/2001/XMLSchema}dateTime"/>
- *         &lt;element name="trackingIds" type="{http://www.w3.org/2001/XMLSchema}string" maxOccurs="unbounded"/>
- *         &lt;element name="type" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="unLocode" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         &lt;element name="voyageNumber" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "handlingReport", propOrder = {
-  "completionTime",
-  "trackingIds",
-  "type",
-  "unLocode",
-  "voyageNumber"
-})
-public class HandlingReport {
-
-  @XmlElement(required = true)
-  protected XMLGregorianCalendar completionTime;
-  @XmlElement(required = true)
-  protected List<String> trackingIds;
-  @XmlElement(required = true)
-  protected String type;
-  @XmlElement(required = true)
-  protected String unLocode;
-  protected String voyageNumber;
-
-  /**
-   * Gets the value of the completionTime property.
-   *
-   * @return possible object is
-   *         {@link XMLGregorianCalendar }
-   */
-  public XMLGregorianCalendar getCompletionTime() {
-    return completionTime;
-  }
-
-  /**
-   * Sets the value of the completionTime property.
-   *
-   * @param value allowed object is
-   *              {@link XMLGregorianCalendar }
-   */
-  public void setCompletionTime(XMLGregorianCalendar value) {
-    this.completionTime = value;
-  }
-
-  /**
-   * Gets the value of the trackingIds property.
-   * <p/>
-   * <p/>
-   * This accessor method returns a reference to the live list,
-   * not a snapshot. Therefore any modification you make to the
-   * returned list will be present inside the JAXB object.
-   * This is why there is not a <CODE>set</CODE> method for the trackingIds property.
-   * <p/>
-   * <p/>
-   * For example, to add a new item, do as follows:
-   * <pre>
-   *    getTrackingIds().add(newItem);
-   * </pre>
-   * <p/>
-   * <p/>
-   * <p/>
-   * Objects of the following type(s) are allowed in the list
-   * {@link String }
-   */
-  public List<String> getTrackingIds() {
-    if (trackingIds == null) {
-      trackingIds = new ArrayList<String>();
-    }
-    return this.trackingIds;
-  }
-
-  /**
-   * Gets the value of the type property.
-   *
-   * @return possible object is
-   *         {@link String }
-   */
-  public String getType() {
-    return type;
-  }
-
-  /**
-   * Sets the value of the type property.
-   *
-   * @param value allowed object is
-   *              {@link String }
-   */
-  public void setType(String value) {
-    this.type = value;
-  }
-
-  /**
-   * Gets the value of the unLocode property.
-   *
-   * @return possible object is
-   *         {@link String }
-   */
-  public String getUnLocode() {
-    return unLocode;
-  }
-
-  /**
-   * Sets the value of the unLocode property.
-   *
-   * @param value allowed object is
-   *              {@link String }
-   */
-  public void setUnLocode(String value) {
-    this.unLocode = value;
-  }
-
-  /**
-   * Gets the value of the voyageNumber property.
-   *
-   * @return possible object is
-   *         {@link String }
-   */
-  public String getVoyageNumber() {
-    return voyageNumber;
-  }
-
-  /**
-   * Sets the value of the voyageNumber property.
-   *
-   * @param value allowed object is
-   *              {@link String }
-   */
-  public void setVoyageNumber(String value) {
-    this.voyageNumber = value;
-  }
-
-}

dddsample/src/main/java/com/aggregator/HandlingReportErrors.java

@@ -1,29 +0,0 @@
-package com.aggregator;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for HandlingReportErrors complex type.
- * <p/>
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p/>
- * <pre>
- * &lt;complexType name="HandlingReportErrors">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "HandlingReportErrors")
-public class HandlingReportErrors {
-
-
-}

dddsample/src/main/java/com/aggregator/HandlingReportErrors_Exception.java

@@ -1,46 +0,0 @@
-package com.aggregator;
-
-import javax.xml.ws.WebFault;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.1 in JDK 6
- * Generated source version: 2.1
- */
-@WebFault(name = "HandlingReportErrors", targetNamespace = "http://ws.handling.interfaces.dddsample.citerus.se/")
-public class HandlingReportErrors_Exception
-  extends Exception {
-
-  /**
-   * Java type that goes as soapenv:Fault detail element.
-   */
-  private HandlingReportErrors faultInfo;
-
-  /**
-   * @param message
-   * @param faultInfo
-   */
-  public HandlingReportErrors_Exception(String message, HandlingReportErrors faultInfo) {
-    super(message);
-    this.faultInfo = faultInfo;
-  }
-
-  /**
-   * @param message
-   * @param faultInfo
-   * @param cause
-   */
-  public HandlingReportErrors_Exception(String message, HandlingReportErrors faultInfo, Throwable cause) {
-    super(message, cause);
-    this.faultInfo = faultInfo;
-  }
-
-  /**
-   * @return returns fault bean: com.aggregator.HandlingReportErrors
-   */
-  public HandlingReportErrors getFaultInfo() {
-    return faultInfo;
-  }
-
-}

dddsample/src/main/java/com/aggregator/HandlingReportService.java

@@ -1,36 +0,0 @@
-package com.aggregator;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.1 in JDK 6
- * Generated source version: 2.1
- */
-@WebService(name = "HandlingReportService", targetNamespace = "http://ws.handling.interfaces.dddsample.citerus.se/")
-@XmlSeeAlso({
-  ObjectFactory.class
-})
-public interface HandlingReportService {
-
-
-  /**
-   * @param arg0
-   * @throws HandlingReportErrors_Exception
-   */
-  @WebMethod
-  @RequestWrapper(localName = "submitReport", targetNamespace = "http://ws.handling.interfaces.dddsample.citerus.se/", className = "com.aggregator.SubmitReport")
-  @ResponseWrapper(localName = "submitReportResponse", targetNamespace = "http://ws.handling.interfaces.dddsample.citerus.se/", className = "com.aggregator.SubmitReportResponse")
-  public void submitReport(
-    @WebParam(name = "arg0", targetNamespace = "")
-    HandlingReport arg0)
-    throws HandlingReportErrors_Exception
-    ;
-
-}

dddsample/src/main/java/com/aggregator/HandlingReportService.wsdl

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="HandlingReportServiceService"
-                  targetNamespace="http://ws.handling.interfaces.dddsample.citerus.se/"
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-                  xmlns:tns="http://ws.handling.interfaces.dddsample.citerus.se/"
-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-  <wsdl:types>
-    <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-               xmlns:tns="http://ws.handling.interfaces.dddsample.citerus.se/" attributeFormDefault="unqualified"
-               elementFormDefault="unqualified" targetNamespace="http://ws.handling.interfaces.dddsample.citerus.se/">
-      <xs:element name="submitReport" type="tns:submitReport"/>
-      <xs:element name="submitReportResponse" type="tns:submitReportResponse"/>
-      <xs:complexType name="submitReport">
-        <xs:sequence>
-          <xs:element minOccurs="0" name="arg0" type="tns:handlingReport"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="handlingReport">
-        <xs:sequence>
-          <xs:element name="completionTime" type="xs:dateTime"/>
-          <xs:element maxOccurs="unbounded" name="trackingIds" type="xs:string"/>
-          <xs:element name="type" type="xs:string"/>
-          <xs:element name="unLocode" type="xs:string"/>
-          <xs:element minOccurs="0" name="voyageNumber" type="xs:string"/>
-        </xs:sequence>
-      </xs:complexType>
-      <xs:complexType name="submitReportResponse">
-        <xs:sequence/>
-      </xs:complexType>
-      <xs:element name="HandlingReportErrors" type="tns:HandlingReportErrors"/>
-      <xs:complexType name="HandlingReportErrors">
-        <xs:sequence/>
-      </xs:complexType>
-    </xs:schema>
-  </wsdl:types>
-  <wsdl:message name="HandlingReportErrors">
-    <wsdl:part name="HandlingReportErrors" element="tns:HandlingReportErrors">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="submitReport">
-    <wsdl:part name="parameters" element="tns:submitReport">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:message name="submitReportResponse">
-    <wsdl:part name="parameters" element="tns:submitReportResponse">
-    </wsdl:part>
-  </wsdl:message>
-  <wsdl:portType name="HandlingReportService">
-    <wsdl:operation name="submitReport">
-      <wsdl:input name="submitReport" message="tns:submitReport">
-      </wsdl:input>
-      <wsdl:output name="submitReportResponse" message="tns:submitReportResponse">
-      </wsdl:output>
-      <wsdl:fault name="HandlingReportErrors" message="tns:HandlingReportErrors">
-      </wsdl:fault>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="HandlingReportServiceServiceSoapBinding" type="tns:HandlingReportService">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="submitReport">
-      <soap:operation soapAction="" style="document"/>
-      <wsdl:input name="submitReport">
-        <soap:body use="literal"/>
-      </wsdl:input>
-      <wsdl:output name="submitReportResponse">
-        <soap:body use="literal"/>
-      </wsdl:output>
-      <wsdl:fault name="HandlingReportErrors">
-        <soap:fault name="HandlingReportErrors" use="literal"/>
-      </wsdl:fault>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="HandlingReportServiceService">
-    <wsdl:port name="HandlingReportServicePort" binding="tns:HandlingReportServiceServiceSoapBinding">
-      <soap:address location="http://localhost:9090/HandlingReportServicePort"/>
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>

dddsample/src/main/java/com/aggregator/HandlingReportServiceService.java

@@ -1,58 +0,0 @@
-package com.aggregator;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceFeature;
-import java.net.MalformedURLException;
-import java.net.URL;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.1 in JDK 6
- * Generated source version: 2.1
- */
-@WebServiceClient(name = "HandlingReportServiceService", targetNamespace = "http://ws.handling.interfaces.dddsample.citerus.se/", wsdlLocation = "file:///Users/peter/src/dddsample/src/main/resources/HandlingReportService.wsdl")
-public class HandlingReportServiceService
-  extends Service {
-
-  private final static URL HANDLINGREPORTSERVICESERVICE_WSDL_LOCATION;
-
-  static {
-    URL url = null;
-    try {
-      url = new URL("file:/Users/peter/src/dddsample/src/main/resources/HandlingReportService.wsdl");
-    } catch (MalformedURLException e) {
-      e.printStackTrace();
-    }
-    HANDLINGREPORTSERVICESERVICE_WSDL_LOCATION = url;
-  }
-
-  public HandlingReportServiceService(URL wsdlLocation, QName serviceName) {
-    super(wsdlLocation, serviceName);
-  }
-
-  public HandlingReportServiceService() {
-    super(HANDLINGREPORTSERVICESERVICE_WSDL_LOCATION, new QName("http://ws.handling.interfaces.dddsample.citerus.se/", "HandlingReportServiceService"));
-  }
-
-  /**
-   * @return returns HandlingReportService
-   */
-  @WebEndpoint(name = "HandlingReportServicePort")
-  public HandlingReportService getHandlingReportServicePort() {
-    return (HandlingReportService) super.getPort(new QName("http://ws.handling.interfaces.dddsample.citerus.se/", "HandlingReportServicePort"), HandlingReportService.class);
-  }
-
-  /**
-   * @param features A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
-   * @return returns HandlingReportService
-   */
-  @WebEndpoint(name = "HandlingReportServicePort")
-  public HandlingReportService getHandlingReportServicePort(WebServiceFeature... features) {
-    return (HandlingReportService) super.getPort(new QName("http://ws.handling.interfaces.dddsample.citerus.se/", "HandlingReportServicePort"), HandlingReportService.class, features);
-  }
-
-}

dddsample/src/main/java/com/aggregator/ObjectFactory.java

@@ -1,87 +0,0 @@
-package com.aggregator;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each
- * Java content interface and Java element interface
- * generated in the com.aggregator package.
- * <p>An ObjectFactory allows you to programatically
- * construct new instances of the Java representation
- * for XML content. The Java representation of XML
- * content can consist of schema derived interfaces
- * and classes representing the binding of schema
- * type definitions, element declarations and model
- * groups.  Factory methods for each of these are
- * provided in this class.
- */
-@XmlRegistry
-public class ObjectFactory {
-
-  private final static QName _SubmitReport_QNAME = new QName("http://ws.handling.interfaces.dddsample.citerus.se/", "submitReport");
-  private final static QName _HandlingReportErrors_QNAME = new QName("http://ws.handling.interfaces.dddsample.citerus.se/", "HandlingReportErrors");
-  private final static QName _SubmitReportResponse_QNAME = new QName("http://ws.handling.interfaces.dddsample.citerus.se/", "submitReportResponse");
-
-  /**
-   * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: com.aggregator
-   */
-  public ObjectFactory() {
-  }
-
-  /**
-   * Create an instance of {@link HandlingReportErrors }
-   */
-  public HandlingReportErrors createHandlingReportErrors() {
-    return new HandlingReportErrors();
-  }
-
-  /**
-   * Create an instance of {@link SubmitReportResponse }
-   */
-  public SubmitReportResponse createSubmitReportResponse() {
-    return new SubmitReportResponse();
-  }
-
-  /**
-   * Create an instance of {@link HandlingReport }
-   */
-  public HandlingReport createHandlingReport() {
-    return new HandlingReport();
-  }
-
-  /**
-   * Create an instance of {@link SubmitReport }
-   */
-  public SubmitReport createSubmitReport() {
-    return new SubmitReport();
-  }
-
-  /**
-   * Create an instance of {@link JAXBElement }{@code <}{@link SubmitReport }{@code >}}
-   */
-  @XmlElementDecl(namespace = "http://ws.handling.interfaces.dddsample.citerus.se/", name = "submitReport")
-  public JAXBElement<SubmitReport> createSubmitReport(SubmitReport value) {
-    return new JAXBElement<SubmitReport>(_SubmitReport_QNAME, SubmitReport.class, null, value);
-  }
-
-  /**
-   * Create an instance of {@link JAXBElement }{@code <}{@link HandlingReportErrors }{@code >}}
-   */
-  @XmlElementDecl(namespace = "http://ws.handling.interfaces.dddsample.citerus.se/", name = "HandlingReportErrors")
-  public JAXBElement<HandlingReportErrors> createHandlingReportErrors(HandlingReportErrors value) {
-    return new JAXBElement<HandlingReportErrors>(_HandlingReportErrors_QNAME, HandlingReportErrors.class, null, value);
-  }
-
-  /**
-   * Create an instance of {@link JAXBElement }{@code <}{@link SubmitReportResponse }{@code >}}
-   */
-  @XmlElementDecl(namespace = "http://ws.handling.interfaces.dddsample.citerus.se/", name = "submitReportResponse")
-  public JAXBElement<SubmitReportResponse> createSubmitReportResponse(SubmitReportResponse value) {
-    return new JAXBElement<SubmitReportResponse>(_SubmitReportResponse_QNAME, SubmitReportResponse.class, null, value);
-  }
-
-}

dddsample/src/main/java/com/aggregator/SubmitReport.java

@@ -1,53 +0,0 @@
-package com.aggregator;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for submitReport complex type.
- * <p/>
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p/>
- * <pre>
- * &lt;complexType name="submitReport">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element name="arg0" type="{http://ws.handling.interfaces.dddsample.citerus.se/}handlingReport" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "submitReport", propOrder = {
-  "arg0"
-})
-public class SubmitReport {
-
-  protected HandlingReport arg0;
-
-  /**
-   * Gets the value of the arg0 property.
-   *
-   * @return possible object is
-   *         {@link HandlingReport }
-   */
-  public HandlingReport getArg0() {
-    return arg0;
-  }
-
-  /**
-   * Sets the value of the arg0 property.
-   *
-   * @param value allowed object is
-   *              {@link HandlingReport }
-   */
-  public void setArg0(HandlingReport value) {
-    this.arg0 = value;
-  }
-
-}

dddsample/src/main/java/com/aggregator/SubmitReportResponse.java

@@ -1,29 +0,0 @@
-package com.aggregator;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for submitReportResponse complex type.
- * <p/>
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p/>
- * <pre>
- * &lt;complexType name="submitReportResponse">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "submitReportResponse")
-public class SubmitReportResponse {
-
-
-}

dddsample/src/main/java/com/aggregator/package-info.java

@@ -1 +0,0 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://ws.handling.interfaces.dddsample.citerus.se/") package com.aggregator;

dddsample/src/main/java/com/aggregator/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-	Generated from the upstream Aggregation Service WSDL
-</p>
-</body>
-</html>

dddsample/src/main/java/com/pathfinder/api/GraphTraversalService.java

@@ -1,25 +0,0 @@
-package com.pathfinder.api;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.util.List;
-import java.util.Properties;
-
-/**
- * Part of the external graph traversal API exposed by the routing team
- * and used by us (booking and tracking team).
- */
-public interface GraphTraversalService extends Remote {
-
-  /**
-   * @param originUnLocode      origin UN Locode
-   * @param destinationUnLocode destination UN Locode
-   * @param limitations         restrictions on the path selection, as key-value according to some API specification
-   * @return A list of transit paths
-   * @throws RemoteException RMI problem
-   */
-  List<TransitPath> findShortestPath(String originUnLocode,
-                                     String destinationUnLocode,
-                                     Properties limitations) throws RemoteException;
-
-}

dddsample/src/main/java/com/pathfinder/api/TransitEdge.java

@@ -1,58 +0,0 @@
-package com.pathfinder.api;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * Represents an edge in a path through a graph,
- * describing the route of a cargo.
- */
-public final class TransitEdge implements Serializable {
-
-  private final String voyageNumber;
-  private final String fromUnLocode;
-  private final String toUnLocode;
-  private final Date fromDate;
-  private final Date toDate;
-
-  /**
-   * Constructor.
-   *
-   * @param voyageNumber
-   * @param fromUnLocode
-   * @param toUnLocode
-   * @param fromDate
-   * @param toDate
-   */
-  public TransitEdge(final String voyageNumber,
-                     final String fromUnLocode,
-                     final String toUnLocode,
-                     final Date fromDate,
-                     final Date toDate) {
-    this.voyageNumber = voyageNumber;
-    this.fromUnLocode = fromUnLocode;
-    this.toUnLocode = toUnLocode;
-    this.fromDate = fromDate;
-    this.toDate = toDate;
-  }
-
-  public String getVoyageNumber() {
-    return voyageNumber;
-  }
-
-  public String getFromUnLocode() {
-    return fromUnLocode;
-  }
-
-  public String getToUnLocode() {
-    return toUnLocode;
-  }
-
-  public Date getFromDate() {
-    return fromDate;
-  }
-
-  public Date getToDate() {
-    return toDate;
-  }
-}

dddsample/src/main/java/com/pathfinder/api/TransitPath.java

@@ -1,29 +0,0 @@
-package com.pathfinder.api;
-
-import java.io.Serializable;
-import java.util.Collections;
-import java.util.List;
-
-/**
- *
- */
-public final class TransitPath implements Serializable {
-
-  private final List<TransitEdge> transitEdges;
-
-  /**
-   * Constructor.
-   *
-   * @param transitEdges The legs for this itinerary.
-   */
-  public TransitPath(final List<TransitEdge> transitEdges) {
-    this.transitEdges = transitEdges;
-  }
-
-  /**
-   * @return An unmodifiable list DTOs.
-   */
-  public List<TransitEdge> getTransitEdges() {
-    return Collections.unmodifiableList(transitEdges);
-  }
-}

dddsample/src/main/java/com/pathfinder/api/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-	Public API for the pathfinder application.
-</p>
-</body>
-</html>

dddsample/src/main/java/com/pathfinder/internal/GraphDAO.java

@@ -1,27 +0,0 @@
-package com.pathfinder.internal;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Random;
-
-public class GraphDAO {
-
-  private static final Random random = new Random();
-
-  public List<String> listLocations() {
-    return new ArrayList<String>(Arrays.asList(
-      "CNHKG", "AUMEL", "SESTO", "FIHEL", "USCHI", "JNTKO", "DEHAM", "CNSHA", "NLRTM", "SEGOT", "CNHGH", "USNYC", "USDAL"
-    ));
-  }
-
-  public String getVoyageNumber(String from, String to) {
-    final int i = random.nextInt(5);
-    if (i == 0) return "0100S";
-    if (i == 1) return "0200T";
-    if (i == 2) return "0300A";
-    if (i == 3) return "0301S";
-    return "0400S";
-  }
-
-}

dddsample/src/main/java/com/pathfinder/internal/GraphTraversalServiceImpl.java

@@ -1,83 +0,0 @@
-package com.pathfinder.internal;
-
-import com.pathfinder.api.GraphTraversalService;
-import com.pathfinder.api.TransitEdge;
-import com.pathfinder.api.TransitPath;
-
-import java.util.*;
-
-public class GraphTraversalServiceImpl implements GraphTraversalService {
-
-  private GraphDAO dao;
-  private Random random;
-  private static final long ONE_MIN_MS = 1000 * 60;
-  private static final long ONE_DAY_MS = ONE_MIN_MS * 60 * 24;
-
-  public GraphTraversalServiceImpl(GraphDAO dao) {
-    this.dao = dao;
-    this.random = new Random();
-  }
-
-  public List<TransitPath> findShortestPath(final String originUnLocode,
-                                            final String destinationUnLocode,
-                                            final Properties limitations) {
-    Date date = nextDate(new Date());
-
-    List<String> allVertices = dao.listLocations();
-    allVertices.remove(originUnLocode);
-    allVertices.remove(destinationUnLocode);
-
-    final int candidateCount = getRandomNumberOfCandidates();
-    final List<TransitPath> candidates = new ArrayList<TransitPath>(candidateCount);
-
-    for (int i = 0; i < candidateCount; i++) {
-      allVertices = getRandomChunkOfLocations(allVertices);
-      final List<TransitEdge> transitEdges = new ArrayList<TransitEdge>(allVertices.size() - 1);
-      final String firstLegTo = allVertices.get(0);
-
-      Date fromDate = nextDate(date);
-      Date toDate = nextDate(fromDate);
-      date = nextDate(toDate);
-
-      transitEdges.add(new TransitEdge(
-        dao.getVoyageNumber(originUnLocode, firstLegTo),
-        originUnLocode, firstLegTo, fromDate, toDate));
-
-      for (int j = 0; j < allVertices.size() - 1; j++) {
-        final String curr = allVertices.get(j);
-        final String next = allVertices.get(j + 1);
-        fromDate = nextDate(date);
-        toDate = nextDate(fromDate);
-        date = nextDate(toDate);
-        transitEdges.add(new TransitEdge(dao.getVoyageNumber(curr, next), curr, next, fromDate, toDate));
-      }
-
-      final String lastLegFrom = allVertices.get(allVertices.size() - 1);
-      fromDate = nextDate(date);
-      toDate = nextDate(fromDate);
-      transitEdges.add(new TransitEdge(
-        dao.getVoyageNumber(lastLegFrom, destinationUnLocode),
-        lastLegFrom, destinationUnLocode, fromDate, toDate));
-
-      candidates.add(new TransitPath(transitEdges));
-    }
-
-    return candidates;
-  }
-
-  private Date nextDate(Date date) {
-    return new Date(date.getTime() + ONE_DAY_MS + (random.nextInt(1000) - 500) * ONE_MIN_MS);
-  }
-
-  private int getRandomNumberOfCandidates() {
-    return 3 + random.nextInt(3);
-  }
-
-  private List<String> getRandomChunkOfLocations(List<String> allLocations) {
-    Collections.shuffle(allLocations);
-    final int total = allLocations.size();
-    final int chunk = total > 4 ? 1 + new Random().nextInt(5) : total;
-    return allLocations.subList(0, chunk);
-  }
-
-}

dddsample/src/main/java/com/pathfinder/internal/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-	Internal parts of the pathfinder application.
-</p>
-</body>
-</html>

dddsample/src/main/java/com/pathfinder/package.html

@@ -1,15 +0,0 @@
-<html>
-<body>
-<p>
-	This is the pathfinder application context, which is separate from "our" application and context.
-	Our domain model with cargo, itinerary, handling event etc does not exist here.
-	The routing domain service implementation works against the API exposed by
-	this context.
-</p>
-
-<p>
-	It is not related to the core application at all, and is only part of this source tree for
-	developer convenience.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/application/booking/BookingService.java

@@ -1,57 +0,0 @@
-package se.citerus.dddsample.application.booking;
-
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.cargo.Itinerary;
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.domain.model.location.UnLocode;
-
-import java.util.Date;
-import java.util.List;
-
-/**
- * Cargo booking service.
- */
-public interface BookingService {
-
-  /**
-   * Registers a new cargo in the tracking system, not yet routed.
-   *
-   * @param origin          cargo origin
-   * @param destination     cargo destination
-   * @param arrivalDeadline arrival deadline
-   * @return Cargo tracking id
-   */
-  TrackingId bookNewCargo(UnLocode origin, UnLocode destination, Date arrivalDeadline);
-
-  /**
-   * Requests a list of itineraries describing possible routes for this cargo.
-   *
-   * @param trackingId cargo tracking id
-   * @return A list of possible itineraries for this cargo
-   */
-  List<Itinerary> requestPossibleRoutesForCargo(TrackingId trackingId);
-
-  /**
-   * @param itinerary  itinerary describing the selected route
-   * @param trackingId cargo tracking id
-   */
-  void assignCargoToRoute(Itinerary itinerary, TrackingId trackingId);
-
-  /**
-   * Changes the destination of a cargo.
-   *
-   * @param trackingId cargo tracking id
-   * @param unLocode   UN locode of new destination
-   */
-  void changeDestination(TrackingId trackingId, UnLocode unLocode);
-
-  /**
-   * Loads a cargo for (re-) routing.
-   * Locks the cargo for exclusive modification.
-   *
-   * @param trackingId tracking id
-   * @return The cargo.
-   */
-  Cargo loadCargoForRouting(TrackingId trackingId);
-
-}

dddsample/src/main/java/se/citerus/dddsample/application/booking/BookingServiceImpl.java

@@ -1,90 +0,0 @@
-package se.citerus.dddsample.application.booking;
-
-import org.apache.commons.lang.Validate;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.transaction.annotation.Transactional;
-import se.citerus.dddsample.domain.model.cargo.*;
-import se.citerus.dddsample.domain.model.location.Location;
-import se.citerus.dddsample.domain.model.location.LocationRepository;
-import se.citerus.dddsample.domain.model.location.UnLocode;
-import se.citerus.dddsample.domain.service.RoutingService;
-
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-
-public final class BookingServiceImpl implements BookingService {
-
-  private final RoutingService routingService;
-  private final CargoFactory cargoFactory;
-  private final CargoRepository cargoRepository;
-  private final LocationRepository locationRepository;
-  private final Log logger = LogFactory.getLog(getClass());
-
-  public BookingServiceImpl(final RoutingService routingService,
-                            final CargoFactory cargoFactory,
-                            final CargoRepository cargoRepository,
-                            final LocationRepository locationRepository) {
-    this.routingService = routingService;
-    this.cargoFactory = cargoFactory;
-    this.cargoRepository = cargoRepository;
-    this.locationRepository = locationRepository;
-  }
-
-  @Override
-  @Transactional
-  public TrackingId bookNewCargo(final UnLocode originUnLocode,
-                                 final UnLocode destinationUnLocode,
-                                 final Date arrivalDeadline) {
-    final Cargo cargo = cargoFactory.newCargo(originUnLocode, destinationUnLocode, arrivalDeadline);
-    cargoRepository.store(cargo);
-    logger.info("Booked new cargo with tracking id " + cargo.trackingId().stringValue());
-
-    return cargo.trackingId();
-  }
-
-  @Override
-  @Transactional(readOnly = true)
-  public List<Itinerary> requestPossibleRoutesForCargo(final TrackingId trackingId) {
-    final Cargo cargo = cargoRepository.find(trackingId);
-
-    if (cargo == null) {
-      return Collections.emptyList();
-    }
-
-    return routingService.fetchRoutesForSpecification(cargo.routeSpecification());
-  }
-
-  @Override
-  @Transactional
-  public void assignCargoToRoute(final Itinerary itinerary, final TrackingId trackingId) {
-    final Cargo cargo = cargoRepository.find(trackingId);
-    Validate.notNull(cargo, "Can't assign itinerary to non-existing cargo " + trackingId);
-    cargo.assignToRoute(itinerary);
-    cargoRepository.store(cargo);
-
-    logger.info("Assigned cargo " + trackingId + " to new route");
-  }
-
-  @Override
-  @Transactional
-  public void changeDestination(final TrackingId trackingId, final UnLocode unLocode) {
-    final Cargo cargo = cargoRepository.find(trackingId);
-    Validate.notNull(cargo, "Can't change destination of non-existing cargo " + trackingId);
-    final Location newDestination = locationRepository.find(unLocode);
-
-    final RouteSpecification routeSpecification = cargo.routeSpecification().withDestination(newDestination);
-    cargo.specifyNewRoute(routeSpecification);
-
-    cargoRepository.store(cargo);
-    logger.info("Changed destination for cargo " + trackingId + " to " + routeSpecification.destination());
-  }
-
-  @Override
-  @Transactional(readOnly = true)
-  public Cargo loadCargoForRouting(final TrackingId trackingId) {
-    return cargoRepository.find(trackingId);
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/application/booking/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-	Booking use cases.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/application/event/CargoUpdater.java

@@ -1,59 +0,0 @@
-package se.citerus.dddsample.application.event;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.transaction.annotation.Transactional;
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.cargo.CargoRepository;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
-import se.citerus.dddsample.domain.model.shared.EventSequenceNumber;
-import se.citerus.dddsample.domain.model.shared.HandlingActivity;
-
-public class CargoUpdater {
-
-  private SystemEvents systemEvents;
-  private CargoRepository cargoRepository;
-  private HandlingEventRepository handlingEventRepository;
-  private final Log logger = LogFactory.getLog(getClass());
-
-  public CargoUpdater(final SystemEvents systemEvents,
-                      final CargoRepository cargoRepository,
-                      final HandlingEventRepository handlingEventRepository) {
-    this.systemEvents = systemEvents;
-    this.cargoRepository = cargoRepository;
-    this.handlingEventRepository = handlingEventRepository;
-  }
-
-  @Transactional
-  public void updateCargo(final EventSequenceNumber eventSequenceNumber) {
-    final HandlingEvent handlingEvent = handlingEventRepository.find(eventSequenceNumber);
-    final HandlingActivity activity = handlingEvent.activity();
-    final Cargo cargo = handlingEvent.cargo();
-
-    cargo.handled(activity);
-
-    // TODO create domain events and deal with them as a result of the handling
-    /*
-    Here's an idea:
-
-    ResultOfHandling result = cargo.effectOf(activity);
-    cargo.apply(result);
-
-    or
-
-    cargo.handled(activity);
-    Delivery delivery = cargo.currentDelivery();
-    send all delivery.events();
-
-    */
-
-    cargoRepository.store(cargo);
-    systemEvents.notifyOfCargoUpdate(cargo);
-    logger.info("Updated cargo " + cargo);
-  }
-
-  CargoUpdater() {
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/application/event/ItineraryUpdater.java

@@ -1,43 +0,0 @@
-/**
- * Purpose
- * @author peter
- * @created 2009-aug-04
- * $Id$
- */
-package se.citerus.dddsample.application.event;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.transaction.annotation.Transactional;
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.cargo.CargoRepository;
-import se.citerus.dddsample.domain.model.cargo.Itinerary;
-import se.citerus.dddsample.domain.model.voyage.Voyage;
-import se.citerus.dddsample.domain.model.voyage.VoyageNumber;
-import se.citerus.dddsample.domain.model.voyage.VoyageRepository;
-
-import java.util.List;
-
-public final class ItineraryUpdater {
-
-  private VoyageRepository voyageRepository;
-  private CargoRepository cargoRepository;
-  private static final Log LOG = LogFactory.getLog(ItineraryUpdater.class);
-
-  public ItineraryUpdater(final VoyageRepository voyageRepository, final CargoRepository cargoRepository) {
-    this.voyageRepository = voyageRepository;
-    this.cargoRepository = cargoRepository;
-  }
-
-  @Transactional
-  public void updateItineraries(final VoyageNumber voyageNumber) {
-    final Voyage voyage = voyageRepository.find(voyageNumber);
-    final List<Cargo> affectedCargos = cargoRepository.findCargosOnVoyage(voyage);
-    for (final Cargo cargo : affectedCargos) {
-      final Itinerary newItinerary = cargo.itinerary().withRescheduledVoyage(voyage);
-      cargo.assignToRoute(newItinerary);
-      LOG.info("Updated itinerary of cargo " + cargo);
-    }
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/application/event/MisdirectedNotifier.java

@@ -1,37 +0,0 @@
-/**
- * Purpose
- * @author peter
- * @created 2009-aug-03
- * $Id$
- */
-package se.citerus.dddsample.application.event;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.transaction.annotation.Transactional;
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.cargo.CargoRepository;
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-
-public class MisdirectedNotifier {
-
-  private CargoRepository cargoRepository;
-
-  private static final Log LOG = LogFactory.getLog(MisdirectedNotifier.class);
-
-  public MisdirectedNotifier(final CargoRepository cargoRepository) {
-    this.cargoRepository = cargoRepository;
-  }
-
-  @Transactional
-  public void alertIfMisdirected(final TrackingId trackingId) {
-    final Cargo cargo = cargoRepository.find(trackingId);
-
-    if (cargo.isMisdirected()) {
-      LOG.info("Cargo " + cargo + " is misdirected!");
-    }
-  }
-
-  MisdirectedNotifier() {
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/application/event/ReadyToClaimNotfier.java

@@ -1,40 +0,0 @@
-/**
- * Purpose
- * @author peter
- * @created 2009-aug-03
- * $Id$
- */
-package se.citerus.dddsample.application.event;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.transaction.annotation.Transactional;
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.cargo.CargoRepository;
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-
-public class ReadyToClaimNotfier {
-
-  private CargoRepository cargoRepository;
-  private static final Log LOG = LogFactory.getLog(ReadyToClaimNotfier.class);
-
-  public ReadyToClaimNotfier(final CargoRepository cargoRepository) {
-    this.cargoRepository = cargoRepository;
-  }
-
-  @Transactional
-  public void alertIfReadyToClaim(final TrackingId trackingId) {
-    final Cargo cargo = cargoRepository.find(trackingId);
-                                                      
-    if (cargo.isReadyToClaim()) {
-      /**
-       * At this point, a real system would probably send an email or SMS
-       * or something, but we simply log a message.
-       */
-      LOG.info("Cargo " + cargo + " is ready to be claimed");
-    }
-  }
-
-  ReadyToClaimNotfier() {
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/application/event/SystemEvents.java

@@ -1,29 +0,0 @@
-package se.citerus.dddsample.application.event;
-
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-
-/**
- * This interface provides a way to let other parts
- * of the system know about events that have occurred.
- * <p/>
- * It may be implemented synchronously or asynchronously, using
- * for example JMS.
- */
-public interface SystemEvents {
-
-  /**
-   * A cargo has been handled.
-   *
-   * @param event handling event
-   */
-  void notifyOfHandlingEvent(HandlingEvent event);
-
-  /**
-   * Cargo delivery has been updated.
-   *
-   * @param cargo cargo
-   */
-  void notifyOfCargoUpdate(Cargo cargo);
-
-}

dddsample/src/main/java/se/citerus/dddsample/application/event/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-	Event/message driven application services.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/application/handling/HandlingEventService.java

@@ -1,35 +0,0 @@
-package se.citerus.dddsample.application.handling;
-
-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 java.util.Date;
-
-/**
- * Handling event service.
- */
-public interface HandlingEventService {
-
-  /**
-   * Registers a handling event in the system, and notifies interested
-   * parties that a cargo has been handled.
-   *
-   * @param completionTime when the event was completed
-   * @param trackingId     cargo tracking id
-   * @param voyageNumber   voyage number
-   * @param unLocode       UN locode for the location where the event occurred
-   * @param type           type of event
-   * @throws se.citerus.dddsample.domain.model.handling.CannotCreateHandlingEventException
-   *          if a handling event that represents an actual event that's relevant to a cargo we're tracking
-   *          can't be created from the parameters
-   */
-  void registerHandlingEvent(Date completionTime,
-                             TrackingId trackingId,
-                             VoyageNumber voyageNumber,
-                             UnLocode unLocode,
-                             HandlingEvent.Type type) throws CannotCreateHandlingEventException;
-
-}

dddsample/src/main/java/se/citerus/dddsample/application/handling/HandlingEventServiceImpl.java

@@ -1,60 +0,0 @@
-package se.citerus.dddsample.application.handling;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.transaction.annotation.Transactional;
-import se.citerus.dddsample.application.event.SystemEvents;
-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.handling.HandlingEventFactory;
-import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
-import se.citerus.dddsample.domain.model.location.UnLocode;
-import se.citerus.dddsample.domain.model.voyage.VoyageNumber;
-
-import java.util.Date;
-
-public final class HandlingEventServiceImpl implements HandlingEventService {
-
-  private final SystemEvents systemEvents;
-  private final HandlingEventRepository handlingEventRepository;
-  private final HandlingEventFactory handlingEventFactory;
-  private final Log logger = LogFactory.getLog(HandlingEventServiceImpl.class);
-
-  public HandlingEventServiceImpl(final HandlingEventRepository handlingEventRepository,
-                                  final SystemEvents systemEvents,
-                                  final HandlingEventFactory handlingEventFactory) {
-    this.handlingEventRepository = handlingEventRepository;
-    this.systemEvents = systemEvents;
-    this.handlingEventFactory = handlingEventFactory;
-  }
-
-  @Override
-  @Transactional(rollbackFor = CannotCreateHandlingEventException.class)
-  public void registerHandlingEvent(final Date completionTime,
-                                    final TrackingId trackingId,
-                                    final VoyageNumber voyageNumber,
-                                    final UnLocode unLocode,
-                                    final HandlingEvent.Type type) throws CannotCreateHandlingEventException {
-
-    final Date registrationTime = new Date();
-    /* Using a factory to create a HandlingEvent (aggregate). This is where
-       it is determined wether the incoming data, the attempt, actually is capable
-       of representing a real handling event. */
-    final HandlingEvent event = handlingEventFactory.createHandlingEvent(
-      registrationTime, completionTime, trackingId, voyageNumber, unLocode, type
-    );
-
-    /* Store the new handling event, which updates the persistent
-       state of the handling event aggregate (but not the cargo aggregate -
-       that happens asynchronously!)
-     */
-    handlingEventRepository.store(event);
-
-    /* Publish an event stating that a cargo has been handled. */
-    systemEvents.notifyOfHandlingEvent(event);
-
-    logger.info("Registered handling event");
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/application/handling/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-	Handling use cases.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/application/package.html

@@ -1,18 +0,0 @@
-<html>
-<body>
-<p>
-	This is the application layer: code that's needed for the application to
-	performs its tasks. It defines, or is defined by, use cases.
-</p>
-
-<p>
-	It is thin in terms of knowledge of domain business logic,
-	although it may be large in terms of lines of code.
-	It coordinates the domain layer objects to perform the actual tasks.
-</p>
-
-<p>
-	This layer is suitable for spanning transactions, security checks and high-level logging.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/application/util/DateTestUtil.java

@@ -1,38 +0,0 @@
-package se.citerus.dddsample.application.util;
-
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-
-/**
- * A few utils for working with Date in tests.
- */
-public final class DateTestUtil {
-
-  /**
-   * @param date date string as yyyy-MM-dd
-   * @return Date representation
-   */
-  public static Date toDate(final String date) {
-    return toDate(date, "00:00.00.000");
-  }
-
-  /**
-   * @param date date string as yyyy-MM-dd
-   * @param time time string as HH:mm
-   * @return Date representation
-   */
-  public static Date toDate(final String date, final String time) {
-    try {
-      return new SimpleDateFormat("yyyy-MM-dd HH:mm").parse(date + " " + time);
-    } catch (ParseException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  /**
-   * Prevent instantiation.
-   */
-  private DateTestUtil() {
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/application/util/SampleDataGenerator.java

@@ -1,334 +0,0 @@
-package se.citerus.dddsample.application.util;
-
-import org.hibernate.SessionFactory;
-import org.hibernate.classic.Session;
-import org.springframework.beans.factory.BeanFactoryUtils;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.transaction.PlatformTransactionManager;
-import org.springframework.transaction.TransactionStatus;
-import org.springframework.transaction.support.TransactionCallbackWithoutResult;
-import org.springframework.transaction.support.TransactionTemplate;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
-import static se.citerus.dddsample.application.util.DateTestUtil.toDate;
-import se.citerus.dddsample.domain.model.cargo.*;
-import se.citerus.dddsample.domain.model.handling.CannotCreateHandlingEventException;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import se.citerus.dddsample.domain.model.handling.HandlingEventFactory;
-import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
-import se.citerus.dddsample.domain.model.location.Location;
-import se.citerus.dddsample.domain.model.location.LocationRepository;
-import se.citerus.dddsample.domain.model.location.SampleLocations;
-import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
-import static se.citerus.dddsample.domain.model.voyage.SampleVoyages.*;
-import se.citerus.dddsample.domain.model.voyage.VoyageRepository;
-
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-import java.sql.Timestamp;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import static java.util.Arrays.asList;
-import java.util.Date;
-
-/**
- * Provides sample data.
- */
-public class SampleDataGenerator implements ServletContextListener {
-
-  private static final Timestamp base;
-
-  static {
-    try {
-      Date date = new SimpleDateFormat("yyyy-MM-dd").parse("2008-01-01");
-      base = new Timestamp(date.getTime() - 1000L * 60 * 60 * 24 * 100);
-    } catch (ParseException e) {
-      throw new RuntimeException(e);
-    }
-  }
-
-  private static void loadHandlingEventData(JdbcTemplate jdbcTemplate) {
-    String handlingEventSql =
-      "insert into HandlingEvent (sequence_number, completionTime, registrationTime, type, location_id, voyage_id, cargo_id) " +
-        "values (?, ?, ?, ?, ?, ?, ?)";
-
-    Object[][] handlingEventArgs = {
-      //XYZ (SESTO-FIHEL-DEHAM-CNHKG-JPTOK-AUMEL)
-      {1, ts(0), ts((0)), "RECEIVE", 1, null, 1},
-      {2, ts((4)), ts((5)), "LOAD", 1, 1, 1},
-      {3, ts((14)), ts((14)), "UNLOAD", 5, 1, 1},
-      {4, ts((15)), ts((15)), "LOAD", 5, 1, 1},
-      {5, ts((30)), ts((30)), "UNLOAD", 6, 1, 1},
-      {6, ts((33)), ts((33)), "LOAD", 6, 1, 1},
-      {7, ts((34)), ts((34)), "UNLOAD", 3, 1, 1},
-      {8, ts((60)), ts((60)), "LOAD", 3, 1, 1},
-      {9, ts((70)), ts((71)), "UNLOAD", 4, 1, 1},
-      {10, ts((75)), ts((75)), "LOAD", 4, 1, 1},
-      {11, ts((88)), ts((88)), "UNLOAD", 2, 1, 1},
-      {12, ts((100)), ts((102)), "CLAIM", 2, null, 1},
-
-      //ZYX (AUMEL - USCHI - DEHAM -)
-      {13, ts((200)), ts((201)), "RECEIVE", 2, null, 3},
-      {14, ts((202)), ts((202)), "LOAD", 2, 2, 3},
-      {15, ts((208)), ts((208)), "UNLOAD", 7, 2, 3},
-      {16, ts((212)), ts((212)), "LOAD", 7, 2, 3},
-      {17, ts((230)), ts((230)), "UNLOAD", 6, 2, 3},
-      {18, ts((235)), ts((235)), "LOAD", 6, 2, 3},
-
-      //ABC
-      {19, ts((20)), ts((21)), "CLAIM", 2, null, 2},
-
-      //CBA
-      {20, ts((0)), ts((1)), "RECEIVE", 2, null, 4},
-      {21, ts((10)), ts((11)), "LOAD", 2, 2, 4},
-      {22, ts((20)), ts((21)), "UNLOAD", 7, 2, 4},
-
-      //FGH
-      {23, ts(100), ts(160), "RECEIVE", 3, null, 5},
-      {24, ts(150), ts(110), "LOAD", 3, 3, 5},
-
-      // JKL
-      {25, ts(200), ts(220), "RECEIVE", 6, null, 6},
-      {26, ts(300), ts(330), "LOAD", 6, 3, 6},
-      {27, ts(400), ts(440), "UNLOAD", 5, 3, 6}  // Unexpected event
-    };
-    executeUpdate(jdbcTemplate, handlingEventSql, handlingEventArgs);
-  }
-
-  private static void loadCarrierMovementData(JdbcTemplate jdbcTemplate) {
-    String voyageSql =
-      "insert into Voyage (id, voyage_number) values (?, ?)";
-    Object[][] voyageArgs = {
-      {1, "0101"},
-      {2, "0202"},
-      {3, "0303"}
-    };
-    executeUpdate(jdbcTemplate, voyageSql, voyageArgs);
-
-    String carrierMovementSql =
-      "insert into CarrierMovement (id, voyage_id, departure_location_id, arrival_location_id, departure_time, arrival_time, cm_index) " +
-        "values (?,?,?,?,?,?,?)";
-
-    Object[][] carrierMovementArgs = {
-      // SESTO - FIHEL - DEHAM - CNHKG - JPTOK - AUMEL (voyage 0101)
-      {1, 1, 1, 5, ts(1), ts(2), 0},
-      {2, 1, 5, 6, ts(1), ts(2), 1},
-      {3, 1, 6, 3, ts(1), ts(2), 2},
-      {4, 1, 3, 4, ts(1), ts(2), 3},
-      {5, 1, 4, 2, ts(1), ts(2), 4},
-
-      // AUMEL - USCHI - DEHAM - SESTO - FIHEL (voyage 0202)
-      {7, 2, 2, 7, ts(1), ts(2), 0},
-      {8, 2, 7, 6, ts(1), ts(2), 1},
-      {9, 2, 6, 1, ts(1), ts(2), 2},
-      {6, 2, 1, 5, ts(1), ts(2), 3},
-
-      // CNHKG - AUMEL - FIHEL - DEHAM - SESTO - USCHI - JPTKO (voyage 0303)
-      {10, 3, 3, 2, ts(1), ts(2), 0},
-      {11, 3, 2, 5, ts(1), ts(2), 1},
-      {12, 3, 6, 1, ts(1), ts(2), 2},
-      {13, 3, 1, 7, ts(1), ts(2), 3},
-      {14, 3, 7, 4, ts(1), ts(2), 4}
-    };
-    executeUpdate(jdbcTemplate, carrierMovementSql, carrierMovementArgs);
-  }
-
-  private static void loadCargoData(JdbcTemplate jdbcTemplate) {
-    String cargoSql =
-      "insert into Cargo (id, tracking_id, spec_origin_id, spec_destination_id, spec_arrival_deadline, calculated_at) " +
-        "values (?, ?, ?, ?, ?, ?)";
-
-    Object[][] cargoArgs = {
-      {1, "XYZ", 1, 2, ts(10), ts(100)},
-      {2, "ABC", 1, 5, ts(20), ts(100)},
-      {3, "ZYX", 2, 1, ts(30), ts(100)},
-      {4, "CBA", 5, 1, ts(40), ts(100)},
-      {5, "FGH", 3, 5, ts(50), ts(100)},  // Cargo origin differs from spec origin
-      {6, "JKL", 6, 4, ts(60), ts(100)}
-    };
-    executeUpdate(jdbcTemplate, cargoSql, cargoArgs);
-  }
-
-  private static void loadLocationData(JdbcTemplate jdbcTemplate) {
-    String locationSql =
-      "insert into Location (id, unlocode, name) " +
-        "values (?, ?, ?)";
-
-    Object[][] locationArgs = {
-      {1, "SESTO", "Stockholm"},
-      {2, "AUMEL", "Melbourne"},
-      {3, "CNHKG", "Hongkong"},
-      {4, "JPTOK", "Tokyo"},
-      {5, "FIHEL", "Helsinki"},
-      {6, "DEHAM", "Hamburg"},
-      {7, "USCHI", "Chicago"}
-    };
-    executeUpdate(jdbcTemplate, locationSql, locationArgs);
-  }
-
-  private static void loadItineraryData(JdbcTemplate jdbcTemplate) {
-    String legSql =
-      "insert into Leg (id, cargo_id, voyage_id, load_location_id, unload_location_id, load_time, unload_time, leg_index) " +
-        "values (?,?,?,?,?,?,?,?)";
-
-    Object[][] legArgs = {
-      // Cargo 5: Hongkong - Melbourne - Stockholm - Helsinki
-      {1, 5, 1, 3, 2, ts(1), ts(2), 0},
-      {2, 5, 1, 2, 1, ts(3), ts(4), 1},
-      {3, 5, 1, 1, 5, ts(4), ts(5), 2},
-      // Cargo 6: Hamburg - Stockholm - Chicago - Tokyo
-      {4, 6, 2, 6, 1, ts(1), ts(2), 0},
-      {5, 6, 2, 1, 7, ts(3), ts(4), 1},
-      {6, 6, 2, 7, 4, ts(5), ts(6), 2}
-    };
-    executeUpdate(jdbcTemplate, legSql, legArgs);
-  }
-
-  public void contextInitialized(ServletContextEvent event) {
-    WebApplicationContext context = WebApplicationContextUtils.getRequiredWebApplicationContext(event.getServletContext());
-    PlatformTransactionManager transactionManager = (PlatformTransactionManager) BeanFactoryUtils.beanOfType(context, PlatformTransactionManager.class);
-    TransactionTemplate tt = new TransactionTemplate(transactionManager);
-    //loadSampleData(new JdbcTemplate(dataSource), tt);
-
-
-    SessionFactory sf = (SessionFactory) BeanFactoryUtils.beanOfType(context, SessionFactory.class);
-    HandlingEventFactory handlingEventFactory = new HandlingEventFactory(
-      getBean(context, CargoRepository.class),
-      getBean(context, VoyageRepository.class),
-      getBean(context, LocationRepository.class));
-    loadHibernateData(tt, sf, handlingEventFactory, getBean(context, HandlingEventRepository.class));
-  }
-
-  private <T> T getBean(WebApplicationContext context, Class<T> cls) {
-    //noinspection unchecked
-    return (T) BeanFactoryUtils.beanOfType(context, cls);
-  }
-
-  public static void loadHibernateData(TransactionTemplate tt, final SessionFactory sf, final HandlingEventFactory handlingEventFactory, final HandlingEventRepository handlingEventRepository) {
-    tt.execute(new TransactionCallbackWithoutResult() {
-      @Override
-      protected void doInTransactionWithoutResult(TransactionStatus status) {
-        Session session = sf.getCurrentSession();
-
-        for (Location location : SampleLocations.getAll()) {
-          session.save(location);
-        }
-
-        session.save(HONGKONG_TO_NEW_YORK);
-        session.save(NEW_YORK_TO_DALLAS);
-        session.save(DALLAS_TO_HELSINKI);
-        session.save(HELSINKI_TO_HONGKONG);
-        session.save(DALLAS_TO_HELSINKI_ALT);
-
-        RouteSpecification routeSpecification = new RouteSpecification(HONGKONG, HELSINKI, toDate("2009-03-15"));
-        TrackingId trackingId = new TrackingId("ABC123");
-        Cargo abc123 = new Cargo(trackingId, routeSpecification);
-
-        Itinerary itinerary = new Itinerary(asList(
-          new Leg(HONGKONG_TO_NEW_YORK, HONGKONG, NEWYORK, toDate("2009-03-02"), toDate("2009-03-05")),
-          new Leg(NEW_YORK_TO_DALLAS, NEWYORK, DALLAS, toDate("2009-03-06"), toDate("2009-03-08")),
-          new Leg(DALLAS_TO_HELSINKI, DALLAS, HELSINKI, toDate("2009-03-09"), toDate("2009-03-12"))
-        ));
-        abc123.assignToRoute(itinerary);
-
-        session.save(abc123);
-
-        try {
-          HandlingEvent event1 = handlingEventFactory.createHandlingEvent(
-            new Date(), toDate("2009-03-01"), trackingId, null, HONGKONG.unLocode(), HandlingEvent.Type.RECEIVE
-          );
-          session.save(event1);
-
-          HandlingEvent event2 = handlingEventFactory.createHandlingEvent(
-            new Date(), toDate("2009-03-02"), trackingId, HONGKONG_TO_NEW_YORK.voyageNumber(), HONGKONG.unLocode(), HandlingEvent.Type.LOAD
-          );
-          session.save(event2);
-
-          HandlingEvent event3 = handlingEventFactory.createHandlingEvent(
-            new Date(), toDate("2009-03-05"), trackingId, HONGKONG_TO_NEW_YORK.voyageNumber(), NEWYORK.unLocode(), HandlingEvent.Type.UNLOAD
-          );
-          session.save(event3);
-        } catch (CannotCreateHandlingEventException e) {
-          throw new RuntimeException(e);
-        }
-
-        final HandlingEvent handlingEvent = handlingEventRepository.mostRecentHandling(abc123);
-        abc123.handled(handlingEvent.activity());
-        session.update(abc123);
-
-        // Cargo JKL567
-
-        RouteSpecification routeSpecification1 = new RouteSpecification(HANGZOU, STOCKHOLM, toDate("2009-03-18"));
-        TrackingId trackingId1 = new TrackingId("JKL567");
-        Cargo jkl567 = new Cargo(trackingId1, routeSpecification1);
-
-        Itinerary itinerary1 = new Itinerary(asList(
-          new Leg(HONGKONG_TO_NEW_YORK, HANGZOU, NEWYORK, toDate("2009-03-03"), toDate("2009-03-05")),
-          new Leg(NEW_YORK_TO_DALLAS, NEWYORK, DALLAS, toDate("2009-03-06"), toDate("2009-03-08")),
-          new Leg(DALLAS_TO_HELSINKI, DALLAS, STOCKHOLM, toDate("2009-03-09"), toDate("2009-03-11"))
-        ));
-        jkl567.assignToRoute(itinerary1);
-
-        session.save(jkl567);
-
-        try {
-          HandlingEvent event1 = handlingEventFactory.createHandlingEvent(
-            new Date(), toDate("2009-03-01"), trackingId1, null, HANGZOU.unLocode(), HandlingEvent.Type.RECEIVE
-          );
-          session.save(event1);
-
-          HandlingEvent event2 = handlingEventFactory.createHandlingEvent(
-            new Date(), toDate("2009-03-03"), trackingId1, HONGKONG_TO_NEW_YORK.voyageNumber(), HANGZOU.unLocode(), HandlingEvent.Type.LOAD
-          );
-          session.save(event2);
-
-          HandlingEvent event3 = handlingEventFactory.createHandlingEvent(
-            new Date(), toDate("2009-03-05"), trackingId1, HONGKONG_TO_NEW_YORK.voyageNumber(), NEWYORK.unLocode(), HandlingEvent.Type.UNLOAD
-          );
-          session.save(event3);
-
-          HandlingEvent event4 = handlingEventFactory.createHandlingEvent(
-            new Date(), toDate("2009-03-06"), trackingId1, HONGKONG_TO_NEW_YORK.voyageNumber(), NEWYORK.unLocode(), HandlingEvent.Type.LOAD
-          );
-          session.save(event4);
-
-        } catch (CannotCreateHandlingEventException e) {
-          throw new RuntimeException(e);
-        }
-
-        HandlingEvent handlingEvent1 = handlingEventRepository.mostRecentHandling(jkl567);
-        jkl567.handled(handlingEvent1.activity());
-        session.update(jkl567);
-      }
-    });
-  }
-
-  public void contextDestroyed(ServletContextEvent event) {
-  }
-
-  public static void loadSampleData(final JdbcTemplate jdbcTemplate, TransactionTemplate transactionTemplate) {
-    transactionTemplate.execute(new TransactionCallbackWithoutResult() {
-      protected void doInTransactionWithoutResult(TransactionStatus status) {
-        loadLocationData(jdbcTemplate);
-        loadCarrierMovementData(jdbcTemplate);
-        loadCargoData(jdbcTemplate);
-        loadItineraryData(jdbcTemplate);
-        loadHandlingEventData(jdbcTemplate);
-      }
-    });
-  }
-
-  private static void executeUpdate(JdbcTemplate jdbcTemplate, String sql, Object[][] args) {
-    for (Object[] arg : args) {
-      jdbcTemplate.update(sql, arg);
-    }
-  }
-
-  private static Timestamp ts(int hours) {
-    return new Timestamp(base.getTime() + 1000L * 60 * 60 * hours);
-  }
-
-  public static Date offset(int hours) {
-    return new Date(ts(hours).getTime());
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/application/util/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-	Various utilities.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/Cargo.java

@@ -1,220 +0,0 @@
-package se.citerus.dddsample.domain.model.cargo;
-
-import org.apache.commons.lang.Validate;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import se.citerus.dddsample.domain.model.location.CustomsZone;
-import se.citerus.dddsample.domain.model.location.Location;
-import se.citerus.dddsample.domain.model.shared.HandlingActivity;
-import se.citerus.dddsample.domain.model.voyage.Voyage;
-import se.citerus.dddsample.domain.shared.DomainObjectUtils;
-import se.citerus.dddsample.domain.shared.Entity;
-
-import java.util.Date;
-
-/**
- * A Cargo. This is the central class in the domain model,
- * and it is the root of the Cargo-Itinerary-Leg-Delivery-RouteSpecification aggregate.
- * <p/>
- * A cargo is identified by a unique tracking id, and it always has an origin
- * and a route specification. The life cycle of a cargo begins with the booking procedure,
- * when the tracking id is assigned. During a (short) period of time, between booking
- * and initial routing, the cargo has no itinerary.
- * <p/>
- * The booking clerk requests a list of possible routes, matching the route specification,
- * and assigns the cargo to one route. The route to which a cargo is assigned is described
- * by an itinerary.
- * <p/>
- * A cargo can be re-routed during transport, on demand of the customer, in which case
- * a new route is specified for the cargo and a new route is requested. The old itinerary,
- * being a value object, is discarded and a new one is attached.
- * <p/>
- * It may also happen that a cargo is accidentally misrouted, which should notify the proper
- * personnel and also trigger a re-routing procedure.
- * <p/>
- * When a cargo is handled, the status of the delivery changes. Everything about the delivery
- * of the cargo is contained in the Delivery value object, which is replaced whenever a cargo
- * is handled by an asynchronous event triggered by the registration of the handling event.
- * <p/>
- * The delivery can also be affected by routing changes, i.e. when a the route specification
- * changes, or the cargo is assigned to a new route. In that case, the delivery update is performed
- * synchronously within the cargo aggregate.
- * <p/>
- * The life cycle of a cargo ends when the cargo is claimed by the customer.
- * <p/>
- * The cargo aggregate, and the entre domain model, is built to solve the problem
- * of booking and tracking cargo. All important business rules for determining whether
- * or not a cargo is misdirected, what the current status of the cargo is (on board carrier,
- * in port etc), are captured in this aggregate.
- */
-public class Cargo implements Entity<Cargo> {
-
-  private TrackingId trackingId;
-  private RouteSpecification routeSpecification;
-  private Itinerary itinerary;
-  private Delivery delivery;
-  private Projections projections;
-
-  public Cargo(final TrackingId trackingId, final RouteSpecification routeSpecification) {
-    Validate.notNull(trackingId, "Tracking ID is required");
-    Validate.notNull(routeSpecification, "Route specification is required");
-
-    this.trackingId = trackingId;
-    this.routeSpecification = routeSpecification;
-    this.delivery = Delivery.initial();
-    this.projections = new Projections(delivery, itinerary, routeSpecification);
-  }
-
-  /**
-   * The tracking id is the identity of this entity, and is unique.
-   *
-   * @return Tracking id.
-   */
-  public TrackingId trackingId() {
-    return trackingId;
-  }
-
-  /**
-   * @return The itinerary. Never null.
-   */
-  public Itinerary itinerary() {
-    return DomainObjectUtils.nullSafe(this.itinerary, Itinerary.EMPTY_ITINERARY);
-  }
-
-  /**
-   * @return The route specification.
-   */
-  public RouteSpecification routeSpecification() {
-    return routeSpecification;
-  }
-
-  public Date estimatedTimeOfArrival() {
-    return projections.estimatedTimeOfArrival();
-  }
-
-  public HandlingActivity nextExpectedActivity() {
-    return projections.nextExpectedActivity();
-  }
-
-  public boolean isMisdirected() {
-    return delivery.isMisdirected(itinerary, routeSpecification);
-  }
-
-  public TransportStatus transportStatus() {
-    return delivery.transportStatus();
-  }
-
-  public RoutingStatus routingStatus() {
-    return delivery.routingStatus(itinerary, routeSpecification);
-  }
-
-  public Voyage currentVoyage() {
-    return delivery.currentVoyage();
-  }
-
-  public Location lastKnownLocation() {
-    return delivery.lastKnownLocation();
-  }
-
-  /**
-   * Specifies a new route for this cargo.
-   *
-   * @param routeSpecification route specification.
-   */
-  public void specifyNewRoute(final RouteSpecification routeSpecification) {
-    Validate.notNull(routeSpecification, "Route specification is required");
-
-    this.routeSpecification = routeSpecification;
-    // Handling consistency within the Cargo aggregate synchronously
-    this.projections = new Projections(delivery, itinerary, routeSpecification);
-  }
-
-  /**
-   * Attach a new itinerary to this cargo.
-   *
-   * @param itinerary an itinerary. May not be null.
-   */
-  public void assignToRoute(final Itinerary itinerary) {
-    Validate.notNull(itinerary, "Itinerary is required");
-
-    this.itinerary = itinerary;
-    // Handling consistency within the Cargo aggregate synchronously
-    this.projections = new Projections(delivery, itinerary, routeSpecification);
-  }
-
-  public CustomsZone customsZone() {
-    return routeSpecification.destination().customsZone();
-  }
-
-
-  public Location customsClearancePoint() {
-    return customsZone().entryPoint(itinerary.locations());
-  }
-
-  public boolean isReadyToClaim() {
-    return delivery.isUnloadedAtDestination(routeSpecification);
-  }
-
-  /**
-   * Updates all aspects of the cargo aggregate status
-   * based on the current route specification, itinerary and handling of the cargo.
-   * <p/>
-   * When either of those three changes, i.e. when a new route is specified for the cargo,
-   * the cargo is assigned to a route or when the cargo is handled, the status must be
-   * re-calculated.
-   * <p/>
-   * {@link RouteSpecification} and {@link Itinerary} are both inside the Cargo
-   * aggregate, so changes to them cause the status to be updated <b>synchronously</b>,
-   * but handling cause the status update to happen <b>asynchronously</b>
-   * since {@link HandlingEvent} is in a different aggregate.
-   *
-   * @param handlingActivity handling activity
-   */
-  public void handled(final HandlingActivity handlingActivity) {
-    Validate.notNull(handlingActivity, "Handling activity is required");
-
-    // Delivery and Projections are value object, so they are replaced with new or derived ones
-    this.delivery = Delivery.whenHandled(handlingActivity);
-    this.projections = new Projections(delivery, itinerary, routeSpecification);
-  }
-
-  @Override
-  public boolean sameAs(final Cargo other) {
-    return other != null && trackingId().sameValueAs(other.trackingId());
-  }
-
-  /**
-   * @param object to compare
-   * @return True if they have the same identity
-   * @see #sameAs(Cargo)
-   */
-  @Override
-  public boolean equals(final Object object) {
-    if (this == object) return true;
-    if (object == null || getClass() != object.getClass()) return false;
-
-    final Cargo other = (Cargo) object;
-    return sameAs(other);
-  }
-
-  /**
-   * @return Hash code of tracking id.
-   */
-  @Override
-  public int hashCode() {
-    return trackingId.hashCode();
-  }
-
-  @Override
-  public String toString() {
-    return trackingId + " (" + routeSpecification + ")";
-  }
-
-  Cargo() {
-    // Needed by Hibernate
-  }
-
-  // Auto-generated surrogate key
-  @SuppressWarnings("UnusedDeclaration")
-  private Long id;
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/CargoFactory.java

@@ -1,34 +0,0 @@
-/**
- * Purpose
- * @author peter
- * @created 2009-jun-14
- * $Id$
- */
-package se.citerus.dddsample.domain.model.cargo;
-
-import se.citerus.dddsample.domain.model.location.Location;
-import se.citerus.dddsample.domain.model.location.LocationRepository;
-import se.citerus.dddsample.domain.model.location.UnLocode;
-
-import java.util.Date;
-
-public class CargoFactory {
-
-  private final LocationRepository locationRepository;
-  private final TrackingIdGenerator trackingIdGenerator;
-
-  public CargoFactory(LocationRepository locationRepository, TrackingIdGenerator trackingIdGenerator) {
-    this.locationRepository = locationRepository;
-    this.trackingIdGenerator = trackingIdGenerator;
-  }
-
-  public Cargo newCargo(UnLocode originUnLocode, UnLocode destinationUnLocode, Date arrivalDeadline) {
-    final TrackingId trackingId = trackingIdGenerator.nextTrackingId();
-    final Location origin = locationRepository.find(originUnLocode);
-    final Location destination = locationRepository.find(destinationUnLocode);
-    final RouteSpecification routeSpecification = new RouteSpecification(origin, destination, arrivalDeadline);
-
-    return new Cargo(trackingId, routeSpecification);
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/CargoRepository.java

@@ -1,38 +0,0 @@
-package se.citerus.dddsample.domain.model.cargo;
-
-import se.citerus.dddsample.domain.model.voyage.Voyage;
-
-import java.util.List;
-
-public interface CargoRepository {
-
-  /**
-   * Finds a cargo using given id.
-   *
-   * @param trackingId Id
-   * @return Cargo if found, else {@code null}
-   */
-  Cargo find(TrackingId trackingId);
-
-  /**
-   *
-   * @param voyage
-   * @return
-   */
-  List<Cargo> findCargosOnVoyage(Voyage voyage);
-
-  /**
-   * Finds all cargo.
-   *
-   * @return All cargo.
-   */
-  List<Cargo> findAll();
-
-  /**
-   * Saves given cargo.
-   *
-   * @param cargo cargo to save
-   */
-  void store(Cargo cargo);
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/Delivery.java

@@ -1,177 +0,0 @@
-package se.citerus.dddsample.domain.model.cargo;
-
-import org.apache.commons.lang.Validate;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import static se.citerus.dddsample.domain.model.cargo.RoutingStatus.*;
-import static se.citerus.dddsample.domain.model.cargo.TransportStatus.ONBOARD_CARRIER;
-import static se.citerus.dddsample.domain.model.handling.HandlingEvent.Type.*;
-import se.citerus.dddsample.domain.model.location.Location;
-import se.citerus.dddsample.domain.model.shared.HandlingActivity;
-import se.citerus.dddsample.domain.model.voyage.Voyage;
-import se.citerus.dddsample.domain.shared.ValueObject;
-
-import java.util.Date;
-
-/**
- * Everything about the delivery of the cargo, i.e. where the cargo is
- * right now, whether or not it's routed, misdirected and so on.
- */
-public class Delivery implements ValueObject<Delivery> {
-
-  private HandlingActivity mostRecentHandlingActivity;
-  private Date calculatedAt;
-
-  /**
-   * Derives a new delivery when a cargo has been handled.
-   *
-   * @param handlingActivity  handling activity
-   * @return An up to date delivery
-   */
-  static Delivery whenHandled(final HandlingActivity handlingActivity) {
-    Validate.notNull(handlingActivity, "Handling activity is required");
-
-    return new Delivery(handlingActivity);
-  }
-
-  /**
-   * @return Initial delivery, before any handling has taken place
-   */
-  static Delivery initial() {
-    return new Delivery(null);
-  }
-
-  Delivery(final HandlingActivity mostRecentHandlingActivity) {
-    this.mostRecentHandlingActivity = mostRecentHandlingActivity;
-    this.calculatedAt = new Date();
-  }
-
-  /**
-   * @return Transport status
-   */
-  TransportStatus transportStatus() {
-    return TransportStatus.derivedFrom(mostRecentHandlingActivity);
-  }
-
-  /**
-   * @return Last known location of the cargo, or Location.UNKNOWN if the delivery history is empty.
-   */
-  Location lastKnownLocation() {
-    if (mostRecentHandlingActivity != null) {
-      return mostRecentHandlingActivity.location();
-    } else {
-      return Location.UNKNOWN;
-    }
-  }
-
-  /**
-   * @return Current voyage.
-   */
-  Voyage currentVoyage() {
-    if (mostRecentHandlingActivity != null && transportStatus().equals(ONBOARD_CARRIER)) {
-      return mostRecentHandlingActivity.voyage();
-    } else {
-      return Voyage.NONE;
-    }
-  }
-
-  /**
-   * Check if cargo is misdirected.
-   * <p/>
-   * <ul>
-   * <li>A cargo is misdirected if it is in a location that's not in the itinerary.
-   * <li>A cargo with no itinerary can not be misdirected.
-   * <li>A cargo that has received no handling events can not be misdirected.
-   * </ul>
-   *
-   * @return <code>true</code> if the cargo has been misdirected,
-   * @param itinerary itinerary
-   * @param routeSpecification route specification
-   */
-  boolean isMisdirected(final Itinerary itinerary, final RouteSpecification routeSpecification) {
-    if (mostRecentHandlingActivity == null) {
-      return false;
-    }
-
-    if (CUSTOMS.sameValueAs(mostRecentHandlingActivity.type())) {
-      return !routeSpecification.destination().sameAs(mostRecentHandlingActivity.location());
-    } else {
-      return !itinerary.isExpected(mostRecentHandlingActivity);
-    }
-  }
-
-  /**
-   * @return True if the cargo has been unloaded at the final destination.
-   * @param routeSpecification route specification
-   */
-  boolean isUnloadedAtDestination(final RouteSpecification routeSpecification) {
-    return mostRecentHandlingActivity != null &&
-          (CLAIM.sameValueAs(mostRecentHandlingActivity.type()) || UNLOAD.sameValueAs(mostRecentHandlingActivity.type()) &&
-           routeSpecification.destination().sameAs(mostRecentHandlingActivity.location()));
-  }
-
-  /**
-   * @return Routing status.
-   * @param itinerary itinerary
-   * @param routeSpecification route specification
-   */
-  RoutingStatus routingStatus(final Itinerary itinerary, final RouteSpecification routeSpecification) {
-    if (itinerary == null) {
-      return NOT_ROUTED;
-    } else {
-      if (routeSpecification.isSatisfiedBy(itinerary)) {
-        return ROUTED;
-      } else {
-        return MISROUTED;
-      }
-    }
-  }
-
-  /**
-   * @return When this delivery was calculated.
-   */
-  Date calculatedAt() {
-    return new Date(calculatedAt.getTime());
-  }
-
-  /**
-   * @return True if the cargo is routed and not misdirected  @param itinerary
-   * @param itinerary itinerary
-   * @param routeSpecification route specification
-   */
-  boolean onTrack(final Itinerary itinerary, final RouteSpecification routeSpecification) {
-    return routingStatus(itinerary, routeSpecification).sameValueAs(ROUTED) && 
-           !isMisdirected(itinerary, routeSpecification);
-  }
-
-  @Override
-  public boolean sameValueAs(final Delivery other) {
-    return other != null && new EqualsBuilder().
-      append(this.mostRecentHandlingActivity, other.mostRecentHandlingActivity).
-      append(this.calculatedAt, other.calculatedAt).
-      isEquals();
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    final Delivery other = (Delivery) o;
-
-    return sameValueAs(other);
-  }
-
-  @Override
-  public int hashCode() {
-    return new HashCodeBuilder().
-      append(mostRecentHandlingActivity).
-      append(calculatedAt).
-      toHashCode();
-  }
-
-  Delivery() {
-    // Needed by Hibernate
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/Itinerary.java

@@ -1,250 +0,0 @@
-package se.citerus.dddsample.domain.model.cargo;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.Validate;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import se.citerus.dddsample.domain.model.location.Location;
-import se.citerus.dddsample.domain.model.shared.HandlingActivity;
-import se.citerus.dddsample.domain.model.voyage.Voyage;
-import se.citerus.dddsample.domain.shared.ValueObject;
-
-import java.util.*;
-
-/**
- * An itinerary.
- */
-public class Itinerary implements ValueObject<Itinerary> {
-
-  private List<Leg> legs = Collections.emptyList();
-
-  static final Itinerary EMPTY_ITINERARY = new Itinerary();
-  private static final Date END_OF_DAYS = new Date(Long.MAX_VALUE);
-
-  /**
-   * Constructor.
-   *
-   * @param legs List of legs for this itinerary.
-   */
-  public Itinerary(final List<Leg> legs) {
-    Validate.notEmpty(legs);
-    Validate.noNullElements(legs);
-
-    // TODO
-    // Validate that legs are in proper order, connected
-    // and that load/unload times are doable?
-
-    this.legs = legs;
-  }
-
-  public Itinerary(final Leg... legs) {
-    this(Arrays.asList(legs));
-  }
-
-  /**
-   * @return the legs of this itinerary, as an <b>immutable</b> list.
-   */
-  public List<Leg> legs() {
-    return Collections.unmodifiableList(legs);
-  }
-
-  /**
-   * Test if the given handling event is expected when executing this itinerary.
-   *
-   * @param handlingActivity Event to test.
-   * @return <code>true</code> if the event is expected
-   */
-  public boolean isExpected(final HandlingActivity handlingActivity) {
-    if (isEmpty()) {
-      return false;
-    }
-
-    if (handlingActivity.type() == HandlingEvent.Type.RECEIVE) {
-      return (firstLeg().loadLocation().equals(handlingActivity.location()));
-    }
-
-    if (handlingActivity.type() == HandlingEvent.Type.LOAD) {
-      //Check that the there is a leg with same load location and voyage
-      for (Leg leg : legs) {
-        if (leg.loadLocation().sameAs(handlingActivity.location()) &&
-          leg.voyage().sameAs(handlingActivity.voyage()))
-          return true;
-      }
-      return false;
-    }
-
-    if (handlingActivity.type() == HandlingEvent.Type.UNLOAD) {
-      //Check that the there is a leg with same unload location and voyage
-      for (Leg leg : legs) {
-        if (leg.unloadLocation().sameAs(handlingActivity.location()) &&
-          leg.voyage().sameAs(handlingActivity.voyage()))
-          return true;
-      }
-      return false;
-    }
-
-    if (handlingActivity.type() == HandlingEvent.Type.CLAIM) {
-      //Check that the last leg's destination is from the handling activity's location
-      final Leg leg = lastLeg();
-      return (leg.unloadLocation().equals(handlingActivity.location()));
-    }
-
-    if (handlingActivity.type() == HandlingEvent.Type.CUSTOMS) {
-      //Check that the customs location fits the rule of the customs zone
-      //TODO Answering this properly requires Cargo's destination. Can't be answered at itinerary level.
-    }
-    return false;
-
-  }
-
-  /**
-   * @return The initial departure location.
-   */
-  Location initialLoadLocation() {
-    if (isEmpty()) {
-      return Location.UNKNOWN;
-    } else {
-      return legs.get(0).loadLocation();
-    }
-  }
-
-  /**
-   * @return The final arrival location.
-   */
-  Location finalUnloadLocation() {
-    if (isEmpty()) {
-      return Location.UNKNOWN;
-    } else {
-      return lastLeg().unloadLocation();
-    }
-  }
-
-  /**
-   * @return Date when cargo arrives at final destination.
-   */
-  Date finalUnloadTime() {
-    if (isEmpty()) return new Date(END_OF_DAYS.getTime());
-    return new Date(lastLeg().unloadTime().getTime());
-  }
-
-  private boolean isEmpty() {
-    return legs.isEmpty();
-  }
-
-  /**
-   * @return The first leg on the itinerary.
-   */
-  public Leg firstLeg() {
-    if (isEmpty()) return null;
-    return legs.get(0);
-  }
-
-  /**
-   * @return The last leg on the itinerary.
-   */
-  public Leg lastLeg() {
-    if (isEmpty()) return null;
-    return legs.get(legs.size() - 1);
-  }
-
-  /**
-   * @param rescheduledVoyage the voyage that has been rescheduled
-   * @return A new itinerary which is a copy of the old one, adjusted for the delay of the given voyage.
-   */
-  public Itinerary withRescheduledVoyage(final Voyage rescheduledVoyage) {
-    final List<Leg> newLegsList = new ArrayList<Leg>(this.legs.size());
-
-    Leg lastAdded = null;
-    for (Leg leg : this.legs) {
-      if (leg.voyage().sameAs(rescheduledVoyage)) {
-        Leg modifiedLeg = leg.withRescheduledVoyage(rescheduledVoyage);
-        // This truncates the itinerary if the voyage rescheduling makes
-        // it impossible to maintain the old unload-load chain.
-        if (lastAdded != null && modifiedLeg.loadTime().before(lastAdded.unloadTime())) {
-          break;
-        }
-        newLegsList.add(modifiedLeg);
-      } else {
-        newLegsList.add(leg);
-      }
-      lastAdded = leg;
-    }
-
-    return new Itinerary(newLegsList);
-  }
-
-  /**
-   * @return A list of all locations on this itinerary.
-   */
-  public List<Location> locations() {
-    final List<Location> result = new ArrayList<Location>(legs.size() + 1);
-    result.add(firstLeg().loadLocation());
-    for (Leg leg : legs) {
-      result.add(leg.unloadLocation());
-    }
-    return result;
-  }
-
-  /**
-   * @param location a location
-   * @return Load time at this location, or null if the location isn't on this itinerary.
-   */
-  public Date loadTimeAt(final Location location) {
-    for (Leg leg : legs) {
-      if (leg.loadLocation().sameAs(location)) {
-        return leg.loadTime();
-      }
-    }
-    return null;
-  }
-
-  /**
-   * @param location a location
-   * @return Unload time at this location, or null if the location isn't on this itinerary.
-   */
-  public Date unloadTimeAt(final Location location) {
-    for (Leg leg : legs) {
-      if (leg.unloadLocation().sameAs(location)) {
-        return leg.unloadTime();
-      }
-    }
-    return null;
-  }
-
-
-  /**
-   * @param other itinerary to compare
-   * @return <code>true</code> if the legs in this and the other itinerary are all equal.
-   */
-  @Override
-  public boolean sameValueAs(final Itinerary other) {
-    return other != null && legs.equals(other.legs);
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    final Itinerary itinerary = (Itinerary) o;
-
-    return sameValueAs(itinerary);
-  }
-
-  @Override
-  public int hashCode() {
-    return legs.hashCode();
-  }
-
-  @Override
-  public String toString() {
-    return StringUtils.join(legs, "\n");
-  }
-
-  Itinerary() {
-    // Needed by Hibernate
-  }
-
-  // Auto-generated surrogate key
-  @SuppressWarnings("UnusedDeclaration")
-  private Long id;
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/Leg.java

@@ -1,133 +0,0 @@
-package se.citerus.dddsample.domain.model.cargo;
-
-import org.apache.commons.lang.Validate;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import se.citerus.dddsample.domain.model.location.Location;
-import se.citerus.dddsample.domain.model.voyage.Voyage;
-import se.citerus.dddsample.domain.shared.ValueObject;
-
-import java.util.Date;
-
-/**
- * An itinerary consists of one or more legs.
- */
-public class Leg implements ValueObject<Leg> {
-
-  private Voyage voyage;
-  private Location loadLocation;
-  private Location unloadLocation;
-  private Date loadTime;
-  private Date unloadTime;
-
-  // TODO hide this, use factory
-  public Leg(Voyage voyage, Location loadLocation, Location unloadLocation, Date loadTime, Date unloadTime) {
-    Validate.notNull(voyage, "Voyage is required");
-    Validate.notNull(loadLocation, "Load location is required");
-    Validate.notNull(unloadLocation, "Unload location is required");
-    Validate.notNull(loadTime, "Load time is required");
-    Validate.notNull(unloadTime, "Unload time is required");
-    Validate.isTrue(!loadLocation.sameAs(unloadLocation));
-    // TODO use a minimum time between unloading and loading?
-    //Validate.isTrue(unloadTime.after(loadTime));
-
-    this.voyage = voyage;
-    this.loadLocation = loadLocation;
-    this.unloadLocation = unloadLocation;
-    this.loadTime = loadTime;
-    this.unloadTime = unloadTime;
-  }
-
-  /**
-   * This simple factory takes the Leg's times from the state of the
-   * Voyage as of the time of construction.
-   * A fuller version might also factor operational time
-   * in the port. For example, average unload time of the
-   * unloadLocation could be added to the eta of the vessel
-   * schedule, providing an estimated unload time.
-   * In a real system, the estimation of the unload time
-   * might be more complex.
-   *
-   * @param voyage         voyage
-   * @param loadLocation   load location
-   * @param unloadLocation unload location
-   * @return A leg on this voyage between the given locations.
-   */
-  public static Leg deriveLeg(Voyage voyage, Location loadLocation, Location unloadLocation) {
-    return new Leg(voyage, loadLocation, unloadLocation, voyage.schedule().departureTimeAt(loadLocation), voyage.schedule().arrivalTimeAt(unloadLocation));
-  }
-
-  public Voyage voyage() {
-    return voyage;
-  }
-
-  public Location loadLocation() {
-    return loadLocation;
-  }
-
-  public Location unloadLocation() {
-    return unloadLocation;
-  }
-
-  public Date loadTime() {
-    return new Date(loadTime.getTime());
-  }
-
-  public Date unloadTime() {
-    return new Date(unloadTime.getTime());
-  }
-
-  /**
-   * @param voyage voyage
-   * @return A new leg with the same load and unload locations, but with updated load/unload times.
-   */
-  Leg withRescheduledVoyage(final Voyage voyage) {
-    return Leg.deriveLeg(voyage, loadLocation, unloadLocation);
-  }
-
-  @Override
-  public boolean sameValueAs(final Leg other) {
-    return other != null && new EqualsBuilder().
-      append(this.voyage, other.voyage).
-      append(this.loadLocation, other.loadLocation).
-      append(this.unloadLocation, other.unloadLocation).
-      append(this.loadTime, other.loadTime).
-      append(this.unloadTime, other.unloadTime).
-      isEquals();
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    Leg leg = (Leg) o;
-
-    return sameValueAs(leg);
-  }
-
-  @Override
-  public int hashCode() {
-    return new HashCodeBuilder().
-      append(voyage).
-      append(loadLocation).
-      append(unloadLocation).
-      append(loadTime).
-      append(unloadTime).
-      toHashCode();
-  }
-
-  @Override
-  public String toString() {
-    return "Load in " + loadLocation + " at " + loadTime +
-      " --- Unload in " + unloadLocation + " at " + unloadTime;
-  }
-
-  Leg() {
-    // Needed by Hibernate
-  }
-
-  // Auto-generated surrogate key
-  private Long id;
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/Projections.java

@@ -1,167 +0,0 @@
-package se.citerus.dddsample.domain.model.cargo;
-
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import static se.citerus.dddsample.domain.model.handling.HandlingEvent.Type.*;
-import se.citerus.dddsample.domain.model.location.Location;
-import se.citerus.dddsample.domain.model.shared.HandlingActivity;
-import se.citerus.dddsample.domain.shared.ValueObject;
-
-import java.util.Date;
-import java.util.Iterator;
-
-/**
- * These are projections about the future handling of the cargo,
- * when it will arrive and what the next step is.
- * <p/>
- * It is updated on routing changes as well as handling.
- */
-class Projections implements ValueObject<Projections> {
-
-  private Date estimatedTimeOfArrival;
-  private HandlingActivity nextExpectedActivity;
-
-  private static final Date ETA_UNKOWN = null;
-  private static final HandlingActivity NO_ACTIVITY = null;
-
-  Projections(final Delivery delivery, final Itinerary itinerary, final RouteSpecification routeSpecification) {
-    this.estimatedTimeOfArrival = calculateEstimatedTimeOfArrival(delivery, itinerary, routeSpecification);
-    this.nextExpectedActivity = calculateNextExpectedActivity(delivery, itinerary, routeSpecification);
-  }
-
-  /**
-   * @return Estimated time of arrival, or null if not known.
-   */
-  Date estimatedTimeOfArrival() {
-    if (estimatedTimeOfArrival != ETA_UNKOWN) {
-      return new Date(estimatedTimeOfArrival.getTime());
-    } else {
-      return ETA_UNKOWN;
-    }
-  }
-
-  /**
-   * @return The next expected handling activity.
-   */
-  HandlingActivity nextExpectedActivity() {
-    return nextExpectedActivity;
-  }
-
-  private Date calculateEstimatedTimeOfArrival(final Delivery delivery, final Itinerary itinerary, final RouteSpecification routeSpecification) {
-    if (delivery.onTrack(itinerary, routeSpecification)) {
-      return itinerary.finalUnloadTime();
-    } else {
-      return ETA_UNKOWN;
-    }
-  }
-
-  private HandlingActivity calculateNextExpectedActivity(final Delivery delivery, final Itinerary itinerary, final RouteSpecification routeSpecification) {
-
-    /*
-     TODO Capture:
-
-     Cargo is misdirected but has been rerouted. Next expected acivity should be to load according to first leg
-     of new itinerary.
-
-     and
-
-     even if a cargo is misdirected, we expect it to be unloaded at next stop.
-
-    */
-    if (!delivery.onTrack(itinerary, routeSpecification)) {
-      return NO_ACTIVITY;
-    }
-
-    final Location lastKnownLocation = delivery.lastKnownLocation();
-    switch (delivery.transportStatus()) {
-      case IN_PORT:
-        if (itinerary.firstLeg().loadLocation().sameAs(lastKnownLocation)) {
-          return loadInFirstLocation(itinerary);
-        } else {
-          return loadOrClaimInNextLocation(itinerary, lastKnownLocation);
-        }
-
-      case NOT_RECEIVED:
-        return receiveInFirstLocation(itinerary);
-
-      case ONBOARD_CARRIER:
-        return unloadInNextLocation(itinerary, lastKnownLocation);
-
-      case CLAIMED:
-      default:
-        return NO_ACTIVITY;
-    }
-  }
-
-  private HandlingActivity receiveInFirstLocation(final Itinerary itinerary) {
-    final Leg leg = itinerary.firstLeg();
-    return new HandlingActivity(RECEIVE, leg.loadLocation());
-  }
-
-  private HandlingActivity loadInFirstLocation(final Itinerary itinerary) {
-    final Leg leg = itinerary.firstLeg();
-    return new HandlingActivity(LOAD, leg.loadLocation(), leg.voyage());
-  }
-
-  private HandlingActivity loadOrClaimInNextLocation(final Itinerary itinerary, final Location activityLocation) {
-    for (final Iterator<Leg> it = itinerary.legs().iterator(); it.hasNext();) {
-      final Leg leg = it.next();
-      if (leg.unloadLocation().sameAs(activityLocation)) {
-        if (it.hasNext()) {
-          final Leg nextLeg = it.next();
-
-          //return leg.loadActivity(); { return new HandlingActivity(voyage, loadLocation); }
-
-          //return HandlingActivity.loadOnto(nextLeg.voyage()).in(nextLeg.loadLocation());
-
-          return new HandlingActivity(LOAD, nextLeg.loadLocation(), nextLeg.voyage());
-        } else {
-          return new HandlingActivity(CLAIM, leg.unloadLocation());
-        }
-      }
-    }
-
-    return NO_ACTIVITY;
-  }
-
-  private HandlingActivity unloadInNextLocation(final Itinerary itinerary, final Location activityLocation) {
-    for (final Leg leg : itinerary.legs()) {
-      if (leg.loadLocation().sameAs(activityLocation)) {
-        return new HandlingActivity(UNLOAD, leg.unloadLocation(), leg.voyage());
-      }
-    }
-
-    return NO_ACTIVITY;
-  }
-
-
-  @Override
-  public boolean sameValueAs(final Projections other) {
-    return other != null && new EqualsBuilder().
-      append(this.estimatedTimeOfArrival, other.estimatedTimeOfArrival).
-      append(this.nextExpectedActivity, other.nextExpectedActivity).
-      isEquals();
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    final Projections other = (Projections) o;
-    return sameValueAs(other);
-  }
-
-  @Override
-  public int hashCode() {
-    return new HashCodeBuilder().
-      append(estimatedTimeOfArrival).
-      append(nextExpectedActivity).
-      toHashCode();
-  }
-
-  Projections() {
-    // Needed by Hibernate
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/RouteSpecification.java

@@ -1,128 +0,0 @@
-package se.citerus.dddsample.domain.model.cargo;
-
-import org.apache.commons.lang.Validate;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import se.citerus.dddsample.domain.model.location.Location;
-import se.citerus.dddsample.domain.shared.AbstractSpecification;
-import se.citerus.dddsample.domain.shared.ValueObject;
-
-import java.util.Date;
-
-/**
- * Route specification. Describes where a cargo orign and destination is,
- * and the arrival deadline.
- */
-public class RouteSpecification extends AbstractSpecification<Itinerary> implements ValueObject<RouteSpecification> {
-
-  private Location origin;
-  private Location destination;
-  private Date arrivalDeadline;
-
-  /**
-   * @param origin          origin location - can't be the same as the destination
-   * @param destination     destination location - can't be the same as the origin
-   * @param arrivalDeadline arrival deadline
-   */
-  public RouteSpecification(final Location origin, final Location destination, final Date arrivalDeadline) {
-    Validate.notNull(origin, "Origin is required");
-    Validate.notNull(destination, "Destination is required");
-    Validate.notNull(arrivalDeadline, "Arrival deadline is required");
-    Validate.isTrue(!origin.sameAs(destination), "Origin and destination can't be the same: " + origin);
-
-    this.origin = origin;
-    this.destination = destination;
-    this.arrivalDeadline = new Date(arrivalDeadline.getTime());
-  }
-
-  /**
-   * @return Specified origin location.
-   */
-  public Location origin() {
-    return origin;
-  }
-
-  /**
-   * @return Specfied destination location.
-   */
-  public Location destination() {
-    return destination;
-  }
-
-  /**
-   * @return Arrival deadline.
-   */
-  public Date arrivalDeadline() {
-    return new Date(arrivalDeadline.getTime());
-  }
-
-  /**
-   * @param newDestination destination of new route specification
-   * @return A copy of this route specification but with new destination
-   */
-  public RouteSpecification withDestination(final Location newDestination) {
-    return new RouteSpecification(origin, newDestination, arrivalDeadline);
-  }
-
-  /**
-   * @param newOrigin origin of new route specification
-   * @return A copy of this route specification but with the new origin
-   */
-  public RouteSpecification withOrigin(final Location newOrigin) {
-    return new RouteSpecification(newOrigin, destination, arrivalDeadline);
-  }
-
-  /**
-   * @param newArrivalDeadline arrival deadline of new route specification
-   * @return A copy of this route specification but with the new arrival deadline
-   */
-  public RouteSpecification withArrivalDeadline(final Date newArrivalDeadline) {
-    return new RouteSpecification(origin, destination, newArrivalDeadline);
-  }
-
-  @Override
-  public boolean isSatisfiedBy(final Itinerary itinerary) {
-    return itinerary != null &&
-      origin().sameAs(itinerary.initialLoadLocation()) &&
-      destination().sameAs(itinerary.finalUnloadLocation()) &&
-      arrivalDeadline().after(itinerary.finalUnloadTime());
-  }
-
-  @Override
-  public boolean sameValueAs(final RouteSpecification other) {
-    return other != null && new EqualsBuilder().
-      append(this.origin, other.origin).
-      append(this.destination, other.destination).
-      append(this.arrivalDeadline, other.arrivalDeadline).
-      isEquals();
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    final RouteSpecification that = (RouteSpecification) o;
-
-    return sameValueAs(that);
-  }
-
-  @Override
-  public int hashCode() {
-    return new HashCodeBuilder().
-      append(this.origin).
-      append(this.destination).
-      append(this.arrivalDeadline).
-      toHashCode();
-  }
-
-  @Override
-  public String toString() {
-    return origin + " to " + destination + " by " + arrivalDeadline;
-  }
-
-  RouteSpecification() {
-    // Needed by Hibernate
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/RoutingStatus.java

@@ -1,28 +0,0 @@
-package se.citerus.dddsample.domain.model.cargo;
-
-import se.citerus.dddsample.domain.shared.ValueObject;
-
-/**
- * The different routing statuses of a cargo.
- */
-public enum RoutingStatus implements ValueObject<RoutingStatus> {
-  NOT_ROUTED, ROUTED, MISROUTED;
-
-  @Override
-  public boolean sameValueAs(final RoutingStatus other) {
-    return this.equals(other);
-  }
-
-  public static RoutingStatus derivedFrom(final Itinerary itinerary, final RouteSpecification routeSpecification) {
-    if (itinerary == null) {
-      return NOT_ROUTED;
-    } else {
-      if (routeSpecification.isSatisfiedBy(itinerary)) {
-        return ROUTED;
-      } else {
-        return MISROUTED;
-      }
-    }
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/TrackingId.java

@@ -1,66 +0,0 @@
-package se.citerus.dddsample.domain.model.cargo;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.Validate;
-import se.citerus.dddsample.domain.shared.ValueObject;
-
-import java.io.Serializable;
-
-/**
- * Uniquely identifies a particular cargo. Automatically generated by the application.
- */
-public final class TrackingId implements ValueObject<TrackingId>, Serializable {
-
-  private String id;
-
-  /**
-   * Constructor.
-   *
-   * @param id Id string.
-   */
-  public TrackingId(final String id) {
-    Validate.notNull(id);
-    this.id = id;
-  }
-
-  public TrackingId(final long sequenceValue) {
-    Validate.isTrue(sequenceValue > 0, "Sequence value must be larger than 0");
-    this.id = "C" + StringUtils.leftPad(String.valueOf(sequenceValue), 8, "0");
-  }
-
-  /**
-   * @return String representation of this tracking id.
-   */
-  public String stringValue() {
-    return id;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    TrackingId other = (TrackingId) o;
-
-    return sameValueAs(other);
-  }
-
-  @Override
-  public int hashCode() {
-    return id.hashCode();
-  }
-
-  @Override
-  public boolean sameValueAs(TrackingId other) {
-    return other != null && this.id.equals(other.id);
-  }
-
-  @Override
-  public String toString() {
-    return id;
-  }
-
-  TrackingId() {
-    // Needed by Hibernate
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/TrackingIdGenerator.java

@@ -1,10 +0,0 @@
-package se.citerus.dddsample.domain.model.cargo;
-
-/**
- * Generates tracking ids for cargos. This is a domain service.
- */
-public interface TrackingIdGenerator {
-
-  TrackingId nextTrackingId();
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/TransportStatus.java

@@ -1,35 +0,0 @@
-package se.citerus.dddsample.domain.model.cargo;
-
-import se.citerus.dddsample.domain.shared.ValueObject;
-import se.citerus.dddsample.domain.model.shared.HandlingActivity;
-
-/**
- * Represents the different transport statuses for a cargo.
- */
-public enum TransportStatus implements ValueObject<TransportStatus> {
-  NOT_RECEIVED, IN_PORT, ONBOARD_CARRIER, CLAIMED, UNKNOWN;
-
-  @Override
-  public boolean sameValueAs(final TransportStatus other) {
-    return this.equals(other);
-  }
-
-  public static TransportStatus derivedFrom(HandlingActivity handlingActivity) {
-    if (handlingActivity == null) {
-      return NOT_RECEIVED;
-    }
-
-    switch (handlingActivity.type()) {
-      case LOAD:
-        return ONBOARD_CARRIER;
-      case UNLOAD:
-      case RECEIVE:
-        return IN_PORT;
-      case CLAIM:
-        return CLAIMED;
-      default:
-        return UNKNOWN;
-    }
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-	The cargo aggregate. Cargo is the aggregate root.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/domain/model/handling/CannotCreateHandlingEventException.java

@@ -1,19 +0,0 @@
-package se.citerus.dddsample.domain.model.handling;
-
-/**
- * If a {@link se.citerus.dddsample.domain.model.handling.HandlingEvent} can't be
- * created from a given set of parameters.
- * <p/>
- * It is a checked exception because it's not a programming error, but rather a
- * special case that the application is built to handle. It can occur during normal
- * program execution.
- */
-public class CannotCreateHandlingEventException extends Exception {
-  public CannotCreateHandlingEventException(Exception e) {
-    super(e);
-  }
-
-  public CannotCreateHandlingEventException() {
-    super();
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/handling/HandlingEvent.java

@@ -1,227 +0,0 @@
-package se.citerus.dddsample.domain.model.handling;
-
-import org.apache.commons.lang.Validate;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.location.Location;
-import se.citerus.dddsample.domain.model.shared.EventSequenceNumber;
-import se.citerus.dddsample.domain.model.shared.HandlingActivity;
-import se.citerus.dddsample.domain.model.voyage.Voyage;
-import se.citerus.dddsample.domain.shared.DomainEvent;
-import se.citerus.dddsample.domain.shared.DomainObjectUtils;
-import se.citerus.dddsample.domain.shared.ValueObject;
-
-import java.util.Date;
-
-/**
- * A HandlingEvent is used to register the event when, for instance,
- * a cargo is unloaded from a carrier at a some loacation at a given time.
- * <p/>
- * The HandlingEvent's are sent from different Incident Logging Applications
- * some time after the event occured and contain information about the
- * {@link se.citerus.dddsample.domain.model.cargo.TrackingId}, {@link se.citerus.dddsample.domain.model.location.Location}, timestamp of the completion of the event,
- * and possibly, if applicable a {@link se.citerus.dddsample.domain.model.voyage.Voyage}.
- * <p/>
- * This class is the only member, and consequently the root, of the HandlingEvent aggregate.
- * <p/>
- * HandlingEvent's could contain information about a {@link Voyage} and if so,
- * the event type must be either {@link Type#LOAD} or {@link Type#UNLOAD}.
- * <p/>
- * All other events must be of {@link Type#RECEIVE}, {@link Type#CLAIM} or {@link Type#CUSTOMS}.
- */
-public final class HandlingEvent implements DomainEvent<HandlingEvent> {
-
-  private EventSequenceNumber sequenceNumber;
-  private HandlingActivity activity;
-  private Date completionTime;
-  private Date registrationTime;
-  private Cargo cargo;
-
-  /**
-   * Handling event type. Either requires or prohibits a carrier movement
-   * association, it's never optional.
-   */
-  public enum Type implements ValueObject<Type> {
-    LOAD(true, true),
-    UNLOAD(true, true),
-    RECEIVE(false, true),
-    CLAIM(false, true),
-    CUSTOMS(false, false);
-
-    private final boolean voyageRelated;
-    private final boolean physical;
-
-    /**
-     * Private enum constructor.
-     *
-     * @param voyageRelated whether or not a voyage is associated with this event type
-     * @param physical whether or not this event type is physical
-     */
-    private Type(final boolean voyageRelated, final boolean physical) {
-      this.voyageRelated = voyageRelated;
-      this.physical = physical;
-    }
-
-    /**
-     * @return True if a voyage association is required for this event type.
-     */
-    public boolean isVoyageRelated() {
-      return voyageRelated;
-    }
-
-    /**
-     * @return True if this is a physical handling.
-     */
-    public boolean isPhysical() {
-      return physical;
-    }
-
-    @Override
-    public boolean sameValueAs(Type other) {
-      return other != null && this.equals(other);
-    }
-
-  }
-
-  /**
-   * @param cargo            cargo
-   * @param completionTime   completion time, the reported time that the event actually happened (e.g. the receive took place).
-   * @param registrationTime registration time, the time the message is received
-   * @param type             type of event
-   * @param location         where the event took place
-   * @param voyage           the voyage
-   */
-  // TODO make package local
-  public HandlingEvent(final Cargo cargo,
-                       final Date completionTime,
-                       final Date registrationTime,
-                       final Type type,
-                       final Location location,
-                       final Voyage voyage) {
-    Validate.notNull(cargo, "Cargo is required");
-    Validate.notNull(completionTime, "Completion time is required");
-    Validate.notNull(registrationTime, "Registration time is required");
-    Validate.notNull(type, "Handling event type is required");
-    Validate.notNull(location, "Location is required");
-    Validate.notNull(voyage, "Voyage is required");
-
-    if (!type.isVoyageRelated()) {
-      throw new IllegalArgumentException("Voyage is not allowed with event type " + type);
-    }
-
-    this.sequenceNumber = EventSequenceNumber.next();
-    this.cargo = cargo;
-    this.completionTime = new Date(completionTime.getTime());
-    this.registrationTime = new Date(registrationTime.getTime());
-    this.activity = new HandlingActivity(type, location, voyage);
-  }
-
-  /**
-   * @param cargo            cargo
-   * @param completionTime   completion time, the reported time that the event actually happened (e.g. the receive took place).
-   * @param registrationTime registration time, the time the message is received
-   * @param type             type of event
-   * @param location         where the event took place
-   */
-  // TODO make package local
-  public HandlingEvent(final Cargo cargo,
-                       final Date completionTime,
-                       final Date registrationTime,
-                       final Type type,
-                       final Location location) {
-    Validate.notNull(cargo, "Cargo is required");
-    Validate.notNull(completionTime, "Completion time is required");
-    Validate.notNull(registrationTime, "Registration time is required");
-    Validate.notNull(type, "Handling event type is required");
-    Validate.notNull(location, "Location is required");
-
-    if (type.isVoyageRelated()) {
-      throw new IllegalArgumentException("Voyage is required for event type " + type);
-    }
-
-    this.sequenceNumber = EventSequenceNumber.next();
-    this.completionTime = new Date(completionTime.getTime());
-    this.registrationTime = new Date(registrationTime.getTime());
-    this.cargo = cargo;
-    this.activity = new HandlingActivity(type, location);
-  }
-
-  public EventSequenceNumber sequenceNumber() {
-    return sequenceNumber;
-  }
-
-  public HandlingActivity activity() {
-    return activity;
-  }
-
-  public Type type() {
-    return activity.type();
-  }
-
-  public Voyage voyage() {
-    return DomainObjectUtils.nullSafe(activity.voyage(), Voyage.NONE);
-  }
-
-  public Date completionTime() {
-    return new Date(this.completionTime.getTime());
-  }
-
-  public Date registrationTime() {
-    return new Date(this.registrationTime.getTime());
-  }
-
-  public Location location() {
-    return activity.location();
-  }
-
-  public Cargo cargo() {
-    return this.cargo;
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    final HandlingEvent event = (HandlingEvent) o;
-
-    return sameEventAs(event);
-  }
-
-  @Override
-  public boolean sameEventAs(final HandlingEvent other) {
-    return other != null && new EqualsBuilder().
-      append(this.cargo, other.cargo).
-      append(this.completionTime, other.completionTime).
-      append(this.activity, other.activity).
-      isEquals();
-  }
-
-  @Override
-  public int hashCode() {
-    return new HashCodeBuilder().
-      append(cargo).
-      append(completionTime).
-      append(activity).
-      toHashCode();
-  }
-
-  @Override
-  public String toString() {
-    return "Cargo: " + cargo +
-      "\nActivity: " + activity +
-      "\nCompleted on: " + completionTime +
-      "\nRegistered on: " + registrationTime;
-  }
-
-  HandlingEvent() {
-    // Needed by Hibernate
-  }
-
-
-  // Auto-generated surrogate key
-  @SuppressWarnings("UnusedDeclaration")
-  private Long id;
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/handling/HandlingEventFactory.java

@@ -1,89 +0,0 @@
-package se.citerus.dddsample.domain.model.handling;
-
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.cargo.CargoRepository;
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.domain.model.location.Location;
-import se.citerus.dddsample.domain.model.location.LocationRepository;
-import se.citerus.dddsample.domain.model.location.UnLocode;
-import se.citerus.dddsample.domain.model.voyage.Voyage;
-import se.citerus.dddsample.domain.model.voyage.VoyageNumber;
-import se.citerus.dddsample.domain.model.voyage.VoyageRepository;
-
-import java.util.Date;
-
-/**
- * Creates handling events.
- */
-public class HandlingEventFactory {
-
-  private final CargoRepository cargoRepository;
-  private final VoyageRepository voyageRepository;
-  private final LocationRepository locationRepository;
-
-  public HandlingEventFactory(final CargoRepository cargoRepository,
-                              final VoyageRepository voyageRepository,
-                              final LocationRepository locationRepository) {
-    this.cargoRepository = cargoRepository;
-    this.voyageRepository = voyageRepository;
-    this.locationRepository = locationRepository;
-  }
-
-  /**
-   * @param registrationTime time when this event was received by the system
-   * @param completionTime   when the event was completed, for example finished loading
-   * @param trackingId       cargo tracking id
-   * @param voyageNumber     voyage number
-   * @param unlocode         United Nations Location Code for the location of the event
-   * @param type             type of event
-   * @return A handling event.
-   * @throws UnknownVoyageException   if there's no voyage with this number
-   * @throws UnknownCargoException    if there's no cargo with this tracking id
-   * @throws UnknownLocationException if there's no location with this UN Locode
-   */
-  public HandlingEvent createHandlingEvent(Date registrationTime, Date completionTime, TrackingId trackingId, VoyageNumber voyageNumber, UnLocode unlocode, HandlingEvent.Type type)
-    throws CannotCreateHandlingEventException {
-    final Cargo cargo = findCargo(trackingId);
-    final Voyage voyage = findVoyage(voyageNumber);
-    final Location location = findLocation(unlocode);
-
-    try {
-      if (voyage == null) {
-        return new HandlingEvent(cargo, completionTime, registrationTime, type, location);
-      } else {
-        return new HandlingEvent(cargo, completionTime, registrationTime, type, location, voyage);
-      }
-    } catch (Exception e) {
-      throw new CannotCreateHandlingEventException(e);
-    }
-  }
-
-  private Cargo findCargo(TrackingId trackingId) throws UnknownCargoException {
-    final Cargo cargo = cargoRepository.find(trackingId);
-    if (cargo == null) throw new UnknownCargoException(trackingId);
-    return cargo;
-  }
-
-  private Voyage findVoyage(VoyageNumber voyageNumber) throws UnknownVoyageException {
-    if (voyageNumber == null) {
-      return null;
-    }
-
-    final Voyage voyage = voyageRepository.find(voyageNumber);
-    if (voyage == null) {
-      throw new UnknownVoyageException(voyageNumber);
-    }
-
-    return voyage;
-  }
-
-  private Location findLocation(final UnLocode unlocode) throws UnknownLocationException {
-    final Location location = locationRepository.find(unlocode);
-    if (location == null) {
-      throw new UnknownLocationException(unlocode);
-    }
-
-    return location;
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/handling/HandlingEventRepository.java

@@ -1,36 +0,0 @@
-package se.citerus.dddsample.domain.model.handling;
-
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.shared.EventSequenceNumber;
-
-/**
- * Handling event repository.
- */
-public interface HandlingEventRepository {
-
-  /**
-   * @param eventSequenceNumber event sequence number
-   * @return The handling event with this sequence number, or null if not found
-   */
-  HandlingEvent find(EventSequenceNumber eventSequenceNumber);
-
-  /**
-   * Stores a (new) handling event.
-   *
-   * @param event handling event to save
-   */
-  void store(HandlingEvent event);
-
-  /**
-   * @param cargo cargo
-   * @return The handling history of this cargo
-   */
-  HandlingHistory lookupHandlingHistoryOfCargo(Cargo cargo);
-
-  /**
-   *
-   * @param cargo cargo
-   * @return The most recent handling of the cargo, or null if it has never been handled.
-   */
-  HandlingEvent mostRecentHandling(Cargo cargo);
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/handling/HandlingHistory.java

@@ -1,136 +0,0 @@
-package se.citerus.dddsample.domain.model.handling;
-
-import org.apache.commons.lang.Validate;
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.shared.ValueObject;
-
-import java.util.*;
-import static java.util.Collections.sort;
-
-/**
- * The handling history of a cargo.
- */
-public class HandlingHistory implements ValueObject<HandlingHistory> {
-
-  private final List<HandlingEvent> handlingEvents;
-  private final Cargo cargo;
-
-  public static HandlingHistory emptyForCargo(final Cargo cargo) {
-    return new HandlingHistory(cargo);
-  }
-
-  public static HandlingHistory fromEvents(final Collection<HandlingEvent> handlingEvents) {
-    return new HandlingHistory(handlingEvents);
-  }
-
-  private HandlingHistory(final Cargo cargo) {
-    Validate.notNull(cargo, "Cargo is required");
-    this.cargo = cargo;
-    handlingEvents = Collections.emptyList();
-  }
-
-  private HandlingHistory(final Collection<HandlingEvent> handlingEvents) {
-    Validate.notEmpty(handlingEvents, "Handling events are required");
-
-    this.cargo = uniqueCargo(handlingEvents);
-    this.handlingEvents = new ArrayList<HandlingEvent>(handlingEvents);
-  }
-
-  private Cargo uniqueCargo(final Collection<HandlingEvent> handlingEvents) {
-    final Iterator<HandlingEvent> it = handlingEvents.iterator();
-    final Cargo firstCargo = it.next().cargo();
-    Validate.notNull(firstCargo, "Cargo is required");
-
-    while (it.hasNext()) {
-      final Cargo nextCargo = it.next().cargo();
-      Validate.isTrue(firstCargo.sameAs(nextCargo),
-        "A handling history can only contain handling events for a unique cargo. " +
-          "First event is for cargo " + firstCargo + ", also discovered cargo " + nextCargo
-      );
-    }
-
-    return firstCargo;
-  }
-
-  /**
-   * @return A distinct list (no duplicate registrations) of handling events, ordered by completion time.
-   */
-  public List<HandlingEvent> distinctEventsByCompletionTime() {
-    final List<HandlingEvent> ordered = new ArrayList<HandlingEvent>(
-      new HashSet<HandlingEvent>(handlingEvents)
-    );
-    sort(ordered, BY_COMPLETION_TIME_COMPARATOR);
-    return Collections.unmodifiableList(ordered);
-  }
-
-  /**
-   * @return Filter a list of handling events, returning only the LOAD and UNLOAD events.
-   */
-  public List<HandlingEvent> physicalHandlingEvents(List<HandlingEvent> unfilteredEvents) {
-    final List<HandlingEvent> filtered = new ArrayList<HandlingEvent>();
-    for (HandlingEvent event : unfilteredEvents) {
-      if (event.type().equals(HandlingEvent.Type.RECEIVE)) filtered.add(event);
-      if (event.type().equals(HandlingEvent.Type.LOAD)) filtered.add(event);
-      if (event.type().equals(HandlingEvent.Type.UNLOAD)) filtered.add(event);
-      if (event.type().equals(HandlingEvent.Type.CLAIM)) filtered.add(event);
-    }
-    return Collections.unmodifiableList(filtered);
-  }
-
-  /**
-   * @return Most recently completed event, or null if the handling history is empty.
-   */
-  public HandlingEvent mostRecentlyCompletedEvent() {
-    final List<HandlingEvent> distinctEvents = distinctEventsByCompletionTime();
-    if (distinctEvents.isEmpty()) {
-      return null;
-    } else {
-      return distinctEvents.get(distinctEvents.size() - 1);
-    }
-  }
-
-  /**
-   * @return Most recently completed load or unload, or null if there have been none.
-   */
-  public HandlingEvent mostRecentPhysicalHandling() {
-    final List<HandlingEvent> loadsAndUnloads = physicalHandlingEvents(distinctEventsByCompletionTime());
-    if (loadsAndUnloads.isEmpty()) {
-      return null;
-    } else {
-      return loadsAndUnloads.get(loadsAndUnloads.size() - 1);
-    }
-  }
-
-  /**
-   * @return The cargo to which this handling history refers.
-   */
-  public Cargo cargo() {
-    return cargo;
-  }
-
-  @Override
-  public boolean sameValueAs(HandlingHistory other) {
-    return other != null && this.handlingEvents.equals(other.handlingEvents);
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    final HandlingHistory other = (HandlingHistory) o;
-    return sameValueAs(other);
-  }
-
-  @Override
-  public int hashCode() {
-    return handlingEvents.hashCode();
-  }
-
-  private static final Comparator<HandlingEvent> BY_COMPLETION_TIME_COMPARATOR =
-    new Comparator<HandlingEvent>() {
-      public int compare(final HandlingEvent he1, final HandlingEvent he2) {
-        return he1.completionTime().compareTo(he2.completionTime());
-      }
-    };
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/handling/UnknownCargoException.java

@@ -1,26 +0,0 @@
-package se.citerus.dddsample.domain.model.handling;
-
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-
-/**
- * Thrown when trying to register an event with an unknown tracking id.
- */
-public final class UnknownCargoException extends CannotCreateHandlingEventException {
-
-  private final TrackingId trackingId;
-
-  /**
-   * @param trackingId cargo tracking id
-   */
-  public UnknownCargoException(final TrackingId trackingId) {
-    this.trackingId = trackingId;
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  @Override
-  public String getMessage() {
-    return "No cargo with tracking id " + trackingId.stringValue() + " exists in the system";
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/handling/UnknownLocationException.java

@@ -1,17 +0,0 @@
-package se.citerus.dddsample.domain.model.handling;
-
-import se.citerus.dddsample.domain.model.location.UnLocode;
-
-public class UnknownLocationException extends CannotCreateHandlingEventException {
-
-  private final UnLocode unlocode;
-
-  public UnknownLocationException(final UnLocode unlocode) {
-    this.unlocode = unlocode;
-  }
-
-  @Override
-  public String getMessage() {
-    return "No location with UN locode " + unlocode.stringValue() + " exists in the system";
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/handling/UnknownVoyageException.java

@@ -1,20 +0,0 @@
-package se.citerus.dddsample.domain.model.handling;
-
-import se.citerus.dddsample.domain.model.voyage.VoyageNumber;
-
-/**
- * Thrown when trying to register an event with an unknown carrier movement id.
- */
-public class UnknownVoyageException extends CannotCreateHandlingEventException {
-
-  private final VoyageNumber voyageNumber;
-
-  public UnknownVoyageException(VoyageNumber voyageNumber) {
-    this.voyageNumber = voyageNumber;
-  }
-
-  @Override
-  public String getMessage() {
-    return "No voyage with number " + voyageNumber.stringValue() + " exists in the system";
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/handling/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-	The handling aggregate. HandlingEvent is the aggregate root.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/domain/model/location/CustomsZone.java

@@ -1,124 +0,0 @@
-package se.citerus.dddsample.domain.model.location;
-
-import org.apache.commons.lang.Validate;
-import se.citerus.dddsample.domain.shared.Entity;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.regex.Pattern;
-
-/**
- * A geographical zone within which there are no customs restrictions or checks.
- */
-public class CustomsZone implements Entity<CustomsZone> {
-
-  private String code;
-  private String name;
-
-  // TODO: Find out what the standards are for this, if any. For now:
-  // For CustomsZone code, we are using the "country code" portion of the UnLocode,
-  // except within economic areas that are not countries, such as the EU. Then we make one up.
-  // Country code is exactly two letters, so we'll use 2 letters.
-  private static final Pattern VALID_PATTERN = Pattern.compile("[a-zA-Z]{2}");
-
-  /**
-   * Constructor.
-   *
-   * @param code code
-   * @param name name
-   */
-  public CustomsZone(final String code, final String name) {
-    Validate.notNull(code, "Code is required");
-    Validate.isTrue(VALID_PATTERN.matcher(code).matches(),
-      code + " is not a valid CustomsZone code (does not match pattern)");
-    Validate.notNull(name, "Name is required");
-    this.code = code.toUpperCase();
-    this.name = name;
-  }
-
-  /**
-   * Where would a Cargo enter this CustomsZone if it were
-   * following this route. Note that specific voyages, etc do not
-   * matter, only the sequence of Locations.
-   *
-   * @param route
-   * @return
-   */
-  public Location entryPoint(List<Location> route) {
-    for (Location location : route) {
-      if (this.includes(location)) return location;
-    }
-    return null; //The route does not enter this CustomsZone
-  }
-
-  /**
-   * Convenience method for testing. Usage in application would be
-   * entryPoint(List<Location) route)
-   *
-   * @param route
-   * @return
-   */
-  public Location entryPoint(Location... route) {
-    return entryPoint(Arrays.asList(route));
-  }
-
-  /**
-   * If the rules of the CustomsZone were different or more complex,
-   * this is where that rule would be expressed. For the example, we'll
-   * just use the basic rule -- customs clearance is at the entry point.
-   *
-   * @param route
-   * @return
-   */
-//   public Location clearancePoint(List<Location> route) {
-//     return entryPoint(route);
-//   }
-
-  /**
-   * Convenience method for testing. Usage in application would be
-   * clearancePoint(List<Location) route)
-   *
-   * @param route
-   * @return
-   */
-//   @SuppressWarnings("unchecked")
-//   public Location clearancePoint(Location ... route) {
-//     return clearancePoint(Arrays.asList(route));
-//   }
-//
-
-
-  /**
-   * @return Code, always upper case.
-   */
-  public String code() {
-    return code;
-  }
-
-  /**
-   * @return The name.
-   */
-  public String name() {
-    return name;
-  }
-
-  @Override
-  public String toString() {
-    return code + "[" + name + "]";
-  }
-
-  @Override
-  public boolean sameAs(CustomsZone other) {
-    return code.equals(other.code);
-  }
-
-  CustomsZone() {
-    // Needed by Hibernate
-  }
-
-  public boolean includes(Location location) {
-    return this.sameAs(location.customsZone());
-  }
-
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/location/Location.java

@@ -1,117 +0,0 @@
-package se.citerus.dddsample.domain.model.location;
-
-import org.apache.commons.lang.Validate;
-import se.citerus.dddsample.domain.shared.Entity;
-
-import java.util.TimeZone;
-
-/**
- * A location is our model is stops on a journey, such as cargo
- * origin or destination, or carrier movement endpoints.
- * <p/>
- * It is uniquely identified by a UN Locode.
- */
-public final class Location implements Entity<Location> {
-
-  private UnLocode unLocode;
-  private String name;
-  private TimeZone timeZone;
-  private CustomsZone customsZone;
-
-  /**
-   * Special Location object that marks an unknown location.
-   */
-  public static final Location UNKNOWN = new Location(
-    new UnLocode("XXXXX"), "Unknown location", TimeZone.getTimeZone("Zulu"), null
-  );
-
-  /**
-   * Package-level constructor, visible for test only.
-   *
-   * @param unLocode    UN Locode
-   * @param name        location name
-   * @param timeZone
-   * @param customsZone
-   * @throws IllegalArgumentException if the UN Locode or name is null
-   */
-  Location(final UnLocode unLocode, final String name, final TimeZone timeZone, final CustomsZone customsZone) {
-    Validate.notNull(unLocode);
-    Validate.notNull(name);
-    Validate.notNull(timeZone);
-//    Validate.notNull(customsZone);
-
-    this.unLocode = unLocode;
-    this.name = name;
-    this.timeZone = timeZone;
-    this.customsZone = customsZone;
-  }
-
-  /**
-   * @return UN Locode for this location.
-   */
-  public UnLocode unLocode() {
-    return unLocode;
-  }
-
-  /**
-   * @return Actual name of this location, e.g. "Stockholm".
-   */
-  public String name() {
-    return name;
-  }
-
-  /**
-   * @return Customs zone of this location.
-   */
-  public CustomsZone customsZone() {
-    return customsZone;
-  }
-
-  /**
-   * @param object to compare
-   * @return Since this is an entity this will be true iff UN locodes are equal.
-   */
-  @Override
-  public boolean equals(final Object object) {
-    if (object == null) {
-      return false;
-    }
-    if (this == object) {
-      return true;
-    }
-    if (!(object instanceof Location)) {
-      return false;
-    }
-    Location other = (Location) object;
-    return sameAs(other);
-  }
-
-  @Override
-  public boolean sameAs(final Location other) {
-    return this.unLocode.sameValueAs(other.unLocode);
-  }
-
-  /**
-   * @return Hash code of UN locode.
-   */
-  @Override
-  public int hashCode() {
-    return unLocode.hashCode();
-  }
-
-  @Override
-  public String toString() {
-    return name + " [" + unLocode + "]";
-  }
-
-  Location() {
-    // Needed by Hibernate
-  }
-
-  private Long id;
-
-  public TimeZone timeZone() {
-    return timeZone;
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/location/LocationRepository.java

@@ -1,22 +0,0 @@
-package se.citerus.dddsample.domain.model.location;
-
-import java.util.List;
-
-public interface LocationRepository {
-
-  /**
-   * Finds a location using given unlocode.
-   *
-   * @param unLocode UNLocode.
-   * @return Location.
-   */
-  Location find(UnLocode unLocode);
-
-  /**
-   * Finds all locations.
-   *
-   * @return All locations.
-   */
-  List<Location> findAll();
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/location/SampleLocations.java

@@ -1,64 +0,0 @@
-package se.citerus.dddsample.domain.model.location;
-
-import java.lang.reflect.Field;
-import java.util.*;
-
-/**
- * Sample locations, for test purposes.
- */
-public class SampleLocations {
-  private static final TimeZone CHINA = TimeZone.getTimeZone("Asia/Shanghai");
-  private static final TimeZone CENTRAL_EUROPE = TimeZone.getTimeZone("Europe/Stockholm");
-  private static final TimeZone JAPAN = TimeZone.getTimeZone("Asia/Tokyo");
-  private static final TimeZone EASTERN = TimeZone.getTimeZone("America/New_York");
-  private static final TimeZone CENTRAL = TimeZone.getTimeZone("America/Chicago");
-  private static final TimeZone PACIFIC = TimeZone.getTimeZone("America/Los_Angeles");
-  private static final TimeZone EASTERN_AUSTRALIA = TimeZone.getTimeZone("Australia/Melbourne");
-
-  public static final CustomsZone US = new CustomsZone("US", "United States");
-  public static final CustomsZone EU = new CustomsZone("EU", "European Union");
-  public static final CustomsZone CN = new CustomsZone("CN", "United States");
-  public static final CustomsZone AU = new CustomsZone("AU", "Australia");
-  public static final CustomsZone JN = new CustomsZone("JN", "Japan");
-
-  public static final Location HONGKONG = new Location(new UnLocode("CNHKG"), "Hongkong", CHINA, CN);
-  public static final Location MELBOURNE = new Location(new UnLocode("AUMEL"), "Melbourne", EASTERN_AUSTRALIA, AU);
-  public static final Location STOCKHOLM = new Location(new UnLocode("SESTO"), "Stockholm", CENTRAL_EUROPE, EU);
-  public static final Location HELSINKI = new Location(new UnLocode("FIHEL"), "Helsinki", CENTRAL_EUROPE, EU);
-  public static final Location CHICAGO = new Location(new UnLocode("USCHI"), "Chicago", CENTRAL, US);
-  public static final Location LONGBEACH = new Location(new UnLocode("USLBG"), "Long Beach", PACIFIC, US);
-  public static final Location OAKLAND = new Location(new UnLocode("USOAK"), "Oakland", PACIFIC, US);
-  public static final Location SEATTLE = new Location(new UnLocode("USSEA"), "Seattle", PACIFIC, US);
-  public static final Location TOKYO = new Location(new UnLocode("JNTKO"), "Tokyo", JAPAN, JN);
-  public static final Location HAMBURG = new Location(new UnLocode("DEHAM"), "Hamburg", CENTRAL_EUROPE, EU);
-  public static final Location SHANGHAI = new Location(new UnLocode("CNSHA"), "Shanghai", CHINA, CN);
-  public static final Location ROTTERDAM = new Location(new UnLocode("NLRTM"), "Rotterdam", CENTRAL_EUROPE, EU);
-  public static final Location GOTHENBURG = new Location(new UnLocode("SEGOT"), "Göteborg", CENTRAL_EUROPE, EU);
-  public static final Location HANGZOU = new Location(new UnLocode("CNHGH"), "Hangzhou", CHINA, CN);
-  public static final Location NEWYORK = new Location(new UnLocode("USNYC"), "New York", EASTERN, US);
-  public static final Location DALLAS = new Location(new UnLocode("USDAL"), "Dallas", CENTRAL, US);
-
-  public static final Map<UnLocode, Location> ALL = new HashMap<UnLocode, Location>();
-
-  static {
-    for (Field field : SampleLocations.class.getDeclaredFields()) {
-      if (field.getType().equals(Location.class)) {
-        try {
-          Location location = (Location) field.get(null);
-          ALL.put(location.unLocode(), location);
-        } catch (IllegalAccessException e) {
-          throw new RuntimeException(e);
-        }
-      }
-    }
-  }
-
-  public static List<Location> getAll() {
-    return new ArrayList<Location>(ALL.values());
-  }
-
-  public static Location lookup(UnLocode unLocode) {
-    return ALL.get(unLocode);
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/location/UnLocode.java

@@ -1,71 +0,0 @@
-package se.citerus.dddsample.domain.model.location;
-
-import org.apache.commons.lang.Validate;
-import se.citerus.dddsample.domain.shared.ValueObject;
-
-import java.util.regex.Pattern;
-
-/**
- * United nations location code.
- * <p/>
- * http://www.unece.org/cefact/locode/
- * http://www.unece.org/cefact/locode/DocColumnDescription.htm#LOCODE
- */
-public final class UnLocode implements ValueObject<UnLocode> {
-
-  private String unlocode;
-
-  // Country code is exactly two letters.
-  // Location code is usually three letters, but may contain the numbers 2-9 as well
-  private static final Pattern VALID_PATTERN = Pattern.compile("[a-zA-Z]{2}[a-zA-Z2-9]{3}");
-
-  /**
-   * Constructor.
-   *
-   * @param countryAndLocation Location string.
-   */
-  public UnLocode(final String countryAndLocation) {
-    Validate.notNull(countryAndLocation, "Country and location may not be null");
-    Validate.isTrue(VALID_PATTERN.matcher(countryAndLocation).matches(),
-      countryAndLocation + " is not a valid UN/LOCODE (does not match pattern)");
-
-    this.unlocode = countryAndLocation.toUpperCase();
-  }
-
-  /**
-   * @return country code and location code concatenated, always upper case.
-   */
-  public String stringValue() {
-    return unlocode;
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    UnLocode other = (UnLocode) o;
-
-    return sameValueAs(other);
-  }
-
-  @Override
-  public int hashCode() {
-    return unlocode.hashCode();
-  }
-
-  @Override
-  public boolean sameValueAs(UnLocode other) {
-    return other != null && this.unlocode.equals(other.unlocode);
-  }
-
-  @Override
-  public String toString() {
-    return stringValue();
-  }
-
-  UnLocode() {
-    // Needed by Hibernate
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/location/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-	The location aggregate. Location is the aggregate root.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/domain/model/package.html

@@ -1,9 +0,0 @@
-<html>
-<body>
-<p>
-	The domain model. This is the heart of the application. Each aggregate is contained in
-	its own subpackage, along with the repository interface, factories and exceptions where
-	applicable.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/domain/model/shared/EventSequenceNumber.java

@@ -1,51 +0,0 @@
-package se.citerus.dddsample.domain.model.shared;
-
-import se.citerus.dddsample.domain.shared.ValueObject;
-
-import java.util.concurrent.atomic.AtomicLong;
-
-public class EventSequenceNumber implements ValueObject<EventSequenceNumber> {
-
-  private long value;
-  private static final AtomicLong SEQUENCE = new AtomicLong(System.currentTimeMillis());
-
-  private EventSequenceNumber(final long value) {
-    this.value = value;
-  }
-
-  public static EventSequenceNumber next() {
-    return new EventSequenceNumber(SEQUENCE.getAndIncrement());
-  }
-
-  public long longValue() {
-    return value;
-  }
-
-  @Override
-  public boolean sameValueAs(final EventSequenceNumber other) {
-    return false;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    return sameValueAs((EventSequenceNumber) o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Long.valueOf(value).hashCode();
-  }
-
-  @Override
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  EventSequenceNumber() {
-    // Needed by Hibernate
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/shared/HandlingActivity.java

@@ -1,94 +0,0 @@
-package se.citerus.dddsample.domain.model.shared;
-
-import org.apache.commons.lang.Validate;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import se.citerus.dddsample.domain.model.location.Location;
-import se.citerus.dddsample.domain.model.voyage.Voyage;
-import se.citerus.dddsample.domain.shared.ValueObject;
-
-/**
- * A handling activity represents how and where a cargo can be handled,
- * and can be used to express predictions about what is expected to
- * happen to a cargo in the future.
- */
-public class HandlingActivity implements ValueObject<HandlingActivity> {
-
-  // TODO introduce something like this (?):
-  // HandlingActivity.loadOnto(voyage).in(location)
-  // HandlingActivity.claimIn(location)
-
-  private HandlingEvent.Type type;
-  private Location location;
-  private Voyage voyage;
-
-  public HandlingActivity(final HandlingEvent.Type type, final Location location) {
-    Validate.notNull(type, "Handling event type is required");
-    Validate.notNull(location, "Location is required");
-
-    this.type = type;
-    this.location = location;
-  }
-
-  public HandlingActivity(final HandlingEvent.Type type, final Location location, final Voyage voyage) {
-    Validate.notNull(type, "Handling event type is required");
-    Validate.notNull(location, "Location is required");
-    Validate.notNull(location, "Voyage is required");
-
-    this.type = type;
-    this.location = location;
-    this.voyage = voyage;
-  }
-
-  public HandlingEvent.Type type() {
-    return type;
-  }
-
-  public Location location() {
-    return location;
-  }
-
-  public Voyage voyage() {
-    return voyage;
-  }
-
-  @Override
-  public boolean sameValueAs(final HandlingActivity other) {
-    return other != null && new EqualsBuilder().
-      append(this.type, other.type).
-      append(this.location, other.location).
-      append(this.voyage, other.voyage).
-      isEquals();
-  }
-
-  @Override
-  public int hashCode() {
-    return new HashCodeBuilder().
-      append(this.type).
-      append(this.location).
-      append(this.voyage).
-      toHashCode();
-  }
-
-  @Override
-  public boolean equals(final Object obj) {
-    if (obj == this) return true;
-    if (obj == null) return false;
-    if (obj.getClass() != this.getClass()) return false;
-
-    HandlingActivity other = (HandlingActivity) obj;
-
-    return sameValueAs(other);
-  }
-
-  @Override
-  public String toString() {
-    return type + " in " + location + (voyage != null ? ", " + voyage : "");
-  }
-
-  HandlingActivity() {
-    // Needed by Hibernate
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/shared/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-	Value objects that are shared between several aggregates.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/domain/model/voyage/CarrierMovement.java

@@ -1,125 +0,0 @@
-package se.citerus.dddsample.domain.model.voyage;
-
-import org.apache.commons.lang.Validate;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import se.citerus.dddsample.domain.model.location.Location;
-import se.citerus.dddsample.domain.shared.ValueObject;
-
-import java.util.Date;
-
-
-/**
- * A carrier movement is a vessel voyage from one location to another.
- */
-public final class CarrierMovement implements ValueObject<CarrierMovement> {
-
-  private Location departureLocation;
-  private Location arrivalLocation;
-  private Date departureTime;
-  private Date arrivalTime;
-
-  // Null object pattern 
-  public static final CarrierMovement NONE = new CarrierMovement(
-    Location.UNKNOWN, Location.UNKNOWN,
-    new Date(0), new Date(0)
-  );
-
-  /**
-   * Constructor.
-   *
-   * @param departureLocation location of departure
-   * @param arrivalLocation   location of arrival
-   * @param departureTime     time of departure
-   * @param arrivalTime       time of arrival
-   */
-  // TODO make package local
-  public CarrierMovement(Location departureLocation,
-                         Location arrivalLocation,
-                         Date departureTime,
-                         Date arrivalTime) {
-    Validate.noNullElements(new Object[]{departureLocation, arrivalLocation, departureTime, arrivalTime});
-    this.departureTime = departureTime;
-    this.arrivalTime = arrivalTime;
-    this.departureLocation = departureLocation;
-    this.arrivalLocation = arrivalLocation;
-  }
-
-  /**
-   * @return Departure location.
-   */
-  public Location departureLocation() {
-    return departureLocation;
-  }
-
-  /**
-   * @return Arrival location.
-   */
-  public Location arrivalLocation() {
-    return arrivalLocation;
-  }
-
-  /**
-   * @return Time of departure.
-   */
-  public Date departureTime() {
-    return new Date(departureTime.getTime());
-  }
-
-  /**
-   * @return Time of arrival.
-   */
-  public Date arrivalTime() {
-    return new Date(arrivalTime.getTime());
-  }
-
-  /**
-   * @param newDepartureTime new departure time
-   * @return A new CarrierMovement which is a copy of the old one but with a new departure time
-   */
-  CarrierMovement withDepartureTime(final Date newDepartureTime) {
-    return new CarrierMovement(
-      departureLocation,
-      arrivalLocation,
-      newDepartureTime,
-      arrivalTime
-    );
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    final CarrierMovement that = (CarrierMovement) o;
-
-    return sameValueAs(that);
-  }
-
-  @Override
-  public int hashCode() {
-    return new HashCodeBuilder().
-      append(this.departureLocation).
-      append(this.departureTime).
-      append(this.arrivalLocation).
-      append(this.arrivalTime).
-      toHashCode();
-  }
-
-  @Override
-  public boolean sameValueAs(CarrierMovement other) {
-    return other != null && new EqualsBuilder().
-      append(this.departureLocation, other.departureLocation).
-      append(this.departureTime, other.departureTime).
-      append(this.arrivalLocation, other.arrivalLocation).
-      append(this.arrivalTime, other.arrivalTime).
-      isEquals();
-  }
-
-  CarrierMovement() {
-    // Needed by Hibernate
-  }
-
-  // Auto-generated surrogate key
-  private Long id;
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/voyage/SampleVoyages.java

@@ -1,137 +0,0 @@
-package se.citerus.dddsample.domain.model.voyage;
-
-import static se.citerus.dddsample.application.util.DateTestUtil.toDate;
-import se.citerus.dddsample.domain.model.location.Location;
-import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
-
-import java.lang.reflect.Field;
-import java.util.*;
-
-/**
- * Sample carrier movements, for test purposes.
- */
-public class SampleVoyages {
-
-  public static final Voyage CM001 = createVoyage("CM001", STOCKHOLM, HAMBURG);
-  public static final Voyage CM002 = createVoyage("CM002", HAMBURG, HONGKONG);
-  public static final Voyage CM003 = createVoyage("CM003", HONGKONG, NEWYORK);
-  public static final Voyage CM004 = createVoyage("CM004", NEWYORK, CHICAGO);
-  public static final Voyage CM005 = createVoyage("CM005", CHICAGO, HAMBURG);
-  public static final Voyage CM006 = createVoyage("CM006", HAMBURG, HANGZOU);
-
-  private static Voyage createVoyage(String id, Location from, Location to) {
-    return new Voyage(new VoyageNumber(id), new Schedule(Arrays.asList(
-      new CarrierMovement(from, to, new Date(), new Date())
-    )));
-  }
-
-  // TODO CM00[1-6] and createVoyage are deprecated. Remove and refactor tests.
-
-  public final static Voyage v100 = new Voyage.Builder(new VoyageNumber("V100"), HONGKONG).
-    addMovement(TOKYO, toDate("2009-03-03"), toDate("2009-03-05")).
-    addMovement(LONGBEACH, toDate("2009-03-06"), toDate("2009-03-09")).
-    build();
-  public final static Voyage v200 = new Voyage.Builder(new VoyageNumber("V200"), SHANGHAI).
-    addMovement(NEWYORK, toDate("2009-03-06"), toDate("2009-03-08")).
-    addMovement(ROTTERDAM, toDate("2009-03-10"), toDate("2009-03-14")).
-    addMovement(STOCKHOLM, toDate("2009-03-14"), toDate("2009-03-16")).
-    build();
-  public final static Voyage v250 = new Voyage.Builder(new VoyageNumber("V250"), LONGBEACH).
-    addMovement(DALLAS, toDate("2009-03-06"), toDate("2009-03-08")).
-    addMovement(NEWYORK, toDate("2009-03-10"), toDate("2009-03-14")).
-    build();
-  public final static Voyage v300 = new Voyage.Builder(new VoyageNumber("V300"), TOKYO).
-    addMovement(ROTTERDAM, toDate("2009-03-08"), toDate("2009-03-11")).
-    addMovement(HAMBURG, toDate("2009-03-11"), toDate("2009-03-12")).
-    addMovement(MELBOURNE, toDate("2009-03-14"), toDate("2009-03-18")).
-    addMovement(TOKYO, toDate("2009-03-19"), toDate("2009-03-21")).
-    build();
-  public final static Voyage v400 = new Voyage.Builder(new VoyageNumber("V400"), HAMBURG).
-    addMovement(STOCKHOLM, toDate("2009-03-14"), toDate("2009-03-15")).
-    addMovement(HELSINKI, toDate("2009-03-15"), toDate("2009-03-16")).
-    addMovement(HAMBURG, toDate("2009-03-20"), toDate("2009-03-22")).
-    build();
-
-  /**
-   * Voyage number 0100S (by ship)
-   * <p/>
-   * Hongkong - Hangzou - Tokyo - Melbourne - New York
-   */
-  public static final Voyage HONGKONG_TO_NEW_YORK =
-    new Voyage.Builder(new VoyageNumber("0100S"), HONGKONG).
-      addMovement(HANGZOU, toDate("2008-10-01", "12:00"), toDate("2008-10-03", "14:30")).
-      addMovement(TOKYO, toDate("2008-10-03", "21:00"), toDate("2008-10-06", "06:15")).
-      addMovement(MELBOURNE, toDate("2008-10-06", "11:00"), toDate("2008-10-12", "11:30")).
-      addMovement(NEWYORK, toDate("2008-10-14", "12:00"), toDate("2008-10-23", "23:10")).
-      build();
-
-
-  /**
-   * Voyage number 0200T (by train)
-   * <p/>
-   * New York - Chicago - Dallas
-   */
-  public static final Voyage NEW_YORK_TO_DALLAS =
-    new Voyage.Builder(new VoyageNumber("0200T"), NEWYORK).
-      addMovement(CHICAGO, toDate("2008-10-24", "07:00"), toDate("2008-10-24", "17:45")).
-      addMovement(DALLAS, toDate("2008-10-24", "21:25"), toDate("2008-10-25", "19:30")).
-      build();
-
-  /**
-   * Voyage number 0300A (by airplane)
-   * <p/>
-   * Dallas - Hamburg - Stockholm - Helsinki
-   */
-  public static final Voyage DALLAS_TO_HELSINKI =
-    new Voyage.Builder(new VoyageNumber("0300A"), DALLAS).
-      addMovement(HAMBURG, toDate("2008-10-29", "03:30"), toDate("2008-10-31", "14:00")).
-      addMovement(STOCKHOLM, toDate("2008-11-01", "15:20"), toDate("2008-11-01", "18:40")).
-      addMovement(HELSINKI, toDate("2008-11-02", "09:00"), toDate("2008-11-02", "11:15")).
-      build();
-
-  /**
-   * Voyage number 0301S (by ship)
-   * <p/>
-   * Dallas - Hamburg - Stockholm - Helsinki, alternate route
-   */
-  public static final Voyage DALLAS_TO_HELSINKI_ALT =
-    new Voyage.Builder(new VoyageNumber("0301S"), DALLAS).
-      addMovement(HELSINKI, toDate("2008-10-29", "03:30"), toDate("2008-11-05", "15:45")).
-      build();
-
-  /**
-   * Voyage number 0400S (by ship)
-   * <p/>
-   * Helsinki - Rotterdam - Shanghai - Hongkong
-   */
-  public static final Voyage HELSINKI_TO_HONGKONG =
-    new Voyage.Builder(new VoyageNumber("0400S"), HELSINKI).
-      addMovement(ROTTERDAM, toDate("2008-11-04", "05:50"), toDate("2008-11-06", "14:10")).
-      addMovement(SHANGHAI, toDate("2008-11-10", "21:45"), toDate("2008-11-22", "16:40")).
-      addMovement(HONGKONG, toDate("2008-11-24", "07:00"), toDate("2008-11-28", "13:37")).
-      build();
-
-  public static final Map<VoyageNumber, Voyage> ALL = new HashMap();
-
-  static {
-    for (Field field : SampleVoyages.class.getDeclaredFields()) {
-      if (field.getType().equals(Voyage.class)) {
-        try {
-          Voyage voyage = (Voyage) field.get(null);
-          ALL.put(voyage.voyageNumber(), voyage);
-        } catch (IllegalAccessException e) {
-          throw new RuntimeException(e);
-        }
-      }
-    }
-  }
-
-  public static List<Voyage> getAll() {
-    return new ArrayList<Voyage>(ALL.values());
-  }
-
-  public static Voyage lookup(VoyageNumber voyageNumber) {
-    return ALL.get(voyageNumber);
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/voyage/Schedule.java

@@ -1,85 +0,0 @@
-package se.citerus.dddsample.domain.model.voyage;
-
-import org.apache.commons.lang.Validate;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import se.citerus.dddsample.domain.model.location.Location;
-import se.citerus.dddsample.domain.shared.ValueObject;
-
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-
-/**
- * A voyage schedule.
- */
-public class Schedule implements ValueObject<Schedule> {
-
-  private List<CarrierMovement> carrierMovements;
-
-  public static final Schedule EMPTY = new Schedule();
-
-  Schedule(final List<CarrierMovement> carrierMovements) {
-    Validate.notNull(carrierMovements);
-    Validate.noNullElements(carrierMovements);
-    Validate.notEmpty(carrierMovements);
-
-    this.carrierMovements = carrierMovements;
-  }
-
-  /**
-   * @return Carrier movements.
-   */
-  public List<CarrierMovement> carrierMovements() {
-    return Collections.unmodifiableList(carrierMovements);
-  }
-
-  /**
-   * @param location location of departure
-   * @return Date of departure from this location, or null if it's not part of the voyage.
-   */
-  public Date departureTimeAt(final Location location) {
-    for (CarrierMovement movement : carrierMovements) {
-      if (movement.departureLocation().sameAs(location)) {
-        return movement.departureTime();
-      }
-    }
-    return null;
-  }
-
-  /**
-   * @param location location of arrival
-   * @return Date of arrival at this location, or null if it's not part of the voyage.
-   */
-  public Date arrivalTimeAt(final Location location) {
-    for (CarrierMovement movement : carrierMovements) {
-      if (movement.arrivalLocation().sameAs(location)) {
-        return movement.arrivalTime();
-      }
-    }
-    return null;
-  }
-
-  @Override
-  public boolean sameValueAs(final Schedule other) {
-    return other != null && this.carrierMovements.equals(other.carrierMovements);
-  }
-
-  @Override
-  public boolean equals(final Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    final Schedule that = (Schedule) o;
-
-    return sameValueAs(that);
-  }
-
-  @Override
-  public int hashCode() {
-    return new HashCodeBuilder().append(this.carrierMovements).toHashCode();
-  }
-
-  Schedule() {
-    // Needed by Hibernate
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/voyage/Voyage.java

@@ -1,132 +0,0 @@
-package se.citerus.dddsample.domain.model.voyage;
-
-import org.apache.commons.lang.Validate;
-import se.citerus.dddsample.domain.model.location.Location;
-import se.citerus.dddsample.domain.shared.Entity;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-/**
- * A Voyage.
- */
-public class Voyage implements Entity<Voyage> {
-
-  private VoyageNumber voyageNumber;
-  private Schedule schedule;
-
-  // Null object pattern
-  public static final Voyage NONE = new Voyage(
-    new VoyageNumber(""), Schedule.EMPTY
-  );
-
-  public Voyage(final VoyageNumber voyageNumber, final Schedule schedule) {
-    Validate.notNull(voyageNumber, "Voyage number is required");
-    Validate.notNull(schedule, "Schedule is required");
-
-    this.voyageNumber = voyageNumber;
-    this.schedule = schedule;
-  }
-
-  /**
-   * @return Voyage number.
-   */
-  public VoyageNumber voyageNumber() {
-    return voyageNumber;
-  }
-
-  /**
-   * @return Schedule.
-   */
-  public Schedule schedule() {
-    return schedule;
-  }
-
-  /**
-   * @param location         location from where the rescheduled departure happens.
-   * @param newDepartureTime new departure time
-   */
-  public void departureRescheduled(final Location location, final Date newDepartureTime) {
-    // TODO Change departure/arrival by diffs instead of absolute times
-
-    final int size = schedule.carrierMovements().size();
-    final List<CarrierMovement> carrierMovements = new ArrayList<CarrierMovement>(size);
-
-    for (CarrierMovement carrierMovement : schedule.carrierMovements()) {
-      if (carrierMovement.departureLocation().sameAs(location)) {
-        carrierMovements.add(carrierMovement.withDepartureTime(newDepartureTime));
-      } else {
-        carrierMovements.add(carrierMovement);
-      }
-    }
-
-    this.schedule = new Schedule(carrierMovements);
-  }
-
-  @Override
-  public int hashCode() {
-    return voyageNumber.hashCode();
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null) return false;
-    if (!(o instanceof Voyage)) return false;
-
-    final Voyage that = (Voyage) o;
-
-    return sameAs(that);
-  }
-
-  @Override
-  public boolean sameAs(Voyage other) {
-    return other != null && this.voyageNumber().sameValueAs(other.voyageNumber());
-  }
-
-  @Override
-  public String toString() {
-    return "Voyage " + voyageNumber;
-  }
-
-  Voyage() {
-    // Needed by Hibernate
-  }
-
-  // Needed by Hibernate
-  private Long id;
-
-
-  /**
-   * Builder pattern is used for incremental construction
-   * of a Voyage aggregate. This serves as an aggregate factory.
-   */
-  public static final class Builder {
-
-    private final List<CarrierMovement> carrierMovements = new ArrayList<CarrierMovement>();
-    private final VoyageNumber voyageNumber;
-    private Location departureLocation;
-
-    public Builder(final VoyageNumber voyageNumber, final Location departureLocation) {
-      Validate.notNull(voyageNumber, "Voyage number is required");
-      Validate.notNull(departureLocation, "Departure location is required");
-
-      this.voyageNumber = voyageNumber;
-      this.departureLocation = departureLocation;
-    }
-
-    public Builder addMovement(Location arrivalLocation, Date departureTime, Date arrivalTime) {
-      carrierMovements.add(new CarrierMovement(departureLocation, arrivalLocation, departureTime, arrivalTime));
-      // Next departure location is the same as this arrival location
-      this.departureLocation = arrivalLocation;
-      return this;
-    }
-
-    public Voyage build() {
-      return new Voyage(voyageNumber, new Schedule(carrierMovements));
-    }
-
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/voyage/VoyageNumber.java

@@ -1,53 +0,0 @@
-package se.citerus.dddsample.domain.model.voyage;
-
-import org.apache.commons.lang.Validate;
-import se.citerus.dddsample.domain.shared.ValueObject;
-
-/**
- * Identifies a voyage.
- */
-public class VoyageNumber implements ValueObject<VoyageNumber> {
-
-  private String number;
-
-  public VoyageNumber(String number) {
-    Validate.notNull(number);
-
-    this.number = number;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null) return false;
-    if (!(o instanceof VoyageNumber)) return false;
-
-    final VoyageNumber other = (VoyageNumber) o;
-
-    return sameValueAs(other);
-  }
-
-  @Override
-  public int hashCode() {
-    return number.hashCode();
-  }
-
-  @Override
-  public boolean sameValueAs(VoyageNumber other) {
-    return other != null && this.number.equals(other.number);
-  }
-
-  @Override
-  public String toString() {
-    return number;
-  }
-
-  public String stringValue() {
-    return number;
-  }
-
-  VoyageNumber() {
-    // Needed by Hibernate
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/voyage/VoyageRepository.java

@@ -1,13 +0,0 @@
-package se.citerus.dddsample.domain.model.voyage;
-
-public interface VoyageRepository {
-
-  /**
-   * Finds a voyage using voyage number.
-   *
-   * @param voyageNumber voyage number
-   * @return The voyage, or null if not found.
-   */
-  Voyage find(VoyageNumber voyageNumber);
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/voyage/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-	The voyage aggregate. Voyage is the aggregate root.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/domain/package.html

@@ -1,15 +0,0 @@
-<html>
-<body>
-<p>
-	The domain model, services and repository interfaces. This is the central part of the
-	application. The ubiquitous language is used in classes, interfaces and method signatures,
-	and every concept in here is familiar to a expert in the cargo shiping domain.
-</p>
-
-<p>
-	There is no infrastructure or user interface related code here, except for things like
-	transactional and security metadata which is likely to be relevant to a domain expert
-	("Either all of foo succeeds or none of it does", "In order to do bar you need to be a Supervisor", and so on).
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/domain/service/RoutingService.java

@@ -1,19 +0,0 @@
-package se.citerus.dddsample.domain.service;
-
-import se.citerus.dddsample.domain.model.cargo.Itinerary;
-import se.citerus.dddsample.domain.model.cargo.RouteSpecification;
-
-import java.util.List;
-
-/**
- * Routing service.
- */
-public interface RoutingService {
-
-  /**
-   * @param routeSpecification route specification
-   * @return A list of itineraries that satisfy the specification. May be an empty list if no route is found.
-   */
-  List<Itinerary> fetchRoutesForSpecification(RouteSpecification routeSpecification);
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/service/package.html

@@ -1,9 +0,0 @@
-<html>
-<body>
-<p>
-	Domain services. Those services that may be implemented purely using the domain layer
-	have their implementations here, other implementations may be part of the aplication
-	or infrastructure layers.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/domain/shared/AbstractSpecification.java

@@ -1,35 +0,0 @@
-package se.citerus.dddsample.domain.shared;
-
-
-/**
- * Abstract base implementation of composite {@link Specification} with default
- * implementations for {@code and}, {@code or} and {@code not}.
- */
-public abstract class AbstractSpecification<T> implements Specification<T> {
-
-  /**
-   * {@inheritDoc}
-   */
-  public abstract boolean isSatisfiedBy(T t);
-
-  /**
-   * {@inheritDoc}
-   */
-  public Specification<T> and(final Specification<T> specification) {
-    return new AndSpecification<T>(this, specification);
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  public Specification<T> or(final Specification<T> specification) {
-    return new OrSpecification<T>(this, specification);
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  public Specification<T> not(final Specification<T> specification) {
-    return new NotSpecification<T>(specification);
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/domain/shared/AndSpecification.java

@@ -1,28 +0,0 @@
-package se.citerus.dddsample.domain.shared;
-
-/**
- * AND specification, used to create a new specifcation that is the AND of two other specifications.
- */
-public class AndSpecification<T> extends AbstractSpecification<T> {
-
-  private Specification<T> spec1;
-  private Specification<T> spec2;
-
-  /**
-   * Create a new AND specification based on two other spec.
-   *
-   * @param spec1 Specification one.
-   * @param spec2 Specification two.
-   */
-  public AndSpecification(final Specification<T> spec1, final Specification<T> spec2) {
-    this.spec1 = spec1;
-    this.spec2 = spec2;
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  public boolean isSatisfiedBy(final T t) {
-    return spec1.isSatisfiedBy(t) && spec2.isSatisfiedBy(t);
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/domain/shared/DomainEvent.java

@@ -1,17 +0,0 @@
-package se.citerus.dddsample.domain.shared;
-
-/**
- * A domain event is something that is unique, but does not have a lifecycle.
- * The identity may be explicit, for example the sequence number of a payment,
- * or it could be derived from various aspects of the event such as where, when and what
- * has happened.
- */
-public interface DomainEvent<T> {
-
-  /**
-   * @param other The other domain event.
-   * @return <code>true</code> if the given domain event and this event are regarded as being the same event.
-   */
-  boolean sameEventAs(T other);
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/shared/DomainObjectUtils.java

@@ -1,29 +0,0 @@
-package se.citerus.dddsample.domain.shared;
-
-/**
- * Utility code for domain classes.
- */
-public class DomainObjectUtils {
-
-  /**
-   * @param actual actual value
-   * @param safe   a null-safe value
-   * @param <T>    type
-   * @return actual value, if it's not null, or safe value if the actual value is null.
-   */
-  public static <T> T nullSafe(T actual, T safe) {
-    return actual == null ? safe : actual;
-  }
-
-  // TODO wrappers for some of the commons-lang code:
-  //
-  // EqualsBuilder that uses sameIdentity/sameValue,
-  // better validation (varargs etc) 
-
-  /**
-   * Prevent instantiation.
-   */
-  private DomainObjectUtils() {
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/shared/Entity.java

@@ -1,16 +0,0 @@
-package se.citerus.dddsample.domain.shared;
-
-/**
- * An entity, as explained in the DDD book.
- */
-public interface Entity<T> {
-
-  /**
-   * Entities compare by identity, not by attributes.
-   *
-   * @param other The other entity.
-   * @return true if the identities are the same, regardles of other attributes.
-   */
-  boolean sameAs(T other);
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/shared/NotSpecification.java

@@ -1,25 +0,0 @@
-package se.citerus.dddsample.domain.shared;
-
-/**
- * NOT decorator, used to create a new specifcation that is the inverse (NOT) of the given spec.
- */
-public class NotSpecification<T> extends AbstractSpecification<T> {
-
-  private Specification<T> spec1;
-
-  /**
-   * Create a new NOT specification based on another spec.
-   *
-   * @param spec1 Specification instance to not.
-   */
-  public NotSpecification(final Specification<T> spec1) {
-    this.spec1 = spec1;
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  public boolean isSatisfiedBy(final T t) {
-    return !spec1.isSatisfiedBy(t);
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/domain/shared/OrSpecification.java

@@ -1,28 +0,0 @@
-package se.citerus.dddsample.domain.shared;
-
-/**
- * OR specification, used to create a new specifcation that is the OR of two other specifications.
- */
-public class OrSpecification<T> extends AbstractSpecification<T> {
-
-  private Specification<T> spec1;
-  private Specification<T> spec2;
-
-  /**
-   * Create a new OR specification based on two other spec.
-   *
-   * @param spec1 Specification one.
-   * @param spec2 Specification two.
-   */
-  public OrSpecification(final Specification<T> spec1, final Specification<T> spec2) {
-    this.spec1 = spec1;
-    this.spec2 = spec2;
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  public boolean isSatisfiedBy(final T t) {
-    return spec1.isSatisfiedBy(t) || spec2.isSatisfiedBy(t);
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/domain/shared/Specification.java

@@ -1,42 +0,0 @@
-package se.citerus.dddsample.domain.shared;
-
-/**
- * Specificaiton interface.
- * <p/>
- * Use {@link se.citerus.dddsample.domain.shared.AbstractSpecification} as base for creating specifications, and
- * only the method {@link #isSatisfiedBy(Object)} must be implemented.
- */
-public interface Specification<T> {
-
-  /**
-   * Check if {@code t} is satisfied by the specification.
-   *
-   * @param t Object to test.
-   * @return {@code true} if {@code t} satisfies the specification.
-   */
-  boolean isSatisfiedBy(T t);
-
-  /**
-   * Create a new specification that is the AND operation of {@code this} specification and another specification.
-   *
-   * @param specification Specification to AND.
-   * @return A new specification.
-   */
-  Specification<T> and(Specification<T> specification);
-
-  /**
-   * Create a new specification that is the OR operation of {@code this} specification and another specification.
-   *
-   * @param specification Specification to OR.
-   * @return A new specification.
-   */
-  Specification<T> or(Specification<T> specification);
-
-  /**
-   * Create a new specification that is the NOT operation of {@code this} specification.
-   *
-   * @param specification Specification to NOT.
-   * @return A new specification.
-   */
-  Specification<T> not(Specification<T> specification);
-}

dddsample/src/main/java/se/citerus/dddsample/domain/shared/ValueObject.java

@@ -1,18 +0,0 @@
-package se.citerus.dddsample.domain.shared;
-
-import java.io.Serializable;
-
-/**
- * A value object, as described in the DDD book.
- */
-public interface ValueObject<T> extends Serializable {
-
-  /**
-   * Value objects compare by the values of their attributes, they don't have an identity.
-   *
-   * @param other The other value object.
-   * @return <code>true</code> if the given value object's and this value object's attributes are the same.
-   */
-  boolean sameValueAs(T other);
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/shared/experimental/DomainEvent.java

@@ -1,17 +0,0 @@
-package se.citerus.dddsample.domain.shared.experimental;
-
-/**
- * A domain event is something that is unique, but does not have a lifecycle.
- * The identity may be explicit, for example the sequence number of a payment,
- * or it could be derived from various aspects of the event such as where, when and what
- * has happened.
- */
-public interface DomainEvent<T> {
-
-  /**
-   * @param other The other domain event.
-   * @return <code>true</code> if the given domain event and this event are regarded as being the same event.
-   */
-  boolean sameEventAs(T other);
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/shared/experimental/Entity.java

@@ -1,23 +0,0 @@
-package se.citerus.dddsample.domain.shared.experimental;
-
-/**
- * An entity, as explained in the DDD book.
- */
-public interface Entity<T, ID> {
-
-  /**
-   * Entities have an identity.
-   *
-   * @return The identity of this entity.
-   */
-  ID identity();
-
-  /**
-   * Entities compare by identity, not by attributes.
-   *
-   * @param other The other entity.
-   * @return true if the identities are the same, regardles of other attributes.
-   */
-  boolean sameAs(T other);
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/shared/experimental/EntitySupport.java

@@ -1,29 +0,0 @@
-package se.citerus.dddsample.domain.shared.experimental;
-
-/**
- * Base class for entities.
- */
-public abstract class EntitySupport<T extends Entity, ID> implements Entity<T, ID> {
-
-  @Override
-  public final boolean sameAs(final T other) {
-    return other != null && this.identity().equals(other.identity());
-  }
-
-  @Override
-  public abstract ID identity();
-
-  @Override
-  public final int hashCode() {
-    return identity().hashCode();
-  }
-
-  @Override
-  public final boolean equals(final Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    return sameAs((T) o);
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/shared/experimental/Identity.java

@@ -1,15 +0,0 @@
-package se.citerus.dddsample.domain.shared.experimental;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Every class that inherits from {@link se.citerus.dddsample.domain.shared.experimental.EntitySupport}
- * must have exactly one field annotated with this annotation.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-public @interface Identity {
-}

dddsample/src/main/java/se/citerus/dddsample/domain/shared/experimental/ValueObject.java

@@ -1,23 +0,0 @@
-package se.citerus.dddsample.domain.shared.experimental;
-
-/**
- * A value object.
- */
-public interface ValueObject<T> {
-
-  /**
-   * Value objects compare by the values of their attributes, they don't have an identity.
-   *
-   * @param other The other value object.
-   * @return <code>true</code> if the given value object's and this value object's attributes are the same.
-   */
-  boolean sameValueAs(T other);
-
-  /**
-   * Value objects can be freely copied.
-   *
-   * @return A safe, deep copy of this value object.
-   */
-  T copy();
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/shared/experimental/ValueObjectSupport.java

@@ -1,60 +0,0 @@
-package se.citerus.dddsample.domain.shared.experimental;
-
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import se.citerus.dddsample.domain.shared.ValueObject;
-
-/**
- * Base class for value objects.
- *
- * @param <T>
- */
-public abstract class ValueObjectSupport<T extends ValueObject> implements ValueObject<T> {
-
-  private transient int cachedHashCode = 0;
-
-  /**
-   * @param other The other value object.
-   * @return True if all non-transient fields are equal.
-   */
-  @Override
-  public final boolean sameValueAs(final T other) {
-    return other != null && EqualsBuilder.reflectionEquals(this, other, false);
-  }
-
-  /**
-   * @return Hash code built from all non-transient fields.
-   */
-  @Override
-  public final int hashCode() {
-    // Using a local variable to ensure that we only do a single read
-    // of the cachedHashCode field, to avoid race conditions.
-    // It doesn't matter if several threads compute the hash code and overwrite
-    // each other, but it's important that we never return 0, which could happen
-    // with multiple reads of the cachedHashCode field.
-    //
-    // See java.lang.String.hashCode()
-    int h = cachedHashCode;
-    if (h == 0) {
-      // Lazy initialization of hash code.
-      // Value objects are immutable, so the hash code never changes.
-      h = HashCodeBuilder.reflectionHashCode(this, false);
-      cachedHashCode = h;
-    }
-
-    return h;
-  }
-
-  /**
-   * @param o other object
-   * @return True if other object has the same value as this value object.
-   */
-  @Override
-  public final boolean equals(final Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    return sameValueAs((T) o);
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/domain/shared/experimental/package.html

@@ -1,8 +0,0 @@
-<html>
-<body>
-<p>
-	Experimental versions of pattern interfaces and support code for the domain layer.
-	Not used in the application.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/domain/shared/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-	Pattern interfaces and support code for the domain layer.
-</p>
-</body>
-</html>

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

@@ -1,54 +0,0 @@
-package se.citerus.dddsample.infrastructure.messaging.jms;
-
-import org.springframework.jms.core.JmsOperations;
-import org.springframework.jms.core.MessageCreator;
-import se.citerus.dddsample.application.event.SystemEvents;
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.Session;
-
-/**
- * JMS based implementation.
- */
-public final class JmsSystemEventsImpl implements SystemEvents {
-
-  private JmsOperations jmsOperations;
-  private Destination cargoHandledDestination;
-  private Destination cargoUpdateDestination;
-
-  @Override
-  public void notifyOfHandlingEvent(final HandlingEvent event) {
-    final Cargo cargo = event.cargo();
-    jmsOperations.send(cargoHandledDestination, new MessageCreator() {
-      public Message createMessage(final Session session) throws JMSException {
-        return session.createObjectMessage(cargo.trackingId());
-      }
-    });
-  }
-
-  @Override
-  public void notifyOfCargoUpdate(final Cargo cargo) {
-    jmsOperations.send(cargoUpdateDestination, new MessageCreator() {
-      public Message createMessage(Session session) throws JMSException {
-        return session.createObjectMessage(cargo.trackingId());
-      }
-    });
-  }
-
-  public void setJmsOperations(JmsOperations jmsOperations) {
-    this.jmsOperations = jmsOperations;
-  }
-
-  public void setCargoHandledDestination(Destination cargoHandledDestination) {
-    this.cargoHandledDestination = cargoHandledDestination;
-  }
-
-  public void setCargoUpdateDestination(Destination cargoUpdateDestination) {
-    this.cargoUpdateDestination = cargoUpdateDestination;
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/infrastructure/messaging/jms/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-	Asynchronous messaging implemented using JMS. This is part of the infrastructure.
-</p>
-</body>
-</html>

dddsample/src/main/java/se/citerus/dddsample/infrastructure/persistence/DatabaseTrackingIdGenerator.java

@@ -1,32 +0,0 @@
-/**
- * Purpose
- * @author peter
- * @created 2009-sep-17
- * $Id$
- */
-package se.citerus.dddsample.infrastructure.persistence;
-
-import org.hibernate.SessionFactory;
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.domain.model.cargo.TrackingIdGenerator;
-
-public class DatabaseTrackingIdGenerator implements TrackingIdGenerator {
-
-  private final SessionFactory sessionFactory;
-  private static final String SEQUENCE_NAME = "TRACKING_ID_SEQ";
-
-  public DatabaseTrackingIdGenerator(final SessionFactory sessionFactory) {
-    this.sessionFactory = sessionFactory;
-  }
-
-  @Override
-  public TrackingId nextTrackingId() {
-    final Long seq = (Long) sessionFactory.getCurrentSession().
-      createSQLQuery("select next_value from system_sequences where sequence_name = ?").
-      setParameter(1, SEQUENCE_NAME).
-      uniqueResult();
-
-    return new TrackingId(seq);
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/infrastructure/persistence/TrackingIdGeneratorInMem.java

@@ -1,23 +0,0 @@
-/**
- * Purpose
- * @author peter
- * @created 2009-sep-07
- * $Id$
- */
-package se.citerus.dddsample.infrastructure.persistence;
-
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.domain.model.cargo.TrackingIdGenerator;
-
-import java.util.concurrent.atomic.AtomicLong;
-
-public class TrackingIdGeneratorInMem implements TrackingIdGenerator {
-
-  private static final AtomicLong SEQ = new AtomicLong(1);
-
-  @Override
-  public TrackingId nextTrackingId() {
-    return new TrackingId(SEQ.getAndIncrement());
-  }
-
-}

dddsample/src/main/java/se/citerus/dddsample/infrastructure/persistence/hibernate/CargoRepositoryHibernate.java

@@ -1,49 +0,0 @@
-package se.citerus.dddsample.infrastructure.persistence.hibernate;
-
-import org.springframework.stereotype.Repository;
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.cargo.CargoRepository;
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.domain.model.voyage.Voyage;
-
-import java.util.List;
-
-/**
- * Hibernate implementation of CargoRepository.
- */
-@Repository
-public class CargoRepositoryHibernate extends HibernateRepository implements CargoRepository {
-
-  @Override
-  public Cargo find(TrackingId tid) {
-    return (Cargo) getSession().
-      createQuery("from Cargo where trackingId = :tid").
-      setParameter("tid", tid).
-      uniqueResult();
-  }
-
-  @SuppressWarnings("unchecked")
-  @Override
-  public List<Cargo> findCargosOnVoyage(Voyage voyage) {
-    return getSession().createQuery(
-      "select cargo from Cargo as cargo " +
-        "left join cargo.itinerary.legs as leg " +
-        "where leg.voyage = :voyage").
-      setParameter("voyage", voyage).
-      list();
-  }
-
-  @Override
-  public void store(Cargo cargo) {
-    getSession().saveOrUpdate(cargo);
-    // Delete-orphan does not seem to work correctly when the parent is a component
-    getSession().createSQLQuery("delete from Leg where cargo_id = null").executeUpdate();
-  }
-
-  @SuppressWarnings("unchecked")
-  @Override
-  public List<Cargo> findAll() {
-    return getSession().createQuery("from Cargo").list();
-  }
-
-}