Big slew of changes (too big) leading up to draft presentation:

Removed unneeded constructors in Cargo and UnLocode.

Fixed spelling error in StatusCode - "e before i except after c", or whatever that was :-)

Cascade Itinerary/Leg on Cargo persist.

Cargo registration and routing web administration interface.

Better randomization in RoutingServiceImpl.

Replaced more test locations with the SampleLocations instances.

dddsample/pom.xml

@@ -106,7 +106,7 @@
         <artifactId>maven-jetty-plugin</artifactId>
         <version>6.1.4</version>
         <configuration>
-          <!--scanIntervalSeconds>10</scanIntervalSeconds-->
+          <scanIntervalSeconds>3</scanIntervalSeconds>
         </configuration>
       </plugin>
 

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

@@ -1,7 +1,5 @@
 package se.citerus.dddsample.domain;
-                        
-import org.apache.commons.lang.builder.ReflectionToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
+
 import org.apache.commons.lang.Validate;
 
 import javax.persistence.*;
@@ -29,11 +27,9 @@ public class Cargo {
   @Transient
   private DeliveryHistory deliveryHistory = new DeliveryHistory();
 
-  @ManyToOne
+  @ManyToOne(cascade = CascadeType.ALL)
   private Itinerary itinerary;
 
-  //TODO Remove this constructor
-  //TODO Shouldn't origin and destination be implicitly derived from itinerary?
   public Cargo(TrackingId trackingId, Location origin, Location destination) {
     Validate.noNullElements(new Object[] {trackingId, origin, destination});
     this.trackingId = trackingId;
@@ -41,12 +37,6 @@ public class Cargo {
     this.destination = destination;
   }
 
-  public Cargo(TrackingId trackingId) {
-    Validate.notNull(trackingId);
-    this.trackingId = trackingId;
-  }
-
-
   /**
    * @return Tracking id.
    */

dddsample/src/main/java/se/citerus/dddsample/domain/DeliveryHistory.java

@@ -64,7 +64,7 @@ public class DeliveryHistory {
 
   public StatusCode status() {
     if (lastEvent() == null)
-      return StatusCode.NOT_RECIEVED;
+      return StatusCode.NOT_RECEIVED;
 
     HandlingEvent.Type type = lastEvent().type();
     if (type == HandlingEvent.Type.LOAD)

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

@@ -1,8 +1,8 @@
 package se.citerus.dddsample.domain;
 
+import org.apache.commons.lang.Validate;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.apache.commons.lang.Validate;
 
 import javax.persistence.*;
 import java.util.Comparator;

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

@@ -4,8 +4,8 @@ import org.apache.commons.lang.Validate;
 
 import javax.persistence.*;
 import java.util.Arrays;
-import java.util.List;
 import java.util.Collections;
+import java.util.List;
 
 /**
  *
@@ -17,7 +17,7 @@ public class Itinerary {
   @GeneratedValue
   private Long id;
 
-  @OneToMany
+  @OneToMany(cascade = CascadeType.ALL)
   @JoinColumn(name = "itinerary_id")
   private List<Leg> legs = Collections.emptyList();
 

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

@@ -23,7 +23,7 @@ public class Location {
    * Special Location object that marks an unknown location.
    */
   public static final Location UNKNOWN = new Location(
-     new UnLocode("XX", "XXX"), "Unknown location"
+     new UnLocode("XXXXX"), "Unknown location"
   );
 
   /**

dddsample/src/main/java/se/citerus/dddsample/domain/StatusCode.java

@@ -4,5 +4,5 @@ package se.citerus.dddsample.domain;
  * These are the different status codes for a cargo.
  */
 public enum StatusCode {
-    NOT_RECIEVED, IN_PORT, ONBOARD_CARRIER, CLAIMED
+  NOT_RECEIVED, IN_PORT, ONBOARD_CARRIER, CLAIMED
 }

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

@@ -5,7 +5,6 @@ import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 
 import javax.persistence.Embeddable;
-import java.util.Arrays;
 import java.util.regex.Pattern;
 
 /**
@@ -19,25 +18,15 @@ public class UnLocode {
 
   private String unlocode;
 
-  // Country code is exactly two letters
-  private static final Pattern countryCodePattern = Pattern.compile("[a-zA-Z]{2}");
-
+  // 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 locationCodePattern = Pattern.compile("[a-zA-Z2-9]{3}");
-
-  public UnLocode(String countryCode, String locationCode) {
-    validateArgs(countryCode, locationCode);
+  private static final Pattern validPattern = Pattern.compile("[a-zA-Z]{2}[a-zA-Z2-9]{3}");
 
-    this.unlocode = (countryCode + locationCode).toUpperCase();
-  }
+  public UnLocode(String countryAndLocation) {
+    Validate.notNull(countryAndLocation);
+    Validate.isTrue(validPattern.matcher(countryAndLocation).matches());
 
-  private void validateArgs(String countryCode, String locationCode) {
-    Validate.noNullElements(new Object[] {countryCode, locationCode},
-            "Neither country code nor location code may be null");
-    Validate.isTrue(countryCodePattern.matcher(countryCode).matches(),
-      "\"" + countryCode + "\" is not a valid country code");
-    Validate.isTrue(locationCodePattern.matcher(locationCode).matches(),
-      "\"" + locationCode + "\" is not a valid location code");
+    this.unlocode = countryAndLocation.toUpperCase();
   }
 
   /**

dddsample/src/main/java/se/citerus/dddsample/repository/CargoRepository.java

@@ -3,10 +3,14 @@ package se.citerus.dddsample.repository;
 import se.citerus.dddsample.domain.Cargo;
 import se.citerus.dddsample.domain.TrackingId;
 
+import java.util.List;
+
 public interface CargoRepository {
 
   Cargo find(TrackingId trackingId);
 
+  List<Cargo> findAll();
+
   void save(Cargo cargo);
 
   TrackingId nextTrackingId();

dddsample/src/main/java/se/citerus/dddsample/repository/CargoRepositoryHibernate.java

@@ -4,6 +4,7 @@ import org.springframework.stereotype.Repository;
 import se.citerus.dddsample.domain.Cargo;
 import se.citerus.dddsample.domain.TrackingId;
 
+import java.util.List;
 import java.util.UUID;
 
 /**
@@ -41,7 +42,14 @@ public class CargoRepositoryHibernate extends HibernateRepository implements Car
     // Could be an opportunity to maybe illustrate how to handle pessimistic locking
     // and aggregate boundaries, and maybe problems with a distributed application
     // sharing a database. For now it's simply random though.
-    return new TrackingId(UUID.randomUUID().toString());
+    String random = UUID.randomUUID().toString().toUpperCase();
+    return new TrackingId(
+      random.substring(0, random.indexOf("-"))
+    );
+  }
+
+  public List<Cargo> findAll() {
+    return getSession().createQuery("from Cargo").list();
   }
 
   public void setHandlingEventRepository(HandlingEventRepository handlingEventRepository) {

dddsample/src/main/java/se/citerus/dddsample/repository/CargoRepositoryInMem.java

@@ -5,6 +5,7 @@ import se.citerus.dddsample.domain.Cargo;
 import se.citerus.dddsample.domain.TrackingId;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
@@ -42,6 +43,10 @@ public class CargoRepositoryInMem implements CargoRepository {
     return new TrackingId(UUID.randomUUID().toString());
   }
 
+  public List<Cargo> findAll() {
+    return null;  //To change body of implemented methods use File | Settings | File Templates.
+  }
+
   /**
    * 
    * @throws Exception

dddsample/src/main/java/se/citerus/dddsample/service/CargoService.java

@@ -1,8 +1,12 @@
 package se.citerus.dddsample.service;
 
-import se.citerus.dddsample.domain.Location;
 import se.citerus.dddsample.domain.TrackingId;
+import se.citerus.dddsample.domain.UnLocode;
+import se.citerus.dddsample.service.dto.CargoRoutingDTO;
 import se.citerus.dddsample.service.dto.CargoTrackingDTO;
+import se.citerus.dddsample.service.dto.LegDTO;
+
+import java.util.List;
 
 /**
  * Cargo service.
@@ -17,7 +21,7 @@ public interface CargoService {
    * @param destination cargo destination
    * @return Cargo tracking id
    */
-  TrackingId registerNew(Location origin, Location destination);
+  TrackingId registerNew(UnLocode origin, UnLocode destination);
 
   /**
    * @param trackingId tracking id
@@ -26,6 +30,11 @@ public interface CargoService {
   CargoTrackingDTO track(TrackingId trackingId);
 
   /**
+   * @return A list of all locations where the company ships cargo to.
+   */
+  List<String> shippingLocations();
+
+  /**
    * Send relevant notifications to interested parties,
    * for example if a cargo has been misdirected, or unloaded
    * at the final destination.
@@ -33,4 +42,29 @@ public interface CargoService {
    * @param trackingId cargo tracking id
    */
   void notify(TrackingId trackingId);
+
+  /**
+   * Loads a cargo for routing operations.
+   *
+   * @param trackingId cargo tracking id
+   * @return A cargo with it's itinerary, or null if none found.
+   */
+  CargoRoutingDTO loadForRouting(TrackingId trackingId);
+
+  /**
+   * Loads all cargos for routing operations.
+   *
+   * @return All cargos with their itineraries.
+   */
+  List<CargoRoutingDTO> loadAllForRouting();
+
+  /**
+   * Assigns a new itinerary to a cargo,
+   * based on this list of legs.
+   *
+   * @param trackingId cargo tracking id
+   * @param legDTOs the legs of the route
+   */
+  void assignItinerary(TrackingId trackingId, List<LegDTO> legDTOs);
+
 }

dddsample/src/main/java/se/citerus/dddsample/service/CargoServiceImpl.java

@@ -6,32 +6,52 @@ import org.apache.commons.logging.LogFactory;
 import org.springframework.transaction.annotation.Transactional;
 import se.citerus.dddsample.domain.*;
 import se.citerus.dddsample.repository.CargoRepository;
+import se.citerus.dddsample.repository.LocationRepository;
+import se.citerus.dddsample.service.dto.CargoRoutingDTO;
 import se.citerus.dddsample.service.dto.CargoTrackingDTO;
 import se.citerus.dddsample.service.dto.HandlingEventDTO;
+import se.citerus.dddsample.service.dto.LegDTO;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class CargoServiceImpl implements CargoService {
 
   private CargoRepository cargoRepository;
+  private LocationRepository locationRepository;
   private static final Log logger = LogFactory.getLog(CargoServiceImpl.class);
 
   @Transactional(readOnly = false)
-  public TrackingId registerNew(Location origin, Location destination) {
-    Validate.notNull(origin);
-    Validate.notNull(destination);
+  public TrackingId registerNew(UnLocode originUnLocode, UnLocode destinationUnLocode) {
+    Validate.notNull(originUnLocode);
+    Validate.notNull(destinationUnLocode);
 
     TrackingId trackingId = cargoRepository.nextTrackingId();
-    Cargo cargo = new Cargo(trackingId, origin, destination);
-    cargoRepository.save(cargo);
+    Location origin = locationRepository.find(originUnLocode);
+    Location destination = locationRepository.find(destinationUnLocode);
+
+    Cargo cargo = new Cargo(trackingId,origin,destination);
 
+    cargoRepository.save(cargo);
     logger.info("Registered new cargo with tracking id " + trackingId.idString());
-    
+
     return trackingId;
   }
 
   @Transactional(readOnly = true)
+  public List<String> shippingLocations() {
+    List<Location> allLocations = locationRepository.findAll();
+    List<String> unlocodes = new ArrayList<String>(allLocations.size());
+    for (Location location : allLocations) {
+      unlocodes.add(location.unLocode().idString());
+    }
+    return unlocodes;
+  }
+
+  @Transactional(readOnly = true)
   public CargoTrackingDTO track(TrackingId trackingId) {
+    Validate.notNull(trackingId);
+
     final Cargo cargo = cargoRepository.find(trackingId);
     if (cargo == null) {
       return null;
@@ -39,6 +59,7 @@ public class CargoServiceImpl implements CargoService {
 
     DeliveryHistory deliveryHistory = cargo.deliveryHistory();
 
+    // TODO: use DTO assemblers
     Location currentLocation = deliveryHistory.currentLocation();
     CarrierMovement currentCarrierMovement = deliveryHistory.currentCarrierMovement();
     final CargoTrackingDTO dto = new CargoTrackingDTO(
@@ -70,7 +91,14 @@ public class CargoServiceImpl implements CargoService {
   // TODO: move this to another class?
   @Transactional(readOnly = true)
   public void notify(TrackingId trackingId) {
+    Validate.notNull(trackingId);
+
     Cargo cargo = cargoRepository.find(trackingId);
+    if (cargo == null) {
+      logger.warn("Can't notify listeners for non-existing cargo " + trackingId);
+      return;
+    }
+
     // TODO: more elaborate notifications, such as email to affected customer
     if (cargo.isMisdirected()) {
       logger.info("Cargo " + trackingId + " has been misdirected. " +
@@ -82,8 +110,84 @@ public class CargoServiceImpl implements CargoService {
     }
   }
 
+  @Transactional(readOnly = true)
+  public List<CargoRoutingDTO> loadAllForRouting() {
+    List<Cargo> allCargos = cargoRepository.findAll();
+
+    // TODO: use DTO assembler
+    List<CargoRoutingDTO> dtoList = new ArrayList<CargoRoutingDTO>(allCargos.size());
+    for (Cargo cargo : allCargos) {
+      CargoRoutingDTO dto = new CargoRoutingDTO(
+        cargo.trackingId().idString(),
+        cargo.origin().toString(),
+        cargo.finalDestination().toString()
+      );
+      for (Leg leg : cargo.itinerary().legs()) {
+        dto.addLeg(
+          leg.carrierMovementId().idString(),
+          leg.from().unLocode().idString(),
+          leg.to().unLocode().idString()
+        );
+      }
+      dtoList.add(dto);
+    }
+
+    return dtoList;
+  }
+
+  @Transactional(readOnly = true)
+  public CargoRoutingDTO loadForRouting(TrackingId trackingId) {
+    Validate.notNull(trackingId);
+    Cargo cargo = cargoRepository.find(trackingId);
+    if (cargo == null) {
+      return null;
+    }
+
+    // TODO: use DTO assembler
+    CargoRoutingDTO dto = new CargoRoutingDTO(
+      cargo.trackingId().idString(),
+      cargo.origin().toString(),
+      cargo.finalDestination().toString()
+    );
+    for (Leg leg : cargo.itinerary().legs()) {
+      dto.addLeg(
+        leg.carrierMovementId().idString(),
+        leg.from().toString(),
+        leg.to().toString()
+      );
+    }
+    return dto;
+  }
+
+  @Transactional(readOnly = false)
+  public void assignItinerary(TrackingId trackingId, List<LegDTO> legDTOs) {
+    Validate.notNull(trackingId);
+    Validate.notNull(legDTOs);
+
+    Cargo cargo = cargoRepository.find(trackingId);
+    if (cargo == null) {
+      throw new IllegalArgumentException("Can't assign itinerary to non-existing cargo " + trackingId);
+    }
+
+    List<Leg> legs = new ArrayList<Leg>(legDTOs.size());
+    for (LegDTO legDTO : legDTOs) {
+      legs.add(new Leg(
+        new CarrierMovementId(legDTO.getCarrierMovementId()),
+        locationRepository.find(new UnLocode(legDTO.getFrom())),
+        locationRepository.find(new UnLocode(legDTO.getTo())))
+      );
+    }
+
+    cargo.setItinerary(new Itinerary(legs));
+    cargoRepository.save(cargo);
+  }
+
+
   public void setCargoRepository(CargoRepository cargoRepository) {
     this.cargoRepository = cargoRepository;
   }
 
+  public void setLocationRepository(LocationRepository locationRepository) {
+    this.locationRepository = locationRepository;
+  }
 }

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

@@ -4,13 +4,13 @@ import se.citerus.dddsample.domain.Itinerary;
 import se.citerus.dddsample.domain.Specification;
 import se.citerus.dddsample.domain.TrackingId;
 
-import java.util.Set;
+import java.util.List;
 
 /**
  *  
  */
 public interface RoutingService {
 
-  Set<Itinerary> calculatePossibleRoutes(TrackingId trackingId, Specification specification);
+  List<Itinerary> calculatePossibleRoutes(TrackingId trackingId, Specification specification);
 
 }

dddsample/src/main/java/se/citerus/dddsample/service/RoutingServiceImpl.java

@@ -5,7 +5,10 @@ import se.citerus.dddsample.domain.*;
 import se.citerus.dddsample.repository.CargoRepository;
 import se.citerus.dddsample.repository.LocationRepository;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
 
 /**
  * Simple routing service implementation that randomly creates a number
@@ -17,36 +20,36 @@ public class RoutingServiceImpl implements RoutingService {
   LocationRepository locationRepository;
   CargoRepository cargoRepository;
 
+  Random random = new Random();
+
   @Transactional(readOnly = true)
-  public Set<Itinerary> calculatePossibleRoutes(TrackingId trackingId, Specification specification) {
+  public List<Itinerary> calculatePossibleRoutes(TrackingId trackingId, Specification specification) {
     Cargo cargo = cargoRepository.find(trackingId);
     if (cargo == null) {
-      return Collections.emptySet();
+      return Collections.emptyList();
     }
     List<Location> allLocations = locationRepository.findAll();
 
     allLocations.remove(cargo.origin());
     allLocations.remove(cargo.finalDestination());
 
-    // TODO: vary the number of locations and number of candidates randomly
-
-    int candidateCount = 3;
-    Set<Itinerary> candidates = new HashSet<Itinerary>(candidateCount);
+    int candidateCount = getRandomNumberOfCandidates();
+    List<Itinerary> candidates = new ArrayList<Itinerary>(candidateCount);
     for (int i = 0; i < candidateCount; i++) {
-      Collections.shuffle(allLocations);
+      allLocations = getRandomChunkOfLocations(allLocations);
       List<Leg> legs = new ArrayList<Leg>(allLocations.size() - 1);
 
       Location firstLegTo = allLocations.get(0);
-      legs.add(new Leg(new CarrierMovementId("CM000"), cargo.origin(), firstLegTo));
+      legs.add(new Leg(new CarrierMovementId("CAR_002"), cargo.origin(), firstLegTo));
 
       for (int j = 0; j < allLocations.size() - 1 ; j++) {
         legs.add(new Leg(
-          new CarrierMovementId("CM00" + j),
+          getRandomCarrierMovementId(),
           allLocations.get(j), allLocations.get(j + 1)));
       }
 
       Location lastLegFrom = allLocations.get(allLocations.size() - 1);
-      legs.add(new Leg(new CarrierMovementId("CM999"), lastLegFrom, cargo.finalDestination()));
+      legs.add(new Leg(getRandomCarrierMovementId(), lastLegFrom, cargo.finalDestination()));
 
       candidates.add(new Itinerary(legs));
     }
@@ -54,6 +57,21 @@ public class RoutingServiceImpl implements RoutingService {
     return candidates;
   }
 
+  private List<Location> getRandomChunkOfLocations(List<Location> allLocations) {
+    Collections.shuffle(allLocations);
+    int total = allLocations.size();
+    int chunk = total > 4 ? (total - 4) + random.nextInt(5) : total;
+    return allLocations.subList(0, chunk);
+  }
+
+  private int getRandomNumberOfCandidates() {
+    return 1 + random.nextInt(4);
+  }
+
+  private CarrierMovementId getRandomCarrierMovementId() {
+    return new CarrierMovementId("CM" + random.nextInt(1000));
+  }
+
   public void setLocationRepository(LocationRepository locationRepository) {
     this.locationRepository = locationRepository;
   }

dddsample/src/main/java/se/citerus/dddsample/service/dto/CargoRoutingDTO.java

@@ -0,0 +1,48 @@
+package se.citerus.dddsample.service.dto;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * DTO for registering and routing a cargo.
+ *
+ */
+public class CargoRoutingDTO {
+  String trackingId;
+  String origin;
+  String finalDestination;
+  List<LegDTO> legs;
+
+  public CargoRoutingDTO(String trackingId, String origin, String finalDestination) {
+    this.trackingId = trackingId;
+    this.origin = origin;
+    this.finalDestination = finalDestination;
+    this.legs = new ArrayList<LegDTO>();
+  }
+
+  public String getTrackingId() {
+    return trackingId;
+  }
+
+  public String getOrigin() {
+    return origin;
+  }
+
+  public String getFinalDestination() {
+    return finalDestination;
+  }
+
+  public void addLeg(String carrierMovementId, String from, String to) {
+    legs.add(new LegDTO(carrierMovementId, from, to));
+  }
+
+  public List<LegDTO> getLegs() {
+    return Collections.unmodifiableList(legs);
+  }
+
+  public boolean isRouted() {
+    return !legs.isEmpty();
+  }
+
+}

dddsample/src/main/java/se/citerus/dddsample/service/dto/LegDTO.java

@@ -0,0 +1,31 @@
+package se.citerus.dddsample.service.dto;
+
+/**
+ * DTO for a leg in an itinerary.
+ *
+ */
+public class LegDTO {
+
+  String carrierMovementId;
+  String from;
+  String to;
+
+  public LegDTO(String carrierMovementId, String from, String to) {
+    this.carrierMovementId = carrierMovementId;
+    this.from = from;
+    this.to = to;
+  }
+
+  public String getCarrierMovementId() {
+    return carrierMovementId;
+  }
+
+  public String getFrom() {
+    return from;
+  }
+
+  public String getTo() {
+    return to;
+  }
+
+}

dddsample/src/main/java/se/citerus/dddsample/web/CargoAdminController.java

@@ -0,0 +1,111 @@
+package se.citerus.dddsample.web;
+
+import org.springframework.web.servlet.mvc.multiaction.MultiActionController;
+import se.citerus.dddsample.domain.Itinerary;
+import se.citerus.dddsample.domain.Leg;
+import se.citerus.dddsample.domain.TrackingId;
+import se.citerus.dddsample.domain.UnLocode;
+import se.citerus.dddsample.service.CargoService;
+import se.citerus.dddsample.service.RoutingService;
+import se.citerus.dddsample.service.dto.LegDTO;
+import se.citerus.dddsample.web.command.RegistrationCommand;
+import se.citerus.dddsample.web.command.RoutingCommand;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Handles cargo routing and administration.
+ *
+ */
+public class CargoAdminController extends MultiActionController {
+
+  private CargoService cargoService;
+  private RoutingService routingService;
+
+  public Map registrationForm(HttpServletRequest request, HttpServletResponse response) throws Exception {
+    Map map = new HashMap();
+    map.put("unlocodes", cargoService.shippingLocations());
+    return map;
+  }
+
+  public void register(HttpServletRequest request, HttpServletResponse response, RegistrationCommand command) throws Exception {
+    TrackingId trackingId = cargoService.registerNew(
+      new UnLocode(command.getOriginUnlocode()),
+      new UnLocode(command.getDestinationUnlocode())
+    );
+    response.sendRedirect("show.html?trackingId=" + trackingId.idString());
+  }
+
+  public Map list(HttpServletRequest request, HttpServletResponse response) {
+    Map map = new HashMap();
+    map.put("cargoList", cargoService.loadAllForRouting());
+    return map;
+  }
+
+  public Map show(HttpServletRequest request, HttpServletResponse response) {
+    Map map = new HashMap();
+    String param = request.getParameter("trackingId");
+    TrackingId trackingId = new TrackingId(param);
+    map.put("cargo", cargoService.loadForRouting(trackingId));
+    return map;
+  }
+
+  public Map selectItinerary(HttpServletRequest request, HttpServletResponse response) {
+    Map map = new HashMap();
+    TrackingId trackingId = new TrackingId(request.getParameter("trackingId"));
+
+    // TODO: more consistent to return some sort of LegDTO map/list from service layer, not the Itinerary
+    List<Itinerary> itineraries = routingService.calculatePossibleRoutes(trackingId, null);
+
+    List<RoutingCommand.ItineraryCandidateCommand> itineraryCandidates = new ArrayList<RoutingCommand.ItineraryCandidateCommand>();
+
+    for (Itinerary itinerary : itineraries) {
+      RoutingCommand.ItineraryCandidateCommand itineraryCandidateCommand = new RoutingCommand.ItineraryCandidateCommand();
+      itineraryCandidateCommand.setTrackingId(trackingId.idString());
+      itineraryCandidates.add(itineraryCandidateCommand);
+      for (Leg leg : itinerary.legs()) {
+        RoutingCommand.LegCommand legCommand = new RoutingCommand.LegCommand();
+        legCommand.setCarrierMovementId(leg.carrierMovementId().idString());
+        legCommand.setFromUnlocode(leg.from().unLocode().idString());
+        legCommand.setToUnlocode(leg.to().unLocode().idString());
+        itineraryCandidateCommand.getLegs().add(legCommand);
+      }
+    }
+
+    map.put("itineraryCandidates", itineraryCandidates);
+    map.put("trackingId", trackingId.idString());
+    return map;
+  }
+
+  public void assignItinerary(HttpServletRequest request, HttpServletResponse response) throws Exception {
+    TrackingId trackingId = new TrackingId(request.getParameter("trackingId"));
+
+    // TODO:  gah, any attempt at a proper command object fails due to indexoutofbounds (legs[0].fromUnlocode etc)...fix
+    String[] cmIds = (String[]) request.getParameterMap().get("legs.carrierMovementId");
+    String[] fromUnlocodes = (String[]) request.getParameterMap().get("legs.fromUnlocode");
+    String[] toUnlocodes = (String[]) request.getParameterMap().get("legs.toUnlocode");
+
+    List<LegDTO> legDTOs = new ArrayList<LegDTO>(cmIds.length);
+    for (int i = 0; i < cmIds.length; i++) {
+      legDTOs.add(new LegDTO(cmIds[i], fromUnlocodes[i], toUnlocodes[i]));
+    }
+
+    cargoService.assignItinerary(trackingId, legDTOs);
+
+    response.sendRedirect("list.html");
+  }
+
+  public void setCargoService(CargoService cargoService) {
+    this.cargoService = cargoService;
+  }
+
+  public void setRoutingService(RoutingService routingService) {
+    this.routingService = routingService;
+  }
+
+}

dddsample/src/main/java/se/citerus/dddsample/web/command/RegistrationCommand.java

@@ -0,0 +1,26 @@
+package se.citerus.dddsample.web.command;
+
+/**
+ *
+ */
+public class RegistrationCommand {
+  private String originUnlocode;
+  private String destinationUnlocode;
+
+  public String getOriginUnlocode() {
+    return originUnlocode;
+  }
+
+  public void setOriginUnlocode(String originUnlocode) {
+    this.originUnlocode = originUnlocode;
+  }
+
+  public String getDestinationUnlocode() {
+    return destinationUnlocode;
+  }
+
+  public void setDestinationUnlocode(String destinationUnlocode) {
+    this.destinationUnlocode = destinationUnlocode;
+  }
+
+}

dddsample/src/main/java/se/citerus/dddsample/web/command/RoutingCommand.java

@@ -0,0 +1,67 @@
+package se.citerus.dddsample.web.command;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class RoutingCommand {
+  List<ItineraryCandidateCommand> itineraryCandidates = new ArrayList<ItineraryCandidateCommand>();
+
+  public List<ItineraryCandidateCommand> getItineraryCandidates() {
+    return itineraryCandidates;
+  }
+
+  public void setItineraryCandidates(List<ItineraryCandidateCommand> itineraryCandidates) {
+    this.itineraryCandidates = itineraryCandidates;
+  }
+
+  public static class ItineraryCandidateCommand {
+    String trackingId;
+    List<LegCommand> legs = new ArrayList<LegCommand>();
+
+    public String getTrackingId() {
+      return trackingId;
+    }
+
+    public void setTrackingId(String trackingId) {
+      this.trackingId = trackingId;
+    }
+
+    public List<LegCommand> getLegs() {
+      return legs;
+    }
+
+    public void setLegs(List<LegCommand> legs) {
+      this.legs = legs;
+    }
+  }
+
+  public static class LegCommand {
+    String carrierMovementId;
+    String fromUnlocode;
+    String toUnlocode;
+
+    public String getCarrierMovementId() {
+      return carrierMovementId;
+    }
+
+    public void setCarrierMovementId(String carrierMovementId) {
+      this.carrierMovementId = carrierMovementId;
+    }
+
+    public String getFromUnlocode() {
+      return fromUnlocode;
+    }
+
+    public void setFromUnlocode(String fromUnlocode) {
+      this.fromUnlocode = fromUnlocode;
+    }
+
+    public String getToUnlocode() {
+      return toUnlocode;
+    }
+
+    public void setToUnlocode(String toUnlocode) {
+      this.toUnlocode = toUnlocode;
+    }
+  }
+}

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

@@ -37,7 +37,7 @@ public class HandlingEventServiceEndpointImpl implements HandlingEventServiceEnd
       }
       HandlingEvent.Type type = parseEventType(eventType);
 
-      UnLocode ul = new UnLocode(unlocode.substring(0,2), unlocode.substring(2,5));
+      UnLocode ul = new UnLocode(unlocode);
 
       handlingEventService.register(date, tid, cid, ul, type);
     } catch (ParseException pe) {

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

@@ -15,6 +15,7 @@
 
   <bean id="cargoService" class="se.citerus.dddsample.service.CargoServiceImpl">
     <property name="cargoRepository" ref="cargoRepository"/>
+    <property name="locationRepository" ref="locationRepository"/>
   </bean>
 
   <bean id="handlingEventService" class="se.citerus.dddsample.service.HandlingEventServiceImpl">

dddsample/src/main/webapp/WEB-INF/decorators.xml

@@ -1,5 +1,8 @@
 <decorators defaultdir="/WEB-INF/jsp">
     <decorator name="main" page="decorator.jsp">
-          <pattern>*.html</pattern>
+          <pattern>/cargo/*.html</pattern>
     </decorator>
+  <decorator name="admin" page="adminDecorator.jsp">
+        <pattern>/admin/*.html</pattern>
+  </decorator>
 </decorators>

dddsample/src/main/webapp/WEB-INF/dispatch-servlet.xml

@@ -14,4 +14,9 @@
 
   <bean id="trackCommandValidator" class="se.citerus.dddsample.web.command.TrackCommandValidator"/>
 
+  <bean name="/admin/*" class="se.citerus.dddsample.web.CargoAdminController">
+    <property name="cargoService" ref="cargoService"/>
+    <property name="routingService" ref="routingService"/>
+  </bean>
+
 </beans>

dddsample/src/main/webapp/WEB-INF/jsp/admin/list.jsp

@@ -0,0 +1,33 @@
+<html>
+<head>
+  <title>Cargo Administration</title>
+</head>
+<body>
+  <table>
+    <caption>All cargos</caption>
+    <thead>
+      <tr>
+        <td>Tracking ID</td>
+        <td>Origin</td>
+        <td>Destination</td>
+        <td>Routed</td>
+      </tr>
+    </thead>
+    <tbody>
+      <c:forEach items="${cargoList}" var="cargo">
+      <tr>
+        <td>
+          <c:url value="/admin/show.html" var="showUrl">
+            <c:param name="trackingId" value="${cargo.trackingId}"/>
+          </c:url>
+          <a href="${showUrl}">${cargo.trackingId}</a>
+        </td>
+        <td>${cargo.origin}</td>
+        <td>${cargo.finalDestination}</td>
+        <td>${cargo.routed ? "Yes" : "No"}</td>
+      </tr>  
+      </c:forEach>
+    </tbody>
+  </table>
+</body>
+</html>

dddsample/src/main/webapp/WEB-INF/jsp/admin/registrationForm.jsp

@@ -0,0 +1,49 @@
+<html>
+<head>
+  <title>Cargo Administration</title>
+  <style type="text/css">
+    td {
+      align: left;
+    }
+  </style>
+</head>
+<body>
+<div id="container">
+  <form action="<c:url value="/admin/register.html"/>" method="post">
+  <table>
+    <caption>Register cargo</caption>
+    <tbody>
+      <tr>
+        <td>Origin</td>
+        <td>
+          <select name="originUnlocode">
+            <c:forEach items="${unlocodes}" var="u">
+            <option value="${u}">${u}</option>
+            </c:forEach>
+          </select>
+        </td>
+      </tr>
+      <tr>
+        <td>Final destination</td>
+        <td>
+          <select name="destinationUnlocode">
+            <c:forEach items="${unlocodes}" var="u">
+            <option value="${u}">${u}</option>
+            </c:forEach>
+          </select>
+        </td>
+      </tr>
+    </tbody>
+    <tfoot>
+      <tr>
+        <td> </td>
+        <td>
+          <input type="submit" value="Register"/>
+        </td>
+      </tr>
+    </tfoot>
+  </table>
+  </form>
+</div>
+</body>
+</html>

dddsample/src/main/webapp/WEB-INF/jsp/admin/selectItinerary.jsp

@@ -0,0 +1,49 @@
+<html>
+<head>
+  <title>Cargo Administration</title>
+</head>
+<body>
+<div id="container">
+  <h1>Select itinerary</h1>
+  <c:url value="/admin/assignItinerary.html" var="postUrl"/>
+
+  <c:forEach items="${itineraryCandidates}" var="it" varStatus="itStatus">
+      <form action="${postUrl}" method="post">
+        <input type="hidden" name="trackingId" value="${trackingId}"/>
+        <table>
+          <caption>Itinerary ${status.index + 1}</caption>
+          <thead>
+            <tr>
+              <td>Carrier</td>
+              <td>From</td>
+              <td>To</td>
+            </tr>
+          </thead>
+          <tbody>
+            <c:forEach items="${it.legs}" var="leg" varStatus="legStatus">
+              <input type="hidden" name="legs.carrierMovementId" value="${leg.carrierMovementId}"/>
+              <input type="hidden" name="legs.fromUnlocode" value="${leg.fromUnlocode}"/>
+              <input type="hidden" name="legs.toUnlocode" value="${leg.toUnlocode}"/>
+              <tr>
+                <td>${leg.carrierMovementId}</td>
+                <td>${leg.fromUnlocode}</td>
+                <td>${leg.toUnlocode}</td>
+              </tr>
+            </c:forEach>
+          </tbody>
+          <tfoot>
+            <tr>
+              <td colspan="3">
+                <p>
+                  <input type="submit" value="Select"/>
+                </p>
+              </td>
+            </tr>
+          </tfoot>
+        </table>
+      </form>
+  </c:forEach>
+
+</div>
+</body>
+</html>

dddsample/src/main/webapp/WEB-INF/jsp/admin/show.jsp

@@ -0,0 +1,53 @@
+<html>
+<head>
+  <title>Cargo Administration</title>
+</head>
+<body>
+<div id="container">
+  <table>
+    <caption>Details for cargo ${cargo.trackingId}</caption>
+    <tbody>
+      <tr>
+        <td>Origin</td>
+        <td>${cargo.origin}</td>
+      </tr>
+      <tr>
+        <td>Final destination</td>
+        <td>${cargo.finalDestination}</td>
+      </tr>
+    </tbody>
+  </table>
+  <c:choose>
+    <c:when test="${cargo.routed}">
+      <table>
+        <caption>Itinerary</caption>
+        <thead>
+          <tr>
+            <td>Carrier</td>
+            <td>From</td>
+            <td>To</td>
+          </tr>
+        </thead>
+        <tbody>
+          <c:forEach items="${cargo.legs}" var="leg">
+            <tr>
+              <td>${leg.carrierMovementId}</td>
+              <td>${leg.from}</td>
+              <td>${leg.to}</td>
+            </tr>
+          </c:forEach>
+        </tbody>
+      </table>
+    </c:when>
+    <c:otherwise>
+      <p>
+        <c:url value="/admin/selectItinerary.html" var="selectUrl">
+          <c:param name="trackingId" value="${cargo.trackingId}"/>
+        </c:url>
+        Not routed - <a href="${selectUrl}">Route this cargo</a>
+      </p>
+    </c:otherwise>
+  </c:choose>
+</div>
+</body>
+</html>

dddsample/src/main/webapp/WEB-INF/jsp/adminDecorator.jsp

@@ -0,0 +1,33 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
+  <title><decorator:title/></title>
+  <script type="text/javascript" charset="UTF-8"></script>
+  <style type="text/css" title="style" media="screen">
+    @import "${rc.contextPath}/admin.css";
+  </style>
+  <decorator:head/>
+</head>
+<body>
+  <div id="outer">
+    <h1>Cargo administration</h1>
+    <ul id="menu">
+      <li>
+        <a href="${rc.contextPath}/admin/list.html">
+          List all cargos
+        </a>
+      </li>
+      <li>
+        <a href="${rc.contextPath}/admin/registrationForm.html">
+          Register cargo
+        </a>
+      </li>
+    </ul>
+    <div id="body">
+      <decorator:body/>
+    </div>
+  </div>
+</body>
+</html>

dddsample/src/main/webapp/WEB-INF/jsp/cargo/track.jsp

@@ -4,23 +4,27 @@
 </head>
 <body>
 <div id="container">
+  <h1>Track Your Cargo</h1>
   <div id="search">
-  <h1>Search for Your Cargo</h1>
   <form:form method="post" commandName="trackCommand">
-    <table cellspacing="0" cellpadding="4">
+    <table>
       <tr>
-        <td align="right">
+        <td>
           Enter tracking id:
         </td>
         <td>
           <form:input path="trackingId" id="idInput"/>
         </td>
         <td>
-          <form:errors path="trackingId" cssClass="error"/>
+          <input type="submit" value="Track!">
         </td>
+      </tr>
+      <tr>
+        <td></td>
         <td>
-          <input type="submit" value="Track!">
+          <form:errors path="trackingId" cssClass="error"/>
         </td>
+        <td></td>
       </tr>
     </table>
   </form:form>

dddsample/src/main/webapp/WEB-INF/jsp/decorator.jsp

@@ -11,12 +11,16 @@
   <decorator:head/>
 </head>
 <body>
-  <div id="apptitle">
-    <h1>Domain Driven Delivery</h1>
+  <div id="outer">
+    <div id="apptitle">
+      <img src="${rc.contextPath}/images/dddsample_logotype.png" alt="Domain Driven Delivery"/>
+    </div>
+    <div id="body">
+      <decorator:body/>
+    </div>
+    <div id="footer">
+      This application is written by <a href="http://www.citerus.se" target="_blank">Citerus</a>
+      and <a href="http://www.domainlanguage.com" target="_blank">Domain Language</a></div>
   </div>
-  <div id="body">
-    <decorator:body/>
-  </div>
-  <div id="footer">Written by Citerus and Domain Language</div>
 </body>
 </html>

dddsample/src/main/webapp/admin.css

@@ -0,0 +1,33 @@
+html,body {
+  height: 100%;
+}
+
+body {
+  font: Arial, sans-serif; 
+  color: black;
+  padding: 10px;
+}
+
+ul#menu {
+}
+
+ul#menu li {
+  margin: 5px;
+  display: inline;
+}
+
+table {
+}
+
+table td {
+  padding: 4px 10px;
+}
+
+table thead {
+  font-weight: bold;
+}
+
+table caption {
+  text-align: left;
+  font-weight: bold;
+}

dddsample/src/main/webapp/style.css

@@ -1,24 +1,15 @@
-
-/*********************************************************
-   HTML Elements
- *********************************************************/
-
-html,
-body {
+html,body {
   height: 100%;
 }
 
 body {
-  margin-left: 150px;
-  margin-right: 150px;
-  padding: 0;
+  margin: auto;
   font: 400 0.7em verdana, arial, sans-serif;
   line-height: 170%;
-  
   color: #555;
+  background-color: orange;
 }
 
-
 /* Headers */
 h1, h2, h3, h4, h5, h6 {
   margin: 0 0 10px 0;
@@ -31,7 +22,6 @@ h1 {
 
   font: 400 1.6em arial, sans-serif;
   color: #536C71;
-  border-bottom: 6px solid #ddd;
 }
 
 h2 {
@@ -57,11 +47,11 @@ h5 {
 /* Links */
 a {
   text-decoration: none;
-  color: #3B5D77;
+  color: blue;
 }
 
 a:hover {
-  color: #668FA3;
+  color: darkblue;
 }
 
 a img {
@@ -181,41 +171,77 @@ input.radio {
   border: 0px;
 }
 
+table {
+  width: 100%;
+}
 
+table caption {
+  font-weight: bold;
+  text-align: left;
+  margin: 5px 0;
+}
 
 
 /**************************************************************
    Custom div and span
  **************************************************************/
-#apptitle h1{
-  font-size: 1.6em;
-  margin-left: 200px;
-  margin-bottom: 10px;
-  border-bottom: 0px
-  
+
+div#outer {
+  margin: auto;
+  padding: 0 20px;
+  width: 600px;
+  height: 100%;
+  text-align: center;
+  background-color: white;
+  border-left: 5px dashed orange;
+  border-right: 5px dashed orange;
+}
+
+
+#apptitle {
+  padding-top: 20px;
+  padding-bottom: 10px;
+  margin-bottom: 20px;
+  border-bottom: 2px solid #555;
+}
+
+#footer {
+  border-top: 2px solid #555;
+  margin-top: 30px;
+  padding-top: 10px;
+  background-color: white;
 }
 
 #container {
   text-align: left;
-  width: 500px;
+  background-color: white;
 }
 
 #search {
   font-size: 1.0em;
-  border-bottom: 6px solid #ddd;
+  padding: 10px 0;
+  text-align: center;
+}
+
+#search table {
+  width: 320px;
+  margin: 0 auto;
+}
+
+#search td {
+  white-space: nowrap;
 }
 
 #result {
   font-size: 1.0em;
-  border-bottom: 6px solid #ddd;
 }
 
-#result thead{
+#result thead {
   font-size: 1.2em;
   font-weight: bold;	
 }
 
-#result tr{
+#result tr {
   line-height: 120%;
 }
 

dddsample/src/test/java/se/citerus/dddsample/domain/CargoTest.java

@@ -1,6 +1,7 @@
 package se.citerus.dddsample.domain;
 
 import junit.framework.TestCase;
+import static se.citerus.dddsample.domain.SampleLocations.*;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -9,8 +10,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Date;
 
-import static se.citerus.dddsample.domain.SampleLocations.*;
-
 public class CargoTest extends TestCase {
 
   // TODO:
@@ -103,6 +102,28 @@ public class CargoTest extends TestCase {
     assertTrue(cargo.isUnloadedAtDestination());
   }
 
+  /* TODO implement nextExpectedEvent
+  public void testNextExpectedEvent() {
+    Cargo cargo = setUpCargoWithItinerary(HANGZOU, TOKYO, NEWYORK);
+    CarrierMovementId cmid = new CarrierMovementId("CM1");
+    CarrierMovement cm1 = new CarrierMovement(cmid, HANGZOU, TOKYO);
+    CarrierMovement cm2 = new CarrierMovement(cmid, TOKYO, NEWYORK);
+
+    HandlingEvent event1 = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.RECEIVE, HANGZOU, null);
+
+    assertEquals(event1, cargo.nextExpectedEvent());
+
+    cargo.deliveryHistory().addEvent(event1);
+
+    HandlingEvent event2 = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.LOAD, HANGZOU, cm1);
+
+    assertEquals(event2, cargo.nextExpectedEvent());
+
+    cargo.deliveryHistory().addEvent(event2);
+  }
+  */
+
+
   // TODO: Generate test data some better way
   private Cargo populateCargoReceivedStockholm() throws Exception {
     final Cargo cargo = new Cargo(new TrackingId("XYZ"), STOCKHOLM, MELBOURNE);
@@ -204,9 +225,8 @@ public class CargoTest extends TestCase {
   }
 
   public void testIsMisdirected() throws Exception {
-
     //A cargo with no itinerary is not misdirected
-    Cargo cargo = new Cargo(new TrackingId("TRKID"));
+    Cargo cargo = new Cargo(new TrackingId("TRKID"), SHANGHAI, GOTHENBURG);
     assertFalse(cargo.isMisdirected());
 
     cargo = setUpCargoWithItinerary(SHANGHAI, ROTTERDAM, GOTHENBURG);
@@ -267,12 +287,7 @@ public class CargoTest extends TestCase {
   }
 
   private Cargo setUpCargoWithItinerary(Location origin, Location midpoint, Location destination) {
-    Cargo cargo = new Cargo(new TrackingId("CARGO1")); //Immutable things go into the constructor
-
-    //Mutable things in setters
-    cargo.setOrigin(origin);
-    cargo.setDestination(destination);
-
+    Cargo cargo = new Cargo(new TrackingId("CARGO1"), origin, destination);
 
     Itinerary itinerary = new Itinerary(
        new Leg(new CarrierMovementId("ABC"), origin, midpoint),

dddsample/src/test/java/se/citerus/dddsample/domain/CarrierMovementTest.java

@@ -1,12 +1,11 @@
 package se.citerus.dddsample.domain;
 
 import junit.framework.TestCase;
+import static se.citerus.dddsample.domain.SampleLocations.HAMBURG;
+import static se.citerus.dddsample.domain.SampleLocations.STOCKHOLM;
 
 public class CarrierMovementTest extends TestCase {
 
-  Location stockholm = new Location(new UnLocode("SE", "STO"), "Stockholm");
-  Location hamburg = new Location(new UnLocode("DE", "HAM"), "Hamburg");
-
   public void testConstructor() throws Exception {
     CarrierMovementId id = new CarrierMovementId("CAR001");
 
@@ -21,12 +20,12 @@ public class CarrierMovementTest extends TestCase {
     } catch (IllegalArgumentException expected) {}
 
     try {
-      new CarrierMovement(id, stockholm, null);
+      new CarrierMovement(id, STOCKHOLM, null);
       fail("Should not accept null constructor arguments");
     } catch (IllegalArgumentException expected) {}
 
     // Legal
-    new CarrierMovement(id, stockholm, hamburg);
+    new CarrierMovement(id, STOCKHOLM, HAMBURG);
   }
 
   public void testSameValueAsEqualsHashCode() throws Exception {
@@ -34,10 +33,10 @@ public class CarrierMovementTest extends TestCase {
     CarrierMovementId id2a = new CarrierMovementId("CAR2");
     CarrierMovementId id2b = new CarrierMovementId("CAR2");
 
-    CarrierMovement cm1 = new CarrierMovement(id1, stockholm, hamburg);
-    CarrierMovement cm2 = new CarrierMovement(id1, stockholm, hamburg);
-    CarrierMovement cm3 = new CarrierMovement(id2a, hamburg, stockholm);
-    CarrierMovement cm4 = new CarrierMovement(id2b, hamburg, stockholm);
+    CarrierMovement cm1 = new CarrierMovement(id1, STOCKHOLM, HAMBURG);
+    CarrierMovement cm2 = new CarrierMovement(id1, STOCKHOLM, HAMBURG);
+    CarrierMovement cm3 = new CarrierMovement(id2a, HAMBURG, STOCKHOLM);
+    CarrierMovement cm4 = new CarrierMovement(id2b, HAMBURG, STOCKHOLM);
 
     assertTrue(cm1.sameIdentityAs(cm2));
     assertFalse(cm2.sameIdentityAs(cm3));

dddsample/src/test/java/se/citerus/dddsample/domain/DeliveryHistoryTest.java

@@ -36,7 +36,7 @@ public class DeliveryHistoryTest extends TestCase {
   public void testCargoStatusFromLastHandlingEvent() {
     DeliveryHistory deliveryHistory = new DeliveryHistory();
 
-    assertEquals(StatusCode.NOT_RECIEVED, deliveryHistory.status());
+    assertEquals(StatusCode.NOT_RECEIVED, deliveryHistory.status());
 
     deliveryHistory.addEvent(new HandlingEvent(cargo, new Date(10), new Date(11), HandlingEvent.Type.RECEIVE, HAMBURG, null));
     assertEquals(StatusCode.IN_PORT, deliveryHistory.status());

dddsample/src/test/java/se/citerus/dddsample/domain/HandlingEventTest.java

@@ -3,30 +3,30 @@ package se.citerus.dddsample.domain;
 import junit.framework.TestCase;
 import se.citerus.dddsample.domain.HandlingEvent.Type;
 import static se.citerus.dddsample.domain.HandlingEvent.Type.*;
+import static se.citerus.dddsample.domain.SampleLocations.HONGKONG;
+import static se.citerus.dddsample.domain.SampleLocations.NEWYORK;
 
 import static java.util.Arrays.asList;
 import java.util.Date;
 
 public class HandlingEventTest extends TestCase {
-  private final Location origin = new Location(new UnLocode("FR","OMX"), "From");
-  private final Location finalDestination = new Location(new UnLocode("TO","YYY"), "To");
-  private final Location a5 = new Location(new UnLocode("AA","AAA"), "AAAAA");
-  private final Location b5 = new Location(new UnLocode("BB","BBB"), "BBBBB");
-  private final Cargo cargo = new Cargo(new TrackingId("XYZ"), origin, finalDestination);
+  private final Location a5 = new Location(new UnLocode("AAAAA"), "AAAAA");
+  private final Location b5 = new Location(new UnLocode("BBBBB"), "BBBBB");
+  private final Cargo cargo = new Cargo(new TrackingId("XYZ"), HONGKONG, NEWYORK);
 
   public void testNewWithCarrierMovement() throws Exception {
-    CarrierMovement carrierMovement = new CarrierMovement(new CarrierMovementId("C01"), origin, finalDestination);
+    CarrierMovement carrierMovement = new CarrierMovement(new CarrierMovementId("C01"), HONGKONG, NEWYORK);
 
-    HandlingEvent e1 = new HandlingEvent(cargo, new Date(), new Date(), LOAD, origin, carrierMovement);
-    assertEquals(origin, e1.location());
+    HandlingEvent e1 = new HandlingEvent(cargo, new Date(), new Date(), LOAD, HONGKONG, carrierMovement);
+    assertEquals(HONGKONG, e1.location());
 
-    HandlingEvent e2 = new HandlingEvent(cargo, new Date(), new Date(), UNLOAD, finalDestination, carrierMovement);
-    assertEquals(finalDestination, e2.location());
+    HandlingEvent e2 = new HandlingEvent(cargo, new Date(), new Date(), UNLOAD, NEWYORK, carrierMovement);
+    assertEquals(NEWYORK, e2.location());
 
       // These event types prohibit a carrier movement association
     for (Type type : asList(CLAIM, RECEIVE, CUSTOMS)) {
       try {
-        new HandlingEvent(cargo, new Date(), new Date(), type, origin, carrierMovement);
+        new HandlingEvent(cargo, new Date(), new Date(), type, HONGKONG, carrierMovement);
         fail("Handling event type " + type + " prohibits carrier movement");
       } catch (IllegalArgumentException expected) {}
     }
@@ -34,14 +34,14 @@ public class HandlingEventTest extends TestCase {
       // These event types requires a carrier movement association
     for (Type type : asList(LOAD, UNLOAD)) {
         try {
-          new HandlingEvent(cargo, new Date(), new Date(), type, origin, null);
+          new HandlingEvent(cargo, new Date(), new Date(), type, HONGKONG, null);
             fail("Handling event type " + type + " requires carrier movement");
         } catch (IllegalArgumentException expected) {}
     }
   }
 
   public void testNewWithLocation() throws Exception {
-    Location location = new Location(new UnLocode("FO","OOO"), "Foo");
+    Location location = new Location(new UnLocode("FOOOO"), "Foo");
     HandlingEvent e1 = new HandlingEvent(cargo, new Date(), new Date(), Type.CLAIM, location, null);
     assertEquals(location, e1.location());
   }

dddsample/src/test/java/se/citerus/dddsample/domain/ItineraryTest.java

@@ -1,73 +1,63 @@
 package se.citerus.dddsample.domain;
 
 import junit.framework.TestCase;
+import static se.citerus.dddsample.domain.SampleLocations.*;
 
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
 public class ItineraryTest extends TestCase {
-  private final Location shanghai = new Location(new UnLocode("CN", "SHA"), "Shanghai");
-  private final Location rotterdam = new Location(new UnLocode("NL", "RTM"), "Rotterdam");
-  private final Location goteborg = new Location(new UnLocode("SE", "GOT"), "Goteborg");
-  private final Location hangzhou = new Location(new UnLocode("CN", "HGH"), "Hangzhou");
-  private final Location nyc = new Location(new UnLocode("US", "NYC"), "New York");
-  private final Location longBeach = new Location(new UnLocode("US", "LGB"), "Long Beach");
-  private final CarrierMovement abc = new CarrierMovement(new CarrierMovementId("ABC"), shanghai, rotterdam);
-  private final CarrierMovement def = new CarrierMovement(new CarrierMovementId("DEF"), rotterdam, goteborg);
-  private final CarrierMovement ghi = new CarrierMovement(new CarrierMovementId("GHI"), rotterdam, nyc);
-  private final CarrierMovement jkl = new CarrierMovement(new CarrierMovementId("JKL"), shanghai, longBeach);
+  private final CarrierMovement abc = new CarrierMovement(new CarrierMovementId("ABC"), SHANGHAI, ROTTERDAM);
+  private final CarrierMovement def = new CarrierMovement(new CarrierMovementId("DEF"), ROTTERDAM, GOTHENBURG);
+  private final CarrierMovement ghi = new CarrierMovement(new CarrierMovementId("GHI"), ROTTERDAM, NEWYORK);
+  private final CarrierMovement jkl = new CarrierMovement(new CarrierMovementId("JKL"), SHANGHAI, HELSINKI);
 
   public void testCargoOnTrack() throws Exception {
 
-    Cargo cargo = new Cargo(new TrackingId("CARGO1")); //Immutable things go into the constructor
-
-    //Mutable things in setters
-    cargo.setOrigin(shanghai);
-    cargo.setDestination(goteborg);
-
+    Cargo cargo = new Cargo(new TrackingId("CARGO1"), SHANGHAI, GOTHENBURG);
 
     Itinerary itinerary = new Itinerary(
-       new Leg(new CarrierMovementId("ABC"), shanghai, rotterdam),
-       new Leg(new CarrierMovementId("DEF"), rotterdam, goteborg)
+       new Leg(new CarrierMovementId("ABC"), SHANGHAI, ROTTERDAM),
+       new Leg(new CarrierMovementId("DEF"), ROTTERDAM, GOTHENBURG)
     );
 
     //Happy path
-    HandlingEvent event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.RECEIVE, shanghai,null);
+    HandlingEvent event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.RECEIVE, SHANGHAI,null);
     assertTrue(itinerary.isExpected(event));
 
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.LOAD, shanghai, abc);
+    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.LOAD, SHANGHAI, abc);
     assertTrue(itinerary.isExpected(event));
 
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.UNLOAD, rotterdam, abc);
+    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.UNLOAD, ROTTERDAM, abc);
     assertTrue(itinerary.isExpected(event));
 
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.LOAD, rotterdam, def);
+    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.LOAD, ROTTERDAM, def);
     assertTrue(itinerary.isExpected(event));
 
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.UNLOAD, goteborg, def);
+    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.UNLOAD, GOTHENBURG, def);
     assertTrue(itinerary.isExpected(event));
 
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.CLAIM, goteborg, null);
+    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.CLAIM, GOTHENBURG, null);
     assertTrue(itinerary.isExpected(event));
 
     //Customs event changes nothing
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.CUSTOMS, goteborg, null);
+    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.CUSTOMS, GOTHENBURG, null);
     assertTrue(itinerary.isExpected(event));
 
     //Received at the wrong location
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.RECEIVE, hangzhou, null);
+    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.RECEIVE, HANGZOU, null);
     assertFalse(itinerary.isExpected(event));
 
     //Loaded to onto the wrong ship, correct location
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.LOAD, rotterdam, ghi);
+    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.LOAD, ROTTERDAM, ghi);
     assertFalse(itinerary.isExpected(event));
 
     //Unloaded from the wrong ship in the wrong location
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.UNLOAD, longBeach, jkl);
+    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.UNLOAD, HELSINKI, jkl);
     assertFalse(itinerary.isExpected(event));
 
-    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.CLAIM, rotterdam, null);
+    event = new HandlingEvent(cargo, new Date(), new Date(), HandlingEvent.Type.CLAIM, ROTTERDAM, null);
     assertFalse(itinerary.isExpected(event));
 
   }

dddsample/src/test/java/se/citerus/dddsample/domain/LocationTest.java

@@ -6,15 +6,15 @@ public class LocationTest extends TestCase {
 
   public void testEquals() {
     // Same UN locode - equal
-    assertTrue(new Location(new UnLocode("AT","EST"),"test-name").
-        equals(new Location(new UnLocode("AT","EST"),"test-name")));
+    assertTrue(new Location(new UnLocode("ATEST"),"test-name").
+        equals(new Location(new UnLocode("ATEST"),"test-name")));
 
     // Different UN locodes - not equal
-    assertFalse(new Location(new UnLocode("AT","EST"),"test-name").
-         equals(new Location(new UnLocode("TE","STB"), "test-name")));
+    assertFalse(new Location(new UnLocode("ATEST"),"test-name").
+         equals(new Location(new UnLocode("TESTB"), "test-name")));
 
     // Always equal to itself
-    Location location = new Location(new UnLocode("AT","EST"),"test-name");
+    Location location = new Location(new UnLocode("ATEST"),"test-name");
     assertTrue(location.equals(location));
 
     // Never equal to null

dddsample/src/test/java/se/citerus/dddsample/domain/SampleLocations.java

@@ -10,18 +10,18 @@ import java.util.List;
  */
 public class SampleLocations {
 
-  public static final Location HONGKONG = new Location(new UnLocode("CN", "HKG"), "Hongkong");
-  public static final Location MELBOURNE = new Location(new UnLocode("AU","MEL"), "Melbourne");
-  public static final Location STOCKHOLM = new Location(new UnLocode("SE","STO"), "Stockholm");
-  public static final Location HELSINKI = new Location(new UnLocode("FI","HEL"), "Helsinki");
-  public static final Location CHICAGO = new Location(new UnLocode("US", "CHI"), "Chicago");
-  public static final Location TOKYO = new Location(new UnLocode("JN","TKO"), "Tokyo");
-  public static final Location HAMBURG = new Location(new UnLocode("DE", "HAM"), "Hamburg");
-  public static final Location SHANGHAI = new Location(new UnLocode("CN", "SHA"), "Shanghai");
-  public static final Location ROTTERDAM = new Location(new UnLocode("NL", "RTM"), "Rotterdam");
-  public static final Location GOTHENBURG = new Location(new UnLocode("SE", "GOT"), "Göteborg");
-  public static final Location HANGZOU = new Location(new UnLocode("CN", "HGH"), "Hangzhou");
-  public static final Location NEWYORK = new Location(new UnLocode("US", "NYC"), "New York");
+  public static final Location HONGKONG = new Location(new UnLocode("CNHKG"), "Hongkong");
+  public static final Location MELBOURNE = new Location(new UnLocode("AUMEL"), "Melbourne");
+  public static final Location STOCKHOLM = new Location(new UnLocode("SESTO"), "Stockholm");
+  public static final Location HELSINKI = new Location(new UnLocode("FIHEL"), "Helsinki");
+  public static final Location CHICAGO = new Location(new UnLocode("USCHI"), "Chicago");
+  public static final Location TOKYO = new Location(new UnLocode("JNTKO"), "Tokyo");
+  public static final Location HAMBURG = new Location(new UnLocode("DEHAM"), "Hamburg");
+  public static final Location SHANGHAI = new Location(new UnLocode("CNSHA"), "Shanghai");
+  public static final Location ROTTERDAM = new Location(new UnLocode("NLRTM"), "Rotterdam");
+  public static final Location GOTHENBURG = new Location(new UnLocode("SEGOT"), "Göteborg");
+  public static final Location HANGZOU = new Location(new UnLocode("CNHGH"), "Hangzhou");
+  public static final Location NEWYORK = new Location(new UnLocode("USNYC"), "New York");
 
   public static final List<Location> all = new ArrayList<Location>();
 

dddsample/src/test/java/se/citerus/dddsample/domain/TrackingScenarioTest.java

@@ -1,6 +1,7 @@
 package se.citerus.dddsample.domain;
 
 import junit.framework.TestCase;
+import static se.citerus.dddsample.domain.SampleLocations.*;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -10,10 +11,6 @@ import java.util.Date;
 import java.util.List;
 
 public class TrackingScenarioTest extends TestCase {
-  private final Location stockholm = new Location(new UnLocode("SE","STO"), "Stockholm");
-  private final Location hamburg = new Location(new UnLocode("DE","HAM"), "Hamburg");
-  private final Location melbourne = new Location(new UnLocode("AU","MEL"), "Melbourne");
-  private final Location hongkong = new Location(new UnLocode("CN","HKG"), "Hongkong");
 
   public void testTrackingScenarioStage1() throws Exception {
 
@@ -34,22 +31,22 @@ public class TrackingScenarioTest extends TestCase {
 
   private DeliveryHistory populateDeliveryHistory(Cargo cargo) throws Exception {
     final CarrierMovement stockholmToHamburg = new CarrierMovement(
-            new CarrierMovementId("CAR_001"), stockholm, hamburg);
+            new CarrierMovementId("CAR_001"), STOCKHOLM, HAMBURG);
 
     final CarrierMovement hamburgToHongKong = new CarrierMovement(
-            new CarrierMovementId("CAR_002"), hamburg, hongkong);
+            new CarrierMovementId("CAR_002"), HAMBURG, HONGKONG);
     DeliveryHistory dh = new DeliveryHistory();
     dh.addAllEvents(Arrays.asList(
-            new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, stockholm, stockholmToHamburg),
-            new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, hamburg, stockholmToHamburg),
-            new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, hamburg, hamburgToHongKong),
-            new HandlingEvent(cargo, getDate("2007-12-05"), new Date(), HandlingEvent.Type.UNLOAD, hongkong, hamburgToHongKong)
+            new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), HandlingEvent.Type.LOAD, STOCKHOLM, stockholmToHamburg),
+            new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), HandlingEvent.Type.UNLOAD, HAMBURG, stockholmToHamburg),
+            new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), HandlingEvent.Type.LOAD, HAMBURG, hamburgToHongKong),
+            new HandlingEvent(cargo, getDate("2007-12-05"), new Date(), HandlingEvent.Type.UNLOAD, HONGKONG, hamburgToHongKong)
     ));
     return dh;
   }
 
   private Cargo populateCargo() throws Exception {
-    final Cargo cargo = new Cargo(new TrackingId("XYZ"), stockholm, melbourne);
+    final Cargo cargo = new Cargo(new TrackingId("XYZ"), STOCKHOLM, MELBOURNE);
 
     return cargo;
   }

dddsample/src/test/java/se/citerus/dddsample/domain/UnLocodeTest.java

@@ -5,52 +5,50 @@ import junit.framework.TestCase;
 public class UnLocodeTest extends TestCase {
 
   public void testNew() throws Exception {
-    assertValid("AA", "234");
-    assertValid("AA", "A9B");
-    assertValid("AA", "AAA");
+    assertValid("AA234");
+    assertValid("AAA9B");
+    assertValid("AAAAA");
     
-    assertInvalid("A", "AAA");
-    assertInvalid("AAA", "AAA");
-    assertInvalid("AA", "AA");
-    assertInvalid("AA", "AAAA");
-    assertInvalid("22", "AAA");
-    assertInvalid("AA", "111");
-    assertInvalid(null, "AAA");
-    assertInvalid("AA", null);
-    assertInvalid(null, null);
+    assertInvalid("AAAA");
+    assertInvalid("AAAAAA");
+    assertInvalid("AAAA");
+    assertInvalid("AAAAAA");
+    assertInvalid("22AAA");
+    assertInvalid("AA111");
+    assertInvalid(null);
   }
 
   public void testIdString() throws Exception {
-    assertEquals("ABCDE", new UnLocode("Ab", "cDe").idString());
+    assertEquals("ABCDE", new UnLocode("AbcDe").idString());
   }
 
   public void testEquals() throws Exception {
-    UnLocode allCaps = new UnLocode("AB", "CDE");
-    UnLocode mixedCase = new UnLocode("aB", "cDe");
+    UnLocode allCaps = new UnLocode("ABCDE");
+    UnLocode mixedCase = new UnLocode("aBcDe");
 
     assertTrue(allCaps.equals(mixedCase));
     assertTrue(mixedCase.equals(allCaps));
     assertTrue(allCaps.equals(allCaps));
 
     assertFalse(allCaps.equals(null));
-    assertFalse(allCaps.equals(new UnLocode("FG","HIJ")));
+    assertFalse(allCaps.equals(new UnLocode("FGHIJ")));
   }
 
   public void testHashCode() throws Exception {
-    UnLocode allCaps = new UnLocode("AB", "CDE");
-    UnLocode mixedCase = new UnLocode("aB", "cDe");
+    UnLocode allCaps = new UnLocode("ABCDE");
+    UnLocode mixedCase = new UnLocode("aBcDe");
 
     assertEquals(allCaps.hashCode(), mixedCase.hashCode());  
   }
   
-  private void assertValid(String countryCode, String locationCode) {
-    new UnLocode(countryCode, locationCode);
+  private void assertValid(String unlocode) {
+    new UnLocode(unlocode);
   }
 
-  private void assertInvalid(String countryCode, String locationCode) {
+  private void assertInvalid(String unlocode) {
     try {
-      new UnLocode(countryCode, locationCode);
-      fail("The combination [" + countryCode + "," + locationCode + "] is not a valid UnLocode");
+      new UnLocode(unlocode);
+      fail("The combination [" + unlocode + "] is not a valid UnLocode");
     } catch (IllegalArgumentException expected) {}
   }
 

dddsample/src/test/java/se/citerus/dddsample/repository/CargoRepositoryTest.java

@@ -1,12 +1,13 @@
 package se.citerus.dddsample.repository;
 
 import se.citerus.dddsample.domain.*;
-import static se.citerus.dddsample.domain.HandlingEvent.Type.*;
+import static se.citerus.dddsample.domain.HandlingEvent.Type.LOAD;
+import static se.citerus.dddsample.domain.HandlingEvent.Type.RECEIVE;
 import static se.citerus.dddsample.domain.SampleLocations.*;
 
-import java.util.Map;
-import java.util.List;
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 public class CargoRepositoryTest extends AbstractRepositoryTest {
 
@@ -82,4 +83,10 @@ public class CargoRepositoryTest extends AbstractRepositoryTest {
     // TODO: check origin/finalDestination ids
   }
 
+  public void testFindAll() {
+    List<Cargo> all = cargoRepository.findAll();
+    assertNotNull(all);
+    assertEquals(6, all.size());
+  }
+
 }

dddsample/src/test/java/se/citerus/dddsample/repository/HandlingEventRepositoryTest.java

@@ -25,7 +25,7 @@ public class HandlingEventRepositoryTest extends AbstractRepositoryTest {
   }
 
   public void testSave() {
-    Location location = locationRepository.find(new UnLocode("SE","STO"));
+    Location location = locationRepository.find(new UnLocode("SESTO"));
 
     Cargo cargo = cargoRepository.find(new TrackingId("XYZ"));
     Date completionTime = new Date(10);

dddsample/src/test/java/se/citerus/dddsample/repository/LocationRepositoryTest.java

@@ -9,12 +9,12 @@ public class LocationRepositoryTest extends AbstractRepositoryTest {
   private LocationRepository locationRepository;
   
   public void testFind() throws Exception {
-    final UnLocode melbourne = new UnLocode("AU", "MEL");
+    final UnLocode melbourne = new UnLocode("AUMEL");
     Location location = locationRepository.find(melbourne);
     assertNotNull(location);
     assertEquals(melbourne, location.unLocode());
 
-    assertNull(locationRepository.find(new UnLocode("NO","LOC")));
+    assertNull(locationRepository.find(new UnLocode("NOLOC")));
   }
 
   public void testFindAll() throws Exception {

dddsample/src/test/java/se/citerus/dddsample/service/HandlingEventServiceTest.java

@@ -54,7 +54,7 @@ public class HandlingEventServiceTest extends TestCase {
     final CarrierMovementId carrierMovementId = new CarrierMovementId("AAA_BBB");
     expect(carrierMovementRepository.find(carrierMovementId)).andReturn(cmAAA_BBB);
 
-    final UnLocode unLocode = new UnLocode("SE", "STO");
+    final UnLocode unLocode = new UnLocode("SESTO");
     expect(locationRepository.find(unLocode)).andReturn(STOCKHOLM);
 
     // TODO: does not inspect the handling event instance in a sufficient way
@@ -123,7 +123,7 @@ public class HandlingEventServiceTest extends TestCase {
 
     final TrackingId trackingId = new TrackingId("XYZ");
     expect(cargoRepository.find(trackingId)).andReturn(cargoXYZ);
-    UnLocode wayOff = new UnLocode("XX", "YYY");
+    UnLocode wayOff = new UnLocode("XXYYY");
     expect(locationRepository.find(wayOff)).andReturn(null);
     
     replay(cargoRepository, carrierMovementRepository, handlingEventRepository, locationRepository, eventService);

dddsample/src/test/java/se/citerus/dddsample/service/RoutingScenarioTest.java

@@ -5,7 +5,7 @@ import se.citerus.dddsample.domain.*;
 import se.citerus.dddsample.repository.CargoRepository;
 
 import java.util.Date;
-import java.util.Set;
+import java.util.List;
 
 public class RoutingScenarioTest extends TestCase {
 
@@ -24,7 +24,7 @@ public class RoutingScenarioTest extends TestCase {
       satisfy the given specification (must arrive in three days, must not
       cost more than $10,000 etc).
      */
-    Set<Itinerary> itineraryCandidates = routingService.calculatePossibleRoutes(trackingId, specification);
+    List<Itinerary> itineraryCandidates = routingService.calculatePossibleRoutes(trackingId, specification);
 
     /*
       Someone, or something, selects the most appropriate itinerary and
@@ -36,7 +36,7 @@ public class RoutingScenarioTest extends TestCase {
     /*
       A number of events occur, all of which are according to plan
      */
-    handlingEventService.register(new Date(), trackingId, new CarrierMovementId("A001"), new UnLocode("SE","STO"), null);
+    handlingEventService.register(new Date(), trackingId, new CarrierMovementId("A001"), new UnLocode("SESTO"), null);
     handlingEventService.register(new Date(), trackingId, new CarrierMovementId("B002"), null, null);
     handlingEventService.register(new Date(), trackingId, new CarrierMovementId("C003"), null, null);
 
@@ -62,7 +62,7 @@ public class RoutingScenarioTest extends TestCase {
   }
 
 
-  private Itinerary stubbedItinerarySelection(Set<Itinerary> itineraryCandidates) {
+  private Itinerary stubbedItinerarySelection(List<Itinerary> itineraryCandidates) {
     return itineraryCandidates.iterator().next();
   }
 

dddsample/src/test/java/se/citerus/dddsample/service/RoutingServiceTest.java

@@ -9,7 +9,6 @@ import se.citerus.dddsample.repository.CargoRepository;
 import se.citerus.dddsample.repository.LocationRepository;
 
 import java.util.List;
-import java.util.Set;
 
 public class RoutingServiceTest extends TestCase {
 
@@ -33,7 +32,7 @@ public class RoutingServiceTest extends TestCase {
     expect(cargoRepository.find(isA(TrackingId.class))).andReturn(cargo);
     replay(locationRepository, cargoRepository);
 
-    Set<Itinerary> candidates = routingService.calculatePossibleRoutes(trackingId, null);
+    List<Itinerary> candidates = routingService.calculatePossibleRoutes(trackingId, null);
     assertNotNull(candidates);
     
     for (Itinerary itinerary : candidates) {

dddsample/src/test/java/se/citerus/dddsample/web/CargoTrackingControllerTest.java

@@ -13,11 +13,14 @@ import se.citerus.dddsample.domain.*;
 import static se.citerus.dddsample.domain.SampleLocations.HONGKONG;
 import static se.citerus.dddsample.domain.SampleLocations.TOKYO;
 import se.citerus.dddsample.service.CargoService;
+import se.citerus.dddsample.service.dto.CargoRoutingDTO;
 import se.citerus.dddsample.service.dto.CargoTrackingDTO;
 import se.citerus.dddsample.service.dto.HandlingEventDTO;
+import se.citerus.dddsample.service.dto.LegDTO;
 import se.citerus.dddsample.web.command.TrackCommand;
 
 import java.util.Date;
+import java.util.List;
 
 public class CargoTrackingControllerTest extends TestCase {
   CargoTrackingController controller;
@@ -40,10 +43,7 @@ public class CargoTrackingControllerTest extends TestCase {
   }
 
   private CargoService getCargoServiceMock() {
-    return new CargoService() {
-      public TrackingId registerNew(Location origin, Location destination) {
-        return null;
-      }
+    return new EmptyStubCargoService() {
 
       public CargoTrackingDTO track(TrackingId trackingId) {
         Cargo cargo = new Cargo(trackingId, HONGKONG, TOKYO);
@@ -66,23 +66,11 @@ public class CargoTrackingControllerTest extends TestCase {
           true));
         return cargoDTO;
       }
-
-      public void notify(TrackingId trackingId) {
-      }
     };
   }
   
   private CargoService getCargoServiceNullMock() {
-    return new CargoService() {
-      public TrackingId registerNew(Location origin, Location destination) {
-        return null;
-      }
-
-      public CargoTrackingDTO track(TrackingId trackingId) {
-        return null;
-      }
-      public void notify(TrackingId trackingId) {}
-    };
+    return new EmptyStubCargoService();
   }
 
   public void testHandleGet() throws Exception {
@@ -130,4 +118,31 @@ public class CargoTrackingControllerTest extends TestCase {
     assertEquals(command.getTrackingId(), fe.getArguments()[0]);
   }
 
+  private class EmptyStubCargoService implements CargoService {
+    public TrackingId registerNew(UnLocode origin, UnLocode destination) {
+      return null;
+    }
+
+    public List<String> shippingLocations() {
+      return null;
+    }
+
+    public CargoTrackingDTO track(TrackingId trackingId) {
+      return null;
+    }
+
+    public void notify(TrackingId trackingId) {
+    }
+
+    public CargoRoutingDTO loadForRouting(TrackingId trackingId) {
+      return null;
+    }
+
+    public List<CargoRoutingDTO> loadAllForRouting() {
+      return null;
+    }
+
+    public void assignItinerary(TrackingId trackingId, List<LegDTO> legDTOs) {
+    }
+  }
 }

dddsample/src/test/java/se/citerus/dddsample/ws/HandlinEventServiceEndpointTest.java

@@ -29,7 +29,7 @@ public class HandlinEventServiceEndpointTest extends TestCase {
   public void testRegisterValidEvent() throws Exception {
     Date date = new Date(100);
 
-    handlingEventService.register(date, new TrackingId("FOO"), new CarrierMovementId("CAR_456"), new UnLocode("CN","HKG"), HandlingEvent.Type.LOAD);
+    handlingEventService.register(date, new TrackingId("FOO"), new CarrierMovementId("CAR_456"), new UnLocode("CNHKG"), HandlingEvent.Type.LOAD);
     replay(handlingEventService);
 
     // Tested call
@@ -41,7 +41,7 @@ public class HandlinEventServiceEndpointTest extends TestCase {
     Date date = new Date(100);
 
     TrackingId trackingId = new TrackingId("NOTFOUND");
-    UnLocode unlocode = new UnLocode("SE","STO");
+    UnLocode unlocode = new UnLocode("SESTO");
 
     handlingEventService.register(date, trackingId, null, unlocode, HandlingEvent.Type.CLAIM);
     expectLastCall().andThrow(new UnknownTrackingIdException(trackingId));
@@ -57,7 +57,7 @@ public class HandlinEventServiceEndpointTest extends TestCase {
       TrackingId trackingId = new TrackingId("XYZ");
       CarrierMovementId carrierMovementId = new CarrierMovementId("NOTFOUND");
 
-      handlingEventService.register(date, trackingId, carrierMovementId, new UnLocode("AU","MEL"), HandlingEvent.Type.UNLOAD);
+      handlingEventService.register(date, trackingId, carrierMovementId, new UnLocode("AUMEL"), HandlingEvent.Type.UNLOAD);
       expectLastCall().andThrow(new UnknownCarrierMovementIdException(carrierMovementId));
       replay(handlingEventService);