Introduced Voyage, Schedule and VoyageNumber. CarrierMovement is now a value object, CarrierMovementId is dropped.

Leg now has load/unload location and time, and a reference to a Voyage.

HandlingEvent references a Voyage instead of a CarrierMovement.

DeliveryHistory is renamed to Delivery.

(Yes, it's very broken right now, but it compiles)

dddsample/src/main/java/se/citerus/dddsample/application/remoting/BookingServiceFacadeImpl.java

@@ -12,7 +12,7 @@ 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.cargo.TrackingId;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementRepository;
+import se.citerus.dddsample.domain.model.carrier.VoyageRepository;
 import se.citerus.dddsample.domain.model.location.Location;
 import se.citerus.dddsample.domain.model.location.LocationRepository;
 import se.citerus.dddsample.domain.model.location.UnLocode;
@@ -35,7 +35,7 @@ public class BookingServiceFacadeImpl implements BookingServiceFacade {
   private BookingService bookingService;
   private LocationRepository locationRepository;
   private CargoRepository cargoRepository;
-  private CarrierMovementRepository carrierMovementRepository;
+  private VoyageRepository voyageRepository;
   private final Logger logger = Logger.getLogger(BookingServiceFacadeImpl.class);
 
   @Transactional(readOnly = true)
@@ -60,7 +60,7 @@ public class BookingServiceFacadeImpl implements BookingServiceFacade {
 
   @Transactional(readOnly = false)
   public void assignCargoToRoute(String trackingId, ItineraryCandidateDTO itineraryCandidateDTO) {
-    final Itinerary itinerary = new ItineraryCandidateDTOAssembler().fromDTO(itineraryCandidateDTO, carrierMovementRepository, locationRepository);
+    final Itinerary itinerary = new ItineraryCandidateDTOAssembler().fromDTO(itineraryCandidateDTO, voyageRepository, locationRepository);
 
     final Cargo cargo = cargoRepository.find(new TrackingId(trackingId));
     if (cargo == null) {
@@ -109,7 +109,7 @@ public class BookingServiceFacadeImpl implements BookingServiceFacade {
     this.cargoRepository = cargoRepository;
   }
 
-  public void setCarrierMovementRepository(CarrierMovementRepository carrierMovementRepository) {
-    this.carrierMovementRepository = carrierMovementRepository;
+  public void setCarrierMovementRepository(VoyageRepository voyageRepository) {
+    this.voyageRepository = voyageRepository;
   }
 }

dddsample/src/main/java/se/citerus/dddsample/application/remoting/dto/LegDTO.java

@@ -7,25 +7,25 @@ import java.io.Serializable;
  */
 public final class LegDTO implements Serializable {
 
-  private final String carrierMovementId;
+  private final String voyageNumber;
   private final String from;
   private final String to;
 
   /**
    * Constructor.
    *
-   * @param carrierMovementId
+   * @param voyageNumber
    * @param from
    * @param to
    */
-  public LegDTO(final String carrierMovementId, final String from, final String to) {
-    this.carrierMovementId = carrierMovementId;
+  public LegDTO(final String voyageNumber, final String from, final String to) {
+    this.voyageNumber = voyageNumber;
     this.from = from;
     this.to = to;
   }
 
-  public String getCarrierMovementId() {
-    return carrierMovementId;
+  public String getVoyageNumber() {
+    return voyageNumber;
   }
 
   public String getFrom() {

dddsample/src/main/java/se/citerus/dddsample/application/remoting/dto/assembler/CargoRoutingDTOAssembler.java

@@ -17,9 +17,9 @@ public class CargoRoutingDTOAssembler {
     );
     for (Leg leg : cargo.itinerary().legs()) {
       dto.addLeg(
-        leg.carrierMovement().carrierMovementId().idString(),
-        leg.from().unLocode().idString(),
-        leg.to().unLocode().idString()
+        leg.voyage().voyageNumber().idString(),
+        leg.loadLocation().unLocode().idString(),
+        leg.unloadLocation().unLocode().idString()
       );
     }
     return dto;

dddsample/src/main/java/se/citerus/dddsample/application/remoting/dto/assembler/ItineraryCandidateDTOAssembler.java

@@ -4,14 +4,15 @@ import se.citerus.dddsample.application.remoting.dto.ItineraryCandidateDTO;
 import se.citerus.dddsample.application.remoting.dto.LegDTO;
 import se.citerus.dddsample.domain.model.cargo.Itinerary;
 import se.citerus.dddsample.domain.model.cargo.Leg;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementRepository;
+import se.citerus.dddsample.domain.model.carrier.Voyage;
+import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
+import se.citerus.dddsample.domain.model.carrier.VoyageRepository;
 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.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -28,20 +29,20 @@ public class ItineraryCandidateDTOAssembler {
   }
 
   protected LegDTO toLegDTO(final Leg leg) {
-    final CarrierMovementId carrierMovementId = leg.carrierMovement().carrierMovementId();
-    final UnLocode from = leg.from().unLocode();
-    final UnLocode to = leg.to().unLocode();
-    return new LegDTO(carrierMovementId.idString(), from.idString(), to.idString());
+    final VoyageNumber voyageNumber = leg.voyage().voyageNumber();
+    final UnLocode from = leg.loadLocation().unLocode();
+    final UnLocode to = leg.unloadLocation().unLocode();
+    return new LegDTO(voyageNumber.idString(), from.idString(), to.idString());
   }
 
-  public Itinerary fromDTO(ItineraryCandidateDTO itineraryCandidateDTO, CarrierMovementRepository carrierMovementRepository, LocationRepository locationRepository) {
+  public Itinerary fromDTO(ItineraryCandidateDTO itineraryCandidateDTO, VoyageRepository voyageRepository, LocationRepository locationRepository) {
     final List<Leg> legs = new ArrayList<Leg>(itineraryCandidateDTO.getLegs().size());
     for (LegDTO legDTO : itineraryCandidateDTO.getLegs()) {
-      final CarrierMovementId carrierMovementId = new CarrierMovementId(legDTO.getCarrierMovementId());
-      final CarrierMovement carrierMovement = carrierMovementRepository.find(carrierMovementId);
+      final VoyageNumber voyageNumber = new VoyageNumber(legDTO.getVoyageNumber());
+      final Voyage voyage = voyageRepository.find(voyageNumber);
       final Location from = locationRepository.find(new UnLocode(legDTO.getFrom()));
       final Location to = locationRepository.find(new UnLocode(legDTO.getTo()));
-      legs.add(new Leg(carrierMovement, from, to));
+      legs.add(new Leg(voyage, from, to, new Date(), new Date()));  // TODO better dates
     }
     return new Itinerary(legs);
   }

dddsample/src/main/java/se/citerus/dddsample/application/routing/ExternalRoutingService.java

@@ -4,8 +4,8 @@ import org.springframework.transaction.annotation.Transactional;
 import se.citerus.dddsample.domain.model.cargo.Itinerary;
 import se.citerus.dddsample.domain.model.cargo.Leg;
 import se.citerus.dddsample.domain.model.cargo.RouteSpecification;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementRepository;
+import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
+import se.citerus.dddsample.domain.model.carrier.VoyageRepository;
 import se.citerus.dddsample.domain.model.location.Location;
 import se.citerus.dddsample.domain.model.location.LocationRepository;
 import se.citerus.dddsample.domain.model.location.UnLocode;
@@ -15,6 +15,7 @@ import se.citerus.routingteam.TransitEdge;
 import se.citerus.routingteam.TransitPath;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -27,7 +28,7 @@ public class ExternalRoutingService implements RoutingService {
 
   private GraphTraversalService graphTraversalService;
   private LocationRepository locationRepository;
-  private CarrierMovementRepository carrierMovementRepository;
+  private VoyageRepository voyageRepository;
 
   @Transactional(readOnly = true)
   public List<Itinerary> fetchRoutesForSpecification(RouteSpecification routeSpecification) {
@@ -62,9 +63,10 @@ public class ExternalRoutingService implements RoutingService {
 
   private Leg toLeg(TransitEdge edge) {
     return new Leg(
-      carrierMovementRepository.find(new CarrierMovementId(edge.getCarrierMovementId())),
+      voyageRepository.find(new VoyageNumber(edge.getCarrierMovementId())),
       locationRepository.find(new UnLocode(edge.getFromUnLocode())),
-      locationRepository.find(new UnLocode(edge.getToUnLocode()))
+      locationRepository.find(new UnLocode(edge.getToUnLocode())),
+      new Date(), new Date()  // TODO better dates
     );
   }
 
@@ -76,7 +78,7 @@ public class ExternalRoutingService implements RoutingService {
     this.locationRepository = locationRepository;
   }
 
-  public void setCarrierMovementRepository(CarrierMovementRepository carrierMovementRepository) {
-    this.carrierMovementRepository = carrierMovementRepository;
+  public void setCarrierMovementRepository(VoyageRepository voyageRepository) {
+    this.voyageRepository = voyageRepository;
   }
 }

dddsample/src/main/java/se/citerus/dddsample/application/ws/HandlingEventServiceEndpointImpl.java

@@ -8,14 +8,14 @@ import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.TransactionCallbackWithoutResult;
 import org.springframework.transaction.support.TransactionTemplate;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
+import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.domain.model.handling.HandlingEventFactory;
 import se.citerus.dddsample.domain.model.location.UnLocode;
 import se.citerus.dddsample.domain.service.HandlingEventService;
-import se.citerus.dddsample.domain.service.UnknownCarrierMovementIdException;
+import se.citerus.dddsample.domain.service.UnknownCargoException;
 import se.citerus.dddsample.domain.service.UnknownLocationException;
-import se.citerus.dddsample.domain.service.UnknownTrackingIdException;
+import se.citerus.dddsample.domain.service.UnknownVoyageException;
 
 import javax.jws.WebService;
 import java.text.ParseException;
@@ -31,21 +31,23 @@ public class HandlingEventServiceEndpointImpl implements HandlingEventServiceEnd
   private final Log logger = LogFactory.getLog(getClass());
   protected static final String ISO_8601_FORMAT = "yyyy-mm-dd HH:MM:SS.SSS";
 
-  public void register(final String completionTime, final String trackingId, final String carrierMovementId,
+  public void register(final String completionTime, final String trackingId, final String voyageNumberString,
                        final String unlocode, final String eventType) {
     try {
       final Date date = parseIso8601Date(completionTime);
       final TrackingId tid = new TrackingId(trackingId);
-      final CarrierMovementId cid;
-      if (StringUtils.isNotEmpty(carrierMovementId)) {
-        cid = new CarrierMovementId(carrierMovementId);
+
+      final VoyageNumber voyageNumber;
+      if (StringUtils.isNotEmpty(voyageNumberString)) {
+        voyageNumber = new VoyageNumber(voyageNumberString);
       } else {
-        cid = null;
+        voyageNumber = null;
       }
+
       final HandlingEvent.Type type = parseEventType(eventType);
       final UnLocode ul = new UnLocode(unlocode);
 
-      doRegister(date, tid, cid, type, ul);
+      doRegister(date, tid, voyageNumber, type, ul);
     } catch (IllegalArgumentException iae) {
       handleIllegalArgument(iae);
     } catch (ParseException pe) {
@@ -58,17 +60,17 @@ public class HandlingEventServiceEndpointImpl implements HandlingEventServiceEnd
   }
 
   // TODO this entire step would be well suited to move to a consumer of asynchronous messages
-  private void doRegister(final Date date, final TrackingId tid, final CarrierMovementId cid, final HandlingEvent.Type type, final UnLocode ul) {
+  private void doRegister(final Date date, final TrackingId tid, final VoyageNumber voyageNumber, final HandlingEvent.Type type, final UnLocode ul) {
     // Using programmatic demarcation here due to weaving conflicts
     // between jax-ws and Spring transaction annotations
     transactionTemplate.execute(new TransactionCallbackWithoutResult() {
         protected void doInTransactionWithoutResult(TransactionStatus status) {
             try {
-                HandlingEvent event = handlingEventFactory.createHandlingEvent(date, tid, cid, ul, type);
+                HandlingEvent event = handlingEventFactory.createHandlingEvent(date, tid, voyageNumber, ul, type);
                 handlingEventService.register(event);
-            } catch (UnknownCarrierMovementIdException e) {
+            } catch (UnknownVoyageException e) {
                 handleUnknownCarrierMovementId(e);
-            } catch (UnknownTrackingIdException e) {
+            } catch (UnknownCargoException e) {
                 handleUnknownTrackingId(e);
             } catch (UnknownLocationException e) {
                 handleUnknownLocation(e);
@@ -113,7 +115,7 @@ public class HandlingEventServiceEndpointImpl implements HandlingEventServiceEnd
     logger.error(e, e);
   }
 
-  private void handleUnknownCarrierMovementId(UnknownCarrierMovementIdException e) {
+  private void handleUnknownCarrierMovementId(UnknownVoyageException e) {
     logger.error(e, e);
   }
 

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

@@ -40,8 +40,7 @@ public final class Cargo implements Entity<Cargo> {
   private Location origin;
   private Location destination;
   private Itinerary itinerary;
-  private DeliveryHistory deliveryHistory;
-  private boolean misdirected;
+  private Delivery delivery;
 
   /**
    * @param trackingId tracking id
@@ -56,7 +55,6 @@ public final class Cargo implements Entity<Cargo> {
     this.trackingId = trackingId;
     this.origin = origin;
     this.destination = destination;
-    updateState();
   }
 
   /**
@@ -94,8 +92,8 @@ public final class Cargo implements Entity<Cargo> {
   /**
    * @return The delivery history. Never null.
    */
-  public DeliveryHistory deliveryHistory() {
-    return DomainObjectUtils.nullSafe(this.deliveryHistory, DeliveryHistory.EMPTY_DELIVERY_HISTORY);
+  public Delivery deliveryHistory() {
+    return DomainObjectUtils.nullSafe(this.delivery, Delivery.EMPTY_DELIVERY);
   }
 
   /**
@@ -106,18 +104,6 @@ public final class Cargo implements Entity<Cargo> {
   }
 
   /**
-   * Updates the state of the cargo.
-   */
-  public void updateState() {
-    final HandlingEvent lastEvent = deliveryHistory().lastEvent();
-    if (lastEvent == null) {
-      this.misdirected = false;
-    } else {
-      this.misdirected = !itinerary().isExpected(lastEvent);
-    }
-  }
-
-  /**
    * @return Last known location of the cargo, or Location.UNKNOWN if the delivery history is empty.
    */
   public Location lastKnownLocation() {
@@ -153,11 +139,11 @@ public final class Cargo implements Entity<Cargo> {
   }
 
   /**
-   * @param deliveryHistory Cargo delivery history
+   * @param delivery Cargo delivery history
    */
-  void setDeliveryHistory(final DeliveryHistory deliveryHistory) {
-    Validate.notNull(deliveryHistory);
-    this.deliveryHistory = deliveryHistory;
+  void setDeliveryHistory(final Delivery delivery) {
+    Validate.notNull(delivery);
+    this.delivery = delivery;
   }
 
   /**
@@ -172,7 +158,12 @@ public final class Cargo implements Entity<Cargo> {
    * @return <code>true</code> if the cargo has been misdirected,
    */
   public boolean isMisdirected() {
-    return misdirected;
+    final HandlingEvent lastEvent = deliveryHistory().lastEvent();
+    if (lastEvent == null) {
+      return false;
+    } else {
+      return !itinerary().isExpected(lastEvent);
+    }
   }
 
   /**
@@ -183,7 +174,7 @@ public final class Cargo implements Entity<Cargo> {
    * @return True if the cargo has been unloaded at the final destination.
    */
   public boolean isUnloadedAtDestination() {
-    for (HandlingEvent event : deliveryHistory().eventsOrderedByCompletionTime()) {
+    for (HandlingEvent event : deliveryHistory().history()) {
       if (HandlingEvent.Type.UNLOAD.equals(event.type())
         && destination.equals(event.location())) {
         return true;

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

@@ -32,7 +32,7 @@ public class Itinerary implements ValueObject<Itinerary> {
     Validate.notEmpty(legs);
     Validate.noNullElements(legs);
     
-    this.legs = Collections.unmodifiableList(legs);
+    this.legs = legs;
   }
 
   /**
@@ -51,7 +51,7 @@ public class Itinerary implements ValueObject<Itinerary> {
    * @return the legs of this itinerary, as an <b>immutable</b> list.
    */
   public List<Leg> legs() {
-    return legs;
+    return Collections.unmodifiableList(legs);
   }
 
   /**
@@ -68,24 +68,24 @@ public class Itinerary implements ValueObject<Itinerary> {
     if (event.type() == HandlingEvent.Type.RECEIVE) {
       //Check that the first leg's origin is the event's location
       final Leg leg = legs.get(0);
-      return (leg.from().equals(event.location()));
+      return (leg.loadLocation().equals(event.location()));
     }
 
     if (event.type() == HandlingEvent.Type.LOAD) {
-      //Check that the there is one leg with same from location and carrier movement
+      //Check that the there is one leg with same load location and voyage
       for (Leg leg : legs) {
-        if (leg.from().equals(event.location())
-          && leg.carrierMovement().equals(event.carrierMovement()))
+        if (leg.loadLocation().sameIdentityAs(event.location()) &&
+            leg.voyage().sameIdentityAs(event.voyage()))
           return true;
       }
       return false;
     }
 
     if (event.type() == HandlingEvent.Type.UNLOAD) {
-      //Check that the there is one leg with same to loc and carrier movement
+      //Check that the there is one leg with same unload location and voyage
       for (Leg leg : legs) {
-        if (leg.to().equals(event.location())
-          && leg.carrierMovement().equals(event.carrierMovement()))
+        if (leg.unloadLocation().equals(event.location()) &&
+            leg.voyage().equals(event.voyage()))
           return true;
       }
       return false;
@@ -94,7 +94,7 @@ public class Itinerary implements ValueObject<Itinerary> {
     if (event.type() == HandlingEvent.Type.CLAIM) {
       //Check that the last leg's destination is from the event's location
       final Leg leg = legs.get(legs.size() - 1);
-      return (leg.to().equals(event.location()));
+      return (leg.unloadLocation().equals(event.location()));
     }
 
     //HandlingEvent.Type.CUSTOMS;

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

@@ -4,56 +4,66 @@ 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.ValueObject;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
+import se.citerus.dddsample.domain.model.carrier.Voyage;
 import se.citerus.dddsample.domain.model.location.Location;
 
+import java.util.Date;
+
 /**
  * An itinerary consists of one or more legs.
  */
 public final class Leg implements ValueObject<Leg> {
 
-  private CarrierMovement carrierMovement;
-  private Location from;
-  private Location to;
-
-  /**
-   * Constructor.
-   *
-   * @param carrierMovement
-   * @param from
-   * @param to
-   */
-  public Leg(final CarrierMovement carrierMovement, final Location from, final Location to) {
-    Validate.noNullElements(new Object[]{carrierMovement, from, to});
-    this.carrierMovement = carrierMovement;
-    this.from = from;
-    this.to = to;
+  private Voyage voyage;
+  private Location loadLocation;
+  private Location unloadLocation;
+  private Date loadTime;
+  private Date unloadTime;
+
+  public Leg(Voyage voyage, Location loadLocation, Location unloadLocation, Date loadTime, Date unloadTime) {
+    Validate.noNullElements(new Object[] {voyage, loadLocation, unloadLocation, loadTime, unloadTime});
+    
+    this.voyage = voyage;
+    this.loadLocation = loadLocation;
+    this.unloadLocation = unloadLocation;
+    this.loadTime = loadTime;
+    this.unloadTime = unloadTime;
+  }
+
+  public Voyage voyage() {
+    return voyage;
+  }
+
+  public Location loadLocation() {
+    return loadLocation;
   }
 
-  public Location from() {
-    return from;
+  public Location unloadLocation() {
+    return unloadLocation;
   }
 
-  public Location to() {
-    return to;
+  public Date loadTime() {
+    return new Date(loadTime.getTime());
   }
 
-  public CarrierMovement carrierMovement() {
-    return carrierMovement;
+  public Date unloadTime() {
+    return new Date(unloadTime.getTime());
   }
 
   @Override
   public boolean sameValueAs(final Leg other) {
     return other != null && new EqualsBuilder().
-      append(this.carrierMovement, other.carrierMovement).
-      append(this.from, other.from).
-      append(this.to, other.to).
+      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 Leg copy() {
-    return new Leg(carrierMovement, from, to);
+    return new Leg(voyage(), loadLocation(), unloadLocation(), loadTime(), unloadTime());
   }
 
   @Override
@@ -69,9 +79,11 @@ public final class Leg implements ValueObject<Leg> {
   @Override
   public int hashCode() {
     return new HashCodeBuilder().
-      append(carrierMovement).
-      append(from).
-      append(to).
+      append(voyage).
+      append(loadLocation).
+      append(unloadLocation).
+      append(loadTime).
+      append(unloadTime).
       toHashCode();
   }
 

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

@@ -1,7 +1,9 @@
 package se.citerus.dddsample.domain.model.carrier;
 
 import org.apache.commons.lang.Validate;
-import se.citerus.dddsample.domain.model.Entity;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import se.citerus.dddsample.domain.model.ValueObject;
 import se.citerus.dddsample.domain.model.location.Location;
 
 import java.util.Date;
@@ -10,82 +12,104 @@ import java.util.Date;
 /**
  * A carrier movement is a vessel voyage from one location to another.
  */
-public final class CarrierMovement implements Entity<CarrierMovement> {
+public final class CarrierMovement implements ValueObject<CarrierMovement> {
 
-  private CarrierMovementId carrierMovementId;
-  private Location from;
-  private Location to;
+  private Location departureLocation;
+  private Location arrivalLocation;
   private Date departureTime;
   private Date arrivalTime;
 
   // Null object pattern 
   public static final CarrierMovement NONE = new CarrierMovement(
-    new CarrierMovementId(""), Location.UNKNOWN, Location.UNKNOWN,
-    new Date(0), new Date(0));
+    Location.UNKNOWN, Location.UNKNOWN,
+    new Date(0), new Date(0)
+  );
 
   /**
    * Constructor.
    *
-   * @param carrierMovementId carrier movement id
-   * @param from from location
-   * @param to to location
+   * @param departureLocation location of departure
+   * @param arrivalLocation location of arrival
    * @param departureTime time of departure
    * @param arrivalTime time of arrival
    */
-  public CarrierMovement(final CarrierMovementId carrierMovementId,
-                         final Location from,
-                         final Location to,
-                         final Date departureTime,
-                         final Date arrivalTime) {
-    Validate.noNullElements(new Object[]{carrierMovementId, from, to, departureTime, arrivalTime});
+  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.carrierMovementId = carrierMovementId;
-    this.from = from;
-    this.to = to;
+    this.departureLocation = departureLocation;
+    this.arrivalLocation = arrivalLocation;
   }
 
-  public CarrierMovementId carrierMovementId() {
-    return carrierMovementId;
-  }
-
-  public Location from() {
-    return from;
+  /**
+   * @return Departure location.
+   */
+  public Location departureLocation() {
+    return departureLocation;
   }
 
-  public Location to() {
-    return to;
+  /**
+   * @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());
   }
 
   @Override
-  public boolean sameIdentityAs(final CarrierMovement other) {
-    return carrierMovementId.sameValueAs(other.carrierMovementId);
-  }
-
-  @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 sameIdentityAs(that);
+    return sameValueAs(that);
   }
 
-  /**
-   * @return Hashcode of carrier movement id.
-   */
   @Override
   public int hashCode() {
-    return carrierMovementId.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();
+  }
+
+  @Override
+  public CarrierMovement copy() {
+    return new CarrierMovement(
+      departureLocation(),
+      arrivalLocation(),
+      departureTime(),
+      arrivalTime()
+    );
   }
 
   CarrierMovement() {

dddsample/src/main/java/se/citerus/dddsample/domain/model/carrier/CarrierMovementRepository.java

@@ -1,13 +0,0 @@
-package se.citerus.dddsample.domain.model.carrier;
-
-public interface CarrierMovementRepository {
-
-  /**
-   * Finds a carrier movement using given id.
-   *
-   * @param carrierMovementId Id
-   * @return The carrier movement.
-   */
-  CarrierMovement find(CarrierMovementId carrierMovementId);
-
-}

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

@@ -0,0 +1,69 @@
+package se.citerus.dddsample.domain.model.carrier;
+
+import org.apache.commons.lang.Validate;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import se.citerus.dddsample.domain.model.ValueObject;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * A voyage schedule.
+ * 
+ */
+public class Schedule implements ValueObject<Schedule> {
+
+  private List<CarrierMovement> carrierMovements = Collections.EMPTY_LIST;
+
+  public static final Schedule EMPTY = new Schedule();
+
+  public Schedule(List<CarrierMovement> carrierMovements) {
+    Validate.notNull(carrierMovements);
+    Validate.noNullElements(carrierMovements);
+      
+    this.carrierMovements = carrierMovements;
+  }
+
+  /**
+   * @return Carrier movements.
+   */
+  public List<CarrierMovement> carrierMovements() {
+    return Collections.unmodifiableList(carrierMovements);
+  }
+
+  @Override
+  public boolean sameValueAs(Schedule other) {
+    return other != null && this.carrierMovements.equals(other.carrierMovements);
+  }
+
+  @Override
+  public Schedule copy() {
+    final List<CarrierMovement> copyCarrierMovements = new ArrayList(carrierMovements.size());
+    for (CarrierMovement carrierMovement : carrierMovements) {
+      copyCarrierMovements.add(carrierMovement.copy());
+    }
+
+    return new Schedule(copyCarrierMovements);
+  }
+
+  @Override
+  public boolean equals(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/carrier/Voyage.java

@@ -0,0 +1,64 @@
+package se.citerus.dddsample.domain.model.carrier;
+
+import se.citerus.dddsample.domain.model.Entity;
+
+/**
+ * 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(VoyageNumber voyageNumber, Schedule schedule) {
+    this.voyageNumber = voyageNumber;
+    this.schedule = schedule;
+  }
+
+  /**
+   * @return Voyage number.
+   */
+  public VoyageNumber voyageNumber() {
+    return voyageNumber;
+  }
+
+  /**
+   * @return Schedule.
+   */
+  public Schedule schedule() {
+    return schedule;
+  }
+
+  @Override
+  public int hashCode() {
+    return voyageNumber.hashCode();
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+
+    final Voyage that = (Voyage) o;
+
+    return sameIdentityAs(that);
+  }
+
+  @Override
+  public boolean sameIdentityAs(Voyage other) {
+    return other != null && this.voyageNumber.sameValueAs(other.voyageNumber);
+  }
+
+  Voyage() {
+    // Needed by Hibernate
+  }
+
+  // Needed by Hibernate
+  private Long id;
+
+}

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

@@ -0,0 +1,34 @@
+package se.citerus.dddsample.domain.model.carrier;
+
+import org.apache.commons.lang.Validate;
+import se.citerus.dddsample.domain.model.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 sameValueAs(VoyageNumber other) {
+    return other != null && this.number.equals(other.number);
+  }
+
+  @Override
+  public VoyageNumber copy() {
+    return new VoyageNumber(number);
+  }
+
+  public String idString() {
+    return number;
+  }
+  
+}

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

@@ -0,0 +1,13 @@
+package se.citerus.dddsample.domain.model.carrier;
+
+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/handling/HandlingEvent.java

@@ -6,6 +6,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
 import se.citerus.dddsample.domain.model.DomainEvent;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
+import se.citerus.dddsample.domain.model.carrier.Voyage;
 import se.citerus.dddsample.domain.model.location.Location;
 import se.citerus.dddsample.domain.shared.DomainObjectUtils;
 
@@ -40,7 +41,7 @@ public final class HandlingEvent implements DomainEvent<HandlingEvent> {
   };
 
   private Type type;
-  private CarrierMovement carrierMovement;
+  private Voyage voyage;
   private Location location;
   private Date completionTime;
   private Date registrationTime;
@@ -81,40 +82,40 @@ public final class HandlingEvent implements DomainEvent<HandlingEvent> {
     public boolean prohibitsCarrierMovement() {
       return !requiresCarrierMovement();
     }
+
   }
-  
+
   /**
    * @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. Legal values are LOAD and UNLOAD
+   * @param type             type of event
    * @param location         where the event took place
-   * @param carrierMovement  carrier movement.
+   * @param voyage           the voyage
    */
-  public HandlingEvent(final Cargo cargo, final Date completionTime, final Date registrationTime, final Type type,
-                       final Location location, final CarrierMovement carrierMovement) {
-    Validate.noNullElements(new Object[] {cargo, completionTime, registrationTime, type, location, carrierMovement});
+  public HandlingEvent(Cargo cargo, Date completionTime, Date registrationTime, Type type,
+                       Location location, Voyage voyage) {
+    Validate.noNullElements(new Object[] {cargo, completionTime, registrationTime, type, location, voyage});
     if (type.prohibitsCarrierMovement()) {
       throw new IllegalArgumentException("Carrier movement is not allowed with event type " + type);
     }
 
+    this.voyage = voyage;
     this.completionTime = completionTime;
     this.registrationTime = registrationTime;
     this.type = type;
     this.location = location;
     this.cargo = cargo;
-    this.carrierMovement = null;
-    this.carrierMovement = carrierMovement;
   }
 
   /**
    * @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. Legal values are LOAD and UNLOAD
+   * @param type             type of event
    * @param location         where the event took place
    */
-  public HandlingEvent(final Cargo cargo, final Date completionTime, final Date registrationTime, final Type type, final Location location) {
+  public HandlingEvent(Cargo cargo, Date completionTime, Date registrationTime, Type type, Location location) {
     Validate.noNullElements(new Object[] {cargo, completionTime, registrationTime, type, location});
     if (type.requiresCarrierMovement()) {
       throw new IllegalArgumentException("Carrier movement is required for event type " + type);
@@ -125,15 +126,15 @@ public final class HandlingEvent implements DomainEvent<HandlingEvent> {
     this.type = type;
     this.location = location;
     this.cargo = cargo;
-    this.carrierMovement = null;
+    this.voyage = null;
   }
 
   public Type type() {
     return this.type;
   }
 
-  public CarrierMovement carrierMovement() {
-    return DomainObjectUtils.nullSafe(this.carrierMovement, CarrierMovement.NONE);
+  public Voyage voyage() {
+    return DomainObjectUtils.nullSafe(this.voyage, Voyage.NONE);
   }
 
   public Date completionTime() {
@@ -165,7 +166,7 @@ public final class HandlingEvent implements DomainEvent<HandlingEvent> {
   public boolean sameEventAs(final HandlingEvent other) {
     return other != null && new EqualsBuilder().
       append(this.cargo, other.cargo).
-      append(this.carrierMovement, other.carrierMovement).
+      append(this.voyage, other.voyage).
       append(this.completionTime, other.completionTime).
       append(this.location, other.location).
       append(this.type, other.type).
@@ -176,7 +177,7 @@ public final class HandlingEvent implements DomainEvent<HandlingEvent> {
   public int hashCode() {
     return new HashCodeBuilder().
       append(cargo).
-      append(carrierMovement).
+      append(voyage).
       append(completionTime).
       append(location).
       append(type).

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

@@ -4,15 +4,15 @@ import org.apache.commons.lang.Validate;
 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.carrier.CarrierMovement;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementRepository;
+import se.citerus.dddsample.domain.model.carrier.Voyage;
+import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
+import se.citerus.dddsample.domain.model.carrier.VoyageRepository;
 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.UnknownCarrierMovementIdException;
+import se.citerus.dddsample.domain.service.UnknownCargoException;
 import se.citerus.dddsample.domain.service.UnknownLocationException;
-import se.citerus.dddsample.domain.service.UnknownTrackingIdException;
+import se.citerus.dddsample.domain.service.UnknownVoyageException;
 
 import java.util.Date;
 
@@ -22,69 +22,68 @@ import java.util.Date;
 public class HandlingEventFactory {
 
   private final CargoRepository cargoRepository;
-  private final CarrierMovementRepository carrierMovementRepository;
+  private final VoyageRepository voyageRepository;
   private final LocationRepository locationRepository;
 
-  public HandlingEventFactory(CargoRepository cargoRepository, CarrierMovementRepository carrierMovementRepository, LocationRepository locationRepository) {
+  public HandlingEventFactory(CargoRepository cargoRepository, VoyageRepository voyageRepository, LocationRepository locationRepository) {
     this.cargoRepository = cargoRepository;
-    this.carrierMovementRepository = carrierMovementRepository;
+    this.voyageRepository = voyageRepository;
     this.locationRepository = locationRepository;
   }
 
   /**
    * @param completionTime    when the event was completed, for example finished loading
    * @param trackingId        tracking id
-   * @param carrierMovementId carrier movement id, if applicable (may be null)
+   * @param voyageNumber      voyage number
    * @param unlocode          United Nations Location Code for the location of the event
    * @param type              type of event
-   * @throws UnknownCarrierMovementIdException
+   * @throws se.citerus.dddsample.domain.service.UnknownVoyageException
    *                                    if there's not carrier movement with this id
-   * @throws UnknownTrackingIdException if there's no cargo with this tracking id
+   * @throws se.citerus.dddsample.domain.service.UnknownCargoException if there's no cargo with this tracking id
    * @throws UnknownLocationException   if there's no location with this UN Locode
    * @return A handling event.
    */
-  public HandlingEvent createHandlingEvent(Date completionTime, TrackingId trackingId, CarrierMovementId carrierMovementId, UnLocode unlocode, HandlingEvent.Type type)
-    throws UnknownTrackingIdException, UnknownCarrierMovementIdException, UnknownLocationException {
+  public HandlingEvent createHandlingEvent(Date completionTime, TrackingId trackingId, VoyageNumber voyageNumber, UnLocode unlocode, HandlingEvent.Type type)
+    throws UnknownCargoException, UnknownVoyageException, UnknownLocationException {
 
-    // Carrier movement may be null for certain event types
+    // Voyage number may be null for certain event types
     Validate.noNullElements(new Object[]{completionTime, trackingId, unlocode, type});
 
-    final Cargo cargo = cargoRepository.find(trackingId);
-    if (cargo == null) throw new UnknownTrackingIdException(trackingId);
-
-    final CarrierMovement carrierMovement = findCarrierMovement(carrierMovementId);
-
+    final Cargo cargo = findCargo(trackingId);
+    final Voyage voyage = findVoyage(voyageNumber);
     final Location location = findLocation(unlocode);
+    
     if (location == null) throw new UnknownLocationException(unlocode);
 
     final Date registrationTime = new Date();
 
-    if (carrierMovement == null) {
+    if (voyage == null) {
       return new HandlingEvent(cargo, completionTime, registrationTime, type, location);   
     } else {
-      return new HandlingEvent(cargo, completionTime, registrationTime, type, location, carrierMovement);
+      return new HandlingEvent(cargo, completionTime, registrationTime, type, location, voyage);
     }
   }
 
-  private CarrierMovement findCarrierMovement(final CarrierMovementId carrierMovementId)
-    throws UnknownCarrierMovementIdException {
+  private Cargo findCargo(TrackingId trackingId) throws UnknownCargoException {
+    final Cargo cargo = cargoRepository.find(trackingId);
+    if (cargo == null) throw new UnknownCargoException(trackingId);
+    return cargo;
+  }
 
-    if (carrierMovementId == null) {
+  private Voyage findVoyage(VoyageNumber voyageNumber) throws UnknownVoyageException {
+    if (voyageNumber == null) {
       return null;
     }
-    final CarrierMovement carrierMovement = carrierMovementRepository.find(carrierMovementId);
-    if (carrierMovement == null) {
-      throw new UnknownCarrierMovementIdException(carrierMovementId);
+
+    final Voyage voyage = voyageRepository.find(voyageNumber);
+    if (voyage == null) {
+      throw new UnknownVoyageException(voyageNumber);
     }
 
-    return carrierMovement;
+    return voyage;
   }
-
+  
   private Location findLocation(final UnLocode unlocode) throws UnknownLocationException {
-    if (unlocode == null) {
-      return Location.UNKNOWN;
-    }
-
     final Location location = locationRepository.find(unlocode);
     if (location == null) {
       throw new UnknownLocationException(unlocode);

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

@@ -19,4 +19,10 @@ public interface DomainEventNotifier {
    * @param event handling event
    */
   void cargoWasHandled(HandlingEvent event);
+
+  //void cargoWasMisdirected(Cargo cargo);
+
+  //void cargoHasArrived(Cargo cargo);
+
+  //void scheduleWasChanged(Voyage voyage);
 }

dddsample/src/main/java/se/citerus/dddsample/domain/service/UnknownTrackingIdException.java → dddsample/src/main/java/se/citerus/dddsample/domain/service/UnknownCargoException.java

@@ -5,11 +5,11 @@ import se.citerus.dddsample.domain.model.cargo.TrackingId;
 /**
  * Thrown when trying to register an event with an unknown tracking id.
  */
-public final class UnknownTrackingIdException extends Exception {
+public final class UnknownCargoException extends Exception {
 
   private final TrackingId trackingId;
 
-  public UnknownTrackingIdException(final TrackingId trackingId) {
+  public UnknownCargoException(final TrackingId trackingId) {
     this.trackingId = trackingId;
   }
 

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

@@ -1,20 +0,0 @@
-package se.citerus.dddsample.domain.service;
-
-import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
-
-/**
- * Thrown when trying to register an event with an unknown carrier movement id.
- */
-public class UnknownCarrierMovementIdException extends Exception {
-
-  private final CarrierMovementId carrierMovementId;
-
-  public UnknownCarrierMovementIdException(final CarrierMovementId carrierMovementId) {
-    this.carrierMovementId = carrierMovementId;
-  }
-
-  @Override
-  public String getMessage() {
-    return "No carrier movement with id " + carrierMovementId.idString() + " exists in the system";
-  }
-}

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

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

dddsample/src/main/java/se/citerus/dddsample/domain/service/impl/TrackingServiceImpl.java

@@ -6,14 +6,17 @@ import org.apache.commons.logging.LogFactory;
 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.service.DomainEventNotifier;
 import se.citerus.dddsample.domain.service.TrackingService;
 
 public class TrackingServiceImpl implements TrackingService {
 
+  private final DomainEventNotifier domainEventNotifier;
   private final CargoRepository cargoRepository;
   private final Log logger = LogFactory.getLog(getClass());
 
-  public TrackingServiceImpl(CargoRepository cargoRepository) {
+  public TrackingServiceImpl(DomainEventNotifier domainEventNotifier, CargoRepository cargoRepository) {
+    this.domainEventNotifier = domainEventNotifier;
     this.cargoRepository = cargoRepository;
   }
 
@@ -38,27 +41,16 @@ public class TrackingServiceImpl implements TrackingService {
       return;
     }
 
-    cargo.updateState();
+    // TODO publish events here
 
-    // Using a listener pattern and registering handlers for different scenarios
-    // would be more in line with the open-close principle (?)
     if (cargo.isMisdirected()) {
-      handleMisdirectedCargo(cargo);
+      //domainEventNotifier.cargoWasMisdirected(cargo);
     }
 
     if (cargo.isUnloadedAtDestination()) {
-      notifyCustomerOfAvailability(cargo);
+      //domainEventNotifier.cargoHasArrived(cargo);
     }
-  }
-
-  private void notifyCustomerOfAvailability(Cargo cargo) {
-    logger.info("Cargo " + cargo.trackingId() + " has been unloaded " +
-                "at its final destination " + cargo.destination());
-  }
-
-  private void handleMisdirectedCargo(Cargo cargo) {
-    logger.info("Cargo " + cargo.trackingId() + " has been misdirected. " +
-                "Last event was " + cargo.deliveryHistory().lastEvent());
+    
   }
 
 }

dddsample/src/main/java/se/citerus/dddsample/ui/CargoTrackingViewAdapter.java

@@ -2,8 +2,8 @@ package se.citerus.dddsample.ui;
 
 import org.springframework.context.MessageSource;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.cargo.DeliveryHistory;
-import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
+import se.citerus.dddsample.domain.model.cargo.Delivery;
+import se.citerus.dddsample.domain.model.carrier.Voyage;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.domain.model.location.Location;
 
@@ -35,7 +35,7 @@ public final class CargoTrackingViewAdapter {
     this.locale = locale;
     this.cargo = cargo;
 
-    final List<HandlingEvent> handlingEvents = cargo.deliveryHistory().eventsOrderedByCompletionTime();
+    final List<HandlingEvent> handlingEvents = cargo.deliveryHistory().history();
     this.events = new ArrayList<HandlingEventViewAdapter>(handlingEvents.size());
     for (HandlingEvent handlingEvent : handlingEvents) {
       events.add(new HandlingEventViewAdapter(handlingEvent));
@@ -61,16 +61,16 @@ public final class CargoTrackingViewAdapter {
    * @return A translated string describing the cargo status. 
    */
   public String getStatusText() {
-    final DeliveryHistory deliveryHistory = cargo.deliveryHistory();
-    final String code = "cargo.status." + deliveryHistory.status().name();
+    final Delivery delivery = cargo.deliveryHistory();
+    final String code = "cargo.status." + delivery.status().name();
 
     final Object[] args;
-    switch (deliveryHistory.status()) {
+    switch (delivery.status()) {
       case IN_PORT:
-        args = new Object[] {getDisplayText(deliveryHistory.currentLocation())};
+        args = new Object[] {getDisplayText(delivery.currentLocation())};
         break;
       case ONBOARD_CARRIER:
-        args = new Object[] {deliveryHistory.currentCarrierMovement().carrierMovementId().idString()};
+        args = new Object[] {delivery.currentVoyage().voyageNumber().idString()};
         break;
       case CLAIMED:
       case NOT_RECEIVED:
@@ -150,11 +150,11 @@ public final class CargoTrackingViewAdapter {
     }
 
     /**
-     * @return Carrier movement id, or empty string if not applicable.
+     * @return Voyage number, or empty string if not applicable.
      */
-    public String getCarrierMovement() {
-      final CarrierMovement cm = handlingEvent.carrierMovement();
-      return cm.carrierMovementId().idString();
+    public String getVoyageNumber() {
+      final Voyage voyage = handlingEvent.voyage();
+      return voyage.voyageNumber().idString();
     }
 
     /**