Split routing service into two parts: "our" part with model translation, and remote service part for graph calculations. Still a bit sketchy though.

More flesh on RouteSpecification, with some ideas around factory methods for specifications.

Renamed a few service methods to match ubiquotous language more closely.

Pushed DTO assembly outside of service layer and into MVC controllers, pending creation of dedicated remoting layer. Service layer now uses pure domain model classes.  

CarrierMovementId implements ValueObject.

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

@@ -7,7 +7,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
 /**
  * Identifies a particular carrier movement, such as a flight number.
  */
-public final class CarrierMovementId {
+public final class CarrierMovementId implements ValueObject<CarrierMovementId> {
 
   private String id;
 
@@ -38,8 +38,13 @@ public final class CarrierMovementId {
     return HashCodeBuilder.reflectionHashCode(this);
   }
 
+  @Override
+  public boolean sameValueAs(CarrierMovementId other) {
+    return other != null && this.id.equals(other.id);
+  }
+
   // Needed by hibernate
   CarrierMovementId() {
   }
-
+  
 }

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

@@ -1,9 +1,81 @@
 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 java.util.Date;
+
 /**
- *
+ * Route specification
  */
-public interface RouteSpecification {
-  Location origin();
-  Location destination();
+public class RouteSpecification implements ValueObject<RouteSpecification>, Specification<Itinerary> {
+  private Location origin;
+  private Location destination;
+  private Date arrivalDeadline;
+
+  /**
+   * Factory method.
+   *
+   * TODO just a suggestion - could be useful with RouteSpecification.witinOneWeek(cargo) etc
+   * 
+   * @param cargo cargo
+   * @param arrivalDeadline arrival deadline
+   * @return A route specification for this cargo and arrival deadline
+   */
+  public static RouteSpecification forCargo(Cargo cargo, Date arrivalDeadline) {
+    Validate.notNull(cargo);
+    Validate.notNull(arrivalDeadline);
+
+    return new RouteSpecification(cargo.origin(), cargo.destination(), arrivalDeadline);
+  }
+
+  private RouteSpecification(Location origin, Location destination, Date arrivalDeadline) {
+    this.origin = origin;
+    this.destination = destination;
+    this.arrivalDeadline = arrivalDeadline;
+  }
+
+  public Location origin() {
+    return origin;
+  }
+
+  public Location destination() {
+    return destination;
+  }
+
+  @Override
+  public boolean isSatisfiedBy(Itinerary itinerary) {
+    // TODO implement
+    return true;
+  }
+
+  @Override
+  public boolean sameValueAs(RouteSpecification other) {
+    return other != null && new EqualsBuilder().
+      append(this.origin, other.origin).
+      append(this.destination, other.destination).
+      append(this.arrivalDeadline, other.arrivalDeadline).
+      isEquals();
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+
+    RouteSpecification that = (RouteSpecification) o;
+
+    return sameValueAs(that);
+  }
+
+  @Override
+  public int hashCode() {
+    return new HashCodeBuilder().
+      append(this.origin).
+      append(this.destination).
+      append(this.arrivalDeadline).
+      toHashCode();
+  }
+  
 }

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

@@ -2,7 +2,9 @@ package se.citerus.dddsample.domain;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * A few locations for easy testing.
@@ -22,13 +24,14 @@ public class SampleLocations {
   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>();
+  public static final Map<UnLocode, Location> ALL = new HashMap();
 
   static {
     for (Field field : SampleLocations.class.getDeclaredFields()) {
       if (field.getType().equals(Location.class)) {
         try {
-          ALL.add((Location) field.get(null));
+          Location location = (Location) field.get(null);
+          ALL.put(location.unLocode(), location);
         } catch (IllegalAccessException e) {
           throw new RuntimeException(e);
         }
@@ -37,7 +40,11 @@ public class SampleLocations {
   }
 
   public static List<Location> getAll() {
-    return ALL;
+    return new ArrayList(ALL.values());
+  }
+
+  public static Location lookup(UnLocode unLocode) {
+    return ALL.get(unLocode);
   }
 
 }

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

@@ -0,0 +1,6 @@
+package se.citerus.dddsample.domain;
+
+public interface Specification<T> {
+  // TODO replace with Specification project dependency
+  boolean isSatisfiedBy(T t);
+}

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

@@ -51,6 +51,11 @@ public final class UnLocode {
     return HashCodeBuilder.reflectionHashCode(this);
   }
 
+  @Override
+  public String toString() {
+    return idString();
+  }
+
   UnLocode() {
     // Needed by Hibernate
   }

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

@@ -9,7 +9,7 @@ import java.util.List;
 public class LocationRepositoryInMem implements LocationRepository {
 
   public Location find(UnLocode unLocode) {
-    for (Location location : SampleLocations.ALL) {
+    for (Location location : SampleLocations.getAll()) {
       if (location.unLocode().equals(unLocode)) {
         return location;
       }
@@ -18,7 +18,7 @@ public class LocationRepositoryInMem implements LocationRepository {
   }
 
   public List<Location> findAll() {
-    return SampleLocations.ALL;
+    return SampleLocations.getAll();
   }
   
 }

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

@@ -6,14 +6,9 @@ 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.CarrierMovementRepository;
 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.ItineraryCandidateDTO;
-import se.citerus.dddsample.service.dto.assembler.CargoRoutingDTOAssembler;
 import se.citerus.dddsample.service.dto.assembler.CargoTrackingDTOAssembler;
-import se.citerus.dddsample.service.dto.assembler.ItineraryCandidateDTOAssembler;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -22,12 +17,11 @@ public final class CargoServiceImpl implements CargoService {
 
   private CargoRepository cargoRepository;
   private LocationRepository locationRepository;
-  private CarrierMovementRepository carrierMovementRepository;
 
   private final Log logger = LogFactory.getLog(getClass());
-               
+
   @Transactional(readOnly = false)
-  public TrackingId registerNew(final UnLocode originUnLocode, final UnLocode destinationUnLocode) {
+  public TrackingId registerNewCargo(final UnLocode originUnLocode, final UnLocode destinationUnLocode) {
     Validate.notNull(originUnLocode);
     Validate.notNull(destinationUnLocode);
 
@@ -43,7 +37,7 @@ public final class CargoServiceImpl implements CargoService {
   }
 
   @Transactional(readOnly = true)
-  public List<UnLocode> shippingLocations() {
+  public List<UnLocode> listShippingLocations() {
     final List<Location> allLocations = locationRepository.findAll();
     final List<UnLocode> unlocodes = new ArrayList<UnLocode>(allLocations.size());
     for (Location location : allLocations) {
@@ -52,8 +46,7 @@ public final class CargoServiceImpl implements CargoService {
     return unlocodes;
   }
 
-  // TODO: move to TrackingService, rename this class BookingService, to match course
-  // TODO: remove all DTOs from BookingService, only keep DTOs in TrackingService
+  // TODO: move track() and notify() to TrackingService, rename this class BookingService
   @Transactional(readOnly = true)
   public CargoTrackingDTO track(final TrackingId trackingId) {
     Validate.notNull(trackingId);
@@ -66,7 +59,6 @@ public final class CargoServiceImpl implements CargoService {
     return new CargoTrackingDTOAssembler().toDTO(cargo);
   }
 
-  // TODO: move this to another class?
   @Transactional(readOnly = true)
   public void notify(final TrackingId trackingId) {
     Validate.notNull(trackingId);
@@ -89,45 +81,34 @@ public final class CargoServiceImpl implements CargoService {
   }
 
   @Transactional(readOnly = true)
-  public List<CargoRoutingDTO> loadAllForRouting() {
+  public List<Cargo> listAllCargos() {
     final List<Cargo> allCargos = cargoRepository.findAll();
-
-    final CargoRoutingDTOAssembler assembler = new CargoRoutingDTOAssembler();
-    final List<CargoRoutingDTO> dtoList = new ArrayList<CargoRoutingDTO>(allCargos.size());
-
-    for (Cargo cargo : allCargos) {
-      dtoList.add(assembler.toDTO(cargo));
-    }
-
-    return dtoList;
+    // TODO: specification pattern might be useful here, too
+    return allCargos;
   }
 
   @Transactional(readOnly = true)
-  public CargoRoutingDTO loadForRouting(final TrackingId trackingId) {
+  public Cargo loadCargoForRouting(final TrackingId trackingId) {
     Validate.notNull(trackingId);
 
     // TODO obtain offline lock
     final Cargo cargo = cargoRepository.find(trackingId);
-    if (cargo == null) {
-      return null;
-    }
 
-    return new CargoRoutingDTOAssembler().toDTO(cargo);
+    return cargo;
   }
 
   @Transactional(readOnly = false)
-  public void assignItinerary(final TrackingId trackingId, final ItineraryCandidateDTO dto) {
+  public void assignCargoToRoute(final TrackingId trackingId, final Itinerary newItinerary) {
     Validate.notNull(trackingId);
-    Validate.notNull(dto);
+    Validate.notNull(newItinerary);
 
     final Cargo cargo = cargoRepository.find(trackingId);
     if (cargo == null) {
       throw new IllegalArgumentException("Can't assign itinerary to non-existing cargo " + trackingId);
     }
 
-    final ItineraryCandidateDTOAssembler itineraryCandidateDTOAssembler = new ItineraryCandidateDTOAssembler();
-    final Itinerary newItinerary = itineraryCandidateDTOAssembler.fromDTO(dto, carrierMovementRepository, locationRepository);
-
+    // TODO try to leave as much of orphan deletion as possible to the OR mapper - rethink mapping, or implement transparent callback
+    
     // Delete orphaned itinerary - it's just a value object
     final Itinerary oldItinerary = cargo.itinerary();
     cargoRepository.deleteItinerary(oldItinerary);
@@ -137,10 +118,11 @@ public final class CargoServiceImpl implements CargoService {
     cargo.attachItinerary(newItinerary);
     cargoRepository.save(cargo);
 
+    logger.info("Assigned cargo " + trackingId + " to new route");
+
     // TODO release offline lock
   }
 
-
   public void setCargoRepository(final CargoRepository cargoRepository) {
     this.cargoRepository = cargoRepository;
   }
@@ -149,8 +131,4 @@ public final class CargoServiceImpl implements CargoService {
     this.locationRepository = locationRepository;
   }
 
-  public void setCarrierMovementRepository(final CarrierMovementRepository carrierMovementRepository) {
-    this.carrierMovementRepository = carrierMovementRepository;
-  }
-
 }

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

@@ -0,0 +1,82 @@
+package se.citerus.dddsample.service;
+
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import se.citerus.dddsample.domain.*;
+import se.citerus.dddsample.repository.CarrierMovementRepository;
+import se.citerus.dddsample.repository.LocationRepository;
+import se.citerus.dddsample.service.dto.ItineraryCandidateDTO;
+import se.citerus.dddsample.service.dto.assembler.ItineraryCandidateDTOAssembler;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
+public class GraphTraversalService {
+
+  private LocationRepository locationRepository;
+  private CarrierMovementRepository carrierMovementRepository;
+
+  Random random = new Random();
+
+  @Transactional(readOnly = false, propagation = Propagation.REQUIRES_NEW)
+  public List<ItineraryCandidateDTO> performHeavyCalculations(String originUnLocode, String destinationUnLocode) {
+    List<Location> allLocations = locationRepository.findAll();
+    Location origin = locationRepository.find(new UnLocode(originUnLocode));
+    Location destination = locationRepository.find(new UnLocode(destinationUnLocode));
+    
+    allLocations.remove(origin);
+    allLocations.remove(destination);
+
+    final int candidateCount = getRandomNumberOfCandidates();
+    final List<ItineraryCandidateDTO> candidates = new ArrayList<ItineraryCandidateDTO>(candidateCount);
+    final ItineraryCandidateDTOAssembler assembler = new ItineraryCandidateDTOAssembler();
+
+    for (int i = 0; i < candidateCount; i++) {
+      allLocations = getRandomChunkOfLocations(allLocations);
+      final List<Leg> legs = new ArrayList<Leg>(allLocations.size() - 1);
+      final Location firstLegTo = allLocations.get(0);
+
+      final CarrierMovement cm1 = carrierMovementRepository.find(new CarrierMovementId("CAR_002"));
+      legs.add(new Leg(cm1, origin, firstLegTo));
+
+      for (int j = 0; j < allLocations.size() - 1; j++) {
+        legs.add(new Leg(getRandomCarrierMovement(), allLocations.get(j), allLocations.get(j + 1)));
+      }
+
+      final Location lastLegFrom = allLocations.get(allLocations.size() - 1);
+      legs.add(new Leg(getRandomCarrierMovement(), lastLegFrom, destination));
+
+      final Itinerary itinerary = new Itinerary(legs);
+      candidates.add(assembler.toDTO(itinerary));
+    }
+
+    return candidates;
+  }
+
+  private CarrierMovement getRandomCarrierMovement() {
+    // TODO create new CMs on the fly, with better names than "car 1,2,3"
+    final CarrierMovementId id = new CarrierMovementId("CAR_00" + (random.nextInt(9) + 1));
+    return carrierMovementRepository.find(id);
+  }
+
+  private int getRandomNumberOfCandidates() {
+    return 1 + random.nextInt(4);
+  }
+
+  private List<Location> getRandomChunkOfLocations(List<Location> allLocations) {
+    Collections.shuffle(allLocations);
+    final int total = allLocations.size();
+    final int chunk = total > 4 ? (total - 4) + random.nextInt(5) : total;
+    return allLocations.subList(0, chunk);
+  }
+
+  public void setLocationRepository(LocationRepository locationRepository) {
+    this.locationRepository = locationRepository;
+  }
+
+  public void setCarrierMovementRepository(CarrierMovementRepository carrierMovementRepository) {
+    this.carrierMovementRepository = carrierMovementRepository;
+  }
+}

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

@@ -7,7 +7,8 @@ import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.support.SimpleTransactionStatus;
 
 /**
- * 
+ * Simple no-op transaction manager to allow for in-memory "persistence"
+ * implementation to be plugged in transparently.
  */
 public class InMemTransactionManager implements PlatformTransactionManager {
 

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

@@ -1,16 +1,20 @@
 package se.citerus.dddsample.service;
 
+import se.citerus.dddsample.domain.Itinerary;
 import se.citerus.dddsample.domain.RouteSpecification;
-import se.citerus.dddsample.domain.TrackingId;
-import se.citerus.dddsample.service.dto.ItineraryCandidateDTO;
 
 import java.util.List;
 
 /**
+ * Routing service.
  *
  */
 public interface RoutingService {
 
-  List<ItineraryCandidateDTO> calculatePossibleRoutes(TrackingId trackingId, RouteSpecification routeSpecification);
+  /**
+   * @param routeSpecification route specification
+   * @return A list of itineraries that satisfy the specification. May be an empty list if no route is found.
+   */
+  List<Itinerary> requestPossibleRoutes(RouteSpecification routeSpecification);
 
 }

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

@@ -1,92 +1,57 @@
 package se.citerus.dddsample.service;
 
 import org.springframework.transaction.annotation.Transactional;
-import se.citerus.dddsample.domain.*;
-import se.citerus.dddsample.repository.CargoRepository;
+import se.citerus.dddsample.domain.Itinerary;
+import se.citerus.dddsample.domain.Location;
+import se.citerus.dddsample.domain.RouteSpecification;
 import se.citerus.dddsample.repository.CarrierMovementRepository;
 import se.citerus.dddsample.repository.LocationRepository;
 import se.citerus.dddsample.service.dto.ItineraryCandidateDTO;
 import se.citerus.dddsample.service.dto.assembler.ItineraryCandidateDTOAssembler;
 
 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
- * of different itineraries.
+ * Our end of the routing service.
+ *
  */
 public class RoutingServiceImpl implements RoutingService {
 
+  private GraphTraversalService graphTraversalService;
   private LocationRepository locationRepository;
-  private CargoRepository cargoRepository;
   private CarrierMovementRepository carrierMovementRepository;
 
-  Random random = new Random();
-
   @Transactional(readOnly = true)
-  public List<ItineraryCandidateDTO> calculatePossibleRoutes(TrackingId trackingId, RouteSpecification routeSpecification) {
-    final Cargo cargo = cargoRepository.find(trackingId);
-    if (cargo == null) {
-      return Collections.emptyList();
-    }
-
-    List<Location> allLocations = locationRepository.findAll();
-
-    allLocations.remove(cargo.origin());
-    allLocations.remove(cargo.destination());
-
-    final int candidateCount = getRandomNumberOfCandidates();
-    final List<ItineraryCandidateDTO> candidates = new ArrayList<ItineraryCandidateDTO>(candidateCount);
-    final ItineraryCandidateDTOAssembler assembler = new ItineraryCandidateDTOAssembler();
-
-    for (int i = 0; i < candidateCount; i++) {
-      allLocations = getRandomChunkOfLocations(allLocations);
-      final List<Leg> legs = new ArrayList<Leg>(allLocations.size() - 1);
-      final Location firstLegTo = allLocations.get(0);
-
-      final CarrierMovement cm1 = carrierMovementRepository.find(new CarrierMovementId("CAR_002"));
-      legs.add(new Leg(cm1, cargo.origin(), firstLegTo));
-
-      for (int j = 0; j < allLocations.size() - 1; j++) {
-        legs.add(new Leg(getRandomCarrierMovement(), allLocations.get(j), allLocations.get(j + 1)));
-      }
-
-      final Location lastLegFrom = allLocations.get(allLocations.size() - 1);
-      legs.add(new Leg(getRandomCarrierMovement(), lastLegFrom, cargo.destination()));
-
-      final Itinerary itinerary = new Itinerary(legs);
-      candidates.add(assembler.toDTO(itinerary));
+  public List<Itinerary> requestPossibleRoutes(RouteSpecification routeSpecification) {
+    final Location origin = routeSpecification.origin();
+    final Location destination = routeSpecification.destination();
+
+    final List<ItineraryCandidateDTO> candidateDTOs = graphTraversalService.performHeavyCalculations(
+      origin.unLocode().idString(),
+      destination.unLocode().idString()
+    );
+    
+    final List<Itinerary> itineraries = new ArrayList<Itinerary>(candidateDTOs.size());
+
+    for (ItineraryCandidateDTO candidateDTO : candidateDTOs) {
+      final Itinerary itinerary = new ItineraryCandidateDTOAssembler().fromDTO(
+        candidateDTO, carrierMovementRepository, locationRepository
+      );
+      itineraries.add(itinerary);
     }
 
-    return candidates;
-  }
-
-  private List<Location> getRandomChunkOfLocations(List<Location> allLocations) {
-    Collections.shuffle(allLocations);
-    final int total = allLocations.size();
-    final int chunk = total > 4 ? (total - 4) + random.nextInt(5) : total;
-    return allLocations.subList(0, chunk);
+    return itineraries;
   }
 
-  private int getRandomNumberOfCandidates() {
-    return 1 + random.nextInt(4);
-  }
-
-  private CarrierMovement getRandomCarrierMovement() {
-    final CarrierMovementId id = new CarrierMovementId("CAR_00" + (random.nextInt(9) + 1));
-    return carrierMovementRepository.find(id);
+  public void setGraphTraversalService(GraphTraversalService graphTraversalService) {
+    this.graphTraversalService = graphTraversalService;
   }
 
   public void setLocationRepository(LocationRepository locationRepository) {
     this.locationRepository = locationRepository;
   }
 
-  public void setCargoRepository(CargoRepository cargoRepository) {
-    this.cargoRepository = cargoRepository;
-  }
-
   public void setCarrierMovementRepository(CarrierMovementRepository carrierMovementRepository) {
     this.carrierMovementRepository = carrierMovementRepository;
   }

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

@@ -1,32 +1,39 @@
 package se.citerus.dddsample.web;
 
 import org.springframework.web.servlet.mvc.multiaction.MultiActionController;
-import se.citerus.dddsample.domain.TrackingId;
-import se.citerus.dddsample.domain.UnLocode;
+import se.citerus.dddsample.domain.*;
+import se.citerus.dddsample.repository.CarrierMovementRepository;
+import se.citerus.dddsample.repository.LocationRepository;
 import se.citerus.dddsample.service.CargoService;
 import se.citerus.dddsample.service.RoutingService;
+import se.citerus.dddsample.service.dto.CargoRoutingDTO;
 import se.citerus.dddsample.service.dto.ItineraryCandidateDTO;
 import se.citerus.dddsample.service.dto.LegDTO;
+import se.citerus.dddsample.service.dto.assembler.CargoRoutingDTOAssembler;
+import se.citerus.dddsample.service.dto.assembler.ItineraryCandidateDTOAssembler;
 import se.citerus.dddsample.web.command.RegistrationCommand;
 
 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;
+import java.util.*;
 
 /**
  * Handles cargo routing and administration.
+ *
  */
 public final class CargoAdminController extends MultiActionController {
 
   private CargoService cargoService;
   private RoutingService routingService;
+  private LocationRepository locationRepository;
+  private CarrierMovementRepository carrierMovementRepository;
+
+  // DTO conversion is pushed out to above the service layer for the time being,
+  // pending a dedicated DTO remoting layer  
 
   public Map registrationForm(final HttpServletRequest request, final HttpServletResponse response) throws Exception {
     final Map<String, Object> map = new HashMap<String, Object>();
-    final List<UnLocode> unLocodes = cargoService.shippingLocations();
+    final List<UnLocode> unLocodes = cargoService.listShippingLocations();
     final List<String> unLocodeStrings = new ArrayList<String>();
 
     for (UnLocode unLocode : unLocodes) {
@@ -40,7 +47,7 @@ public final class CargoAdminController extends MultiActionController {
   public void register(final HttpServletRequest request, final HttpServletResponse response,
                        final RegistrationCommand command) throws Exception {
 
-    final TrackingId trackingId = cargoService.registerNew(
+    final TrackingId trackingId = cargoService.registerNewCargo(
       new UnLocode(command.getOriginUnlocode()),
       new UnLocode(command.getDestinationUnlocode())
     );
@@ -49,23 +56,43 @@ public final class CargoAdminController extends MultiActionController {
 
   public Map list(HttpServletRequest request, HttpServletResponse response) {
     final Map<String, Object> map = new HashMap<String, Object>();
-    map.put("cargoList", cargoService.loadAllForRouting());
+    final List<Cargo> allCargos = cargoService.listAllCargos();
+
+    final CargoRoutingDTOAssembler assembler = new CargoRoutingDTOAssembler();
+    final List<CargoRoutingDTO> dtoList = new ArrayList<CargoRoutingDTO>(allCargos.size());
+
+    for (Cargo cargo : allCargos) {
+      dtoList.add(assembler.toDTO(cargo));
+    }
+
+    map.put("cargoList", dtoList);
     return map;
   }
 
   public Map show(final HttpServletRequest request, final HttpServletResponse response) {
     final Map<String, Object> map = new HashMap<String, Object>();
     final TrackingId trackingId = new TrackingId(request.getParameter("trackingId"));
-    map.put("cargo", cargoService.loadForRouting(trackingId));
+    final Cargo cargo = cargoService.loadCargoForRouting(trackingId);
+    final CargoRoutingDTO dto = new CargoRoutingDTOAssembler().toDTO(cargo);
+    map.put("cargo", dto);
     return map;
   }
 
   public Map selectItinerary(final HttpServletRequest request, final HttpServletResponse response) {
     final Map<String, Object> map = new HashMap<String, Object>();
     final TrackingId trackingId = new TrackingId(request.getParameter("trackingId"));
-    final List<ItineraryCandidateDTO> itineraries = routingService.calculatePossibleRoutes(trackingId, null);
 
-    map.put("itineraryCandidates", itineraries);
+    final Cargo cargo = cargoService.loadCargoForRouting(trackingId);
+    final RouteSpecification routeSpecification = RouteSpecification.forCargo(cargo, new Date());
+    final List<Itinerary> itineraries = routingService.requestPossibleRoutes(routeSpecification);
+
+    final List<ItineraryCandidateDTO> itineraryCandidates = new ArrayList<ItineraryCandidateDTO>(itineraries.size());
+    final ItineraryCandidateDTOAssembler dtoAssembler = new ItineraryCandidateDTOAssembler();
+    for (Itinerary itinerary : itineraries) {
+      itineraryCandidates.add(dtoAssembler.toDTO(itinerary));
+    }
+
+    map.put("itineraryCandidates", itineraryCandidates);
     map.put("trackingId", trackingId.idString());
     return map;
   }
@@ -85,7 +112,9 @@ public final class CargoAdminController extends MultiActionController {
     }
 
     final ItineraryCandidateDTO selectedItinerary = new ItineraryCandidateDTO(legDTOs);
-    cargoService.assignItinerary(trackingId, selectedItinerary);
+    final Itinerary itinerary = new ItineraryCandidateDTOAssembler().fromDTO(selectedItinerary, carrierMovementRepository, locationRepository);
+
+    cargoService.assignCargoToRoute(trackingId, itinerary);
 
     response.sendRedirect("list.html");
   }
@@ -98,4 +127,11 @@ public final class CargoAdminController extends MultiActionController {
     this.routingService = routingService;
   }
 
+  public void setLocationRepository(LocationRepository locationRepository) {
+    this.locationRepository = locationRepository;
+  }
+
+  public void setCarrierMovementRepository(CarrierMovementRepository carrierMovementRepository) {
+    this.carrierMovementRepository = carrierMovementRepository;
+  }
 }

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

@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+
+  <!-- TODO start an RMI server on boot and wire this across the network -->
+  <bean id="graphTraversalService" class="se.citerus.dddsample.service.GraphTraversalService">
+    <property name="carrierMovementRepository" ref="carrierMovementRepository"/>
+    <property name="locationRepository" ref="locationRepository"/>
+  </bean>
+
+</beans>

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

@@ -12,7 +12,6 @@
   <bean id="cargoService" class="se.citerus.dddsample.service.CargoServiceImpl">
     <property name="cargoRepository" ref="cargoRepository"/>
     <property name="locationRepository" ref="locationRepository"/>
-    <property name="carrierMovementRepository" ref="carrierMovementRepository"/>
   </bean>
 
   <bean id="handlingEventService" class="se.citerus.dddsample.service.HandlingEventServiceImpl">
@@ -25,8 +24,8 @@
 
   <bean id="routingService" class="se.citerus.dddsample.service.RoutingServiceImpl">
     <property name="locationRepository" ref="locationRepository"/>
-    <property name="cargoRepository" ref="cargoRepository"/>
     <property name="carrierMovementRepository" ref="carrierMovementRepository"/>
+    <property name="graphTraversalService" ref="graphTraversalService"/>
   </bean>
 
 </beans>

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

@@ -33,5 +33,9 @@
   <bean id="localeResolver" class="org.springframework.web.servlet.i18n.FixedLocaleResolver">
     <property name="defaultLocale" value="en"/>
   </bean>
-  
+
+  <bean id="openSessionInViewInterceptor" class="org.springframework.orm.hibernate3.support.OpenSessionInViewInterceptor">
+    <property name="sessionFactory" ref="sessionFactory"/>  
+  </bean>
+
 </beans>

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

@@ -3,6 +3,14 @@
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
+  <bean class="org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping">
+    <property name="interceptors">
+      <list>
+        <ref bean="openSessionInViewInterceptor"/>
+      </list>
+    </property>
+  </bean>
+
   <bean name="/cargo/track.html" class="se.citerus.dddsample.web.CargoTrackingController">
     <property name="sessionForm" value="true"/>
     <property name="commandName" value="trackCommand"/>
@@ -17,6 +25,8 @@
   <bean name="/admin/*" class="se.citerus.dddsample.web.CargoAdminController">
     <property name="cargoService" ref="cargoService"/>
     <property name="routingService" ref="routingService"/>
+    <property name="carrierMovementRepository" ref="carrierMovementRepository"/>
+    <property name="locationRepository" ref="locationRepository"/>
   </bean>
 
 </beans>

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

@@ -28,6 +28,7 @@
       classpath:context-messaging-jms.xml
 
       classpath:context-service.xml
+      classpath:context-routing.xml
       classpath:context-remote.xml
       classpath:context-web.xml
     </param-value>

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

@@ -103,13 +103,13 @@ public class CargoServiceTest extends TestCase {
 
     replay(cargoRepository, locationRepository);
     
-    TrackingId trackingId = cargoService.registerNew(fromUnlocode, toUnlocode);
+    TrackingId trackingId = cargoService.registerNewCargo(fromUnlocode, toUnlocode);
     assertEquals(expectedTrackingId, trackingId);
   }
 
   public void testRegisterNewNullArguments() {
     try {
-      cargoService.registerNew(null, null);
+      cargoService.registerNewCargo(null, null);
       fail("Null arguments should not be allowed");
     } catch (IllegalArgumentException expected) {}
   }

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

@@ -3,7 +3,6 @@ package se.citerus.dddsample.service;
 import junit.framework.TestCase;
 import se.citerus.dddsample.domain.*;
 import se.citerus.dddsample.repository.CargoRepository;
-import se.citerus.dddsample.service.dto.ItineraryCandidateDTO;
 
 import java.util.Date;
 import java.util.List;
@@ -19,14 +18,17 @@ public class RoutingScenarioTest extends TestCase {
 
     TrackingId trackingId = new TrackingId("XYZ123");
     Cargo cargo = cargoRepository.find(trackingId);
-    RouteSpecification routeSpecification = null;
+
+    Date twoWeeksFromNow = new Date(System.currentTimeMillis() + 1000 * 60 * 60 * 24 * 14);
+
+    RouteSpecification routeSpecification = RouteSpecification.forCargo(cargo, twoWeeksFromNow);
 
     /*
       The routing service calculates a number of possible routes that
       satisfy the given specification (must arrive in three days, must not
       cost more than $10,000 etc).
      */
-    List<ItineraryCandidateDTO> itineraryCandidates = routingService.calculatePossibleRoutes(trackingId, routeSpecification);
+    List<Itinerary> itineraryCandidates = routingService.requestPossibleRoutes(routeSpecification);
 
     /*
       Someone, or something, selects the most appropriate itinerary and
@@ -64,8 +66,8 @@ public class RoutingScenarioTest extends TestCase {
   }
 
 
-  private Itinerary stubbedItinerarySelection(List<ItineraryCandidateDTO> itineraryCandidates) {
-    return null;
+  private Itinerary stubbedItinerarySelection(List<Itinerary> itineraryCandidates) {
+    return itineraryCandidates.get(0);
   }
 
 }

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

@@ -2,70 +2,66 @@ package se.citerus.dddsample.service;
 
 import junit.framework.TestCase;
 import static org.easymock.EasyMock.*;
-import se.citerus.dddsample.domain.Cargo;
-import se.citerus.dddsample.domain.CarrierMovement;
-import se.citerus.dddsample.domain.CarrierMovementId;
+import se.citerus.dddsample.domain.*;
 import static se.citerus.dddsample.domain.SampleLocations.*;
-import se.citerus.dddsample.domain.TrackingId;
-import se.citerus.dddsample.repository.CargoRepository;
 import se.citerus.dddsample.repository.CarrierMovementRepository;
 import se.citerus.dddsample.repository.LocationRepository;
-import se.citerus.dddsample.service.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.service.dto.LegDTO;
+import se.citerus.dddsample.repository.LocationRepositoryInMem;
 
+import java.util.Date;
 import java.util.List;
 
 public class RoutingServiceTest extends TestCase {
 
   private RoutingServiceImpl routingService;
-  private LocationRepository locationRepository;
-  private CargoRepository cargoRepository;
   private CarrierMovementRepository carrierMovementRepository;
 
   protected void setUp() throws Exception {
     routingService = new RoutingServiceImpl();
-    locationRepository = createMock(LocationRepository.class);
+    LocationRepository locationRepository = new LocationRepositoryInMem();
     routingService.setLocationRepository(locationRepository);
-    cargoRepository = createMock(CargoRepository.class);
-    routingService.setCargoRepository(cargoRepository);
+
     carrierMovementRepository = createMock(CarrierMovementRepository.class);
     routingService.setCarrierMovementRepository(carrierMovementRepository);
+
+    GraphTraversalService graphTraversalService = new GraphTraversalService();
+    graphTraversalService.setCarrierMovementRepository(carrierMovementRepository);
+    graphTraversalService.setLocationRepository(locationRepository);
+    routingService.setGraphTraversalService(graphTraversalService);
   }
 
   public void testCalculatePossibleRoutes() {
     TrackingId trackingId = new TrackingId("ABC");
     Cargo cargo = new Cargo(trackingId, HONGKONG, HELSINKI);
+    RouteSpecification routeSpecification = RouteSpecification.forCargo(cargo, new Date());
 
-    expect(locationRepository.findAll()).andStubReturn(getAll());
-    expect(cargoRepository.find(isA(TrackingId.class))).andReturn(cargo);
     expect(carrierMovementRepository.find(isA(CarrierMovementId.class))).
       andStubReturn(new CarrierMovement(new CarrierMovementId("CM"), CHICAGO, HAMBURG));
     
-    replay(locationRepository, cargoRepository, carrierMovementRepository);
+    replay(carrierMovementRepository);
 
-    List<ItineraryCandidateDTO> candidates = routingService.calculatePossibleRoutes(trackingId, null);
+    List<Itinerary> candidates = routingService.requestPossibleRoutes(routeSpecification);
     assertNotNull(candidates);
     
-    for (ItineraryCandidateDTO itinerary : candidates) {
-      List<LegDTO> legs = itinerary.getLegs();
+    for (Itinerary itinerary : candidates) {
+      List<Leg> legs = itinerary.legs();
       assertNotNull(legs);
       assertFalse(legs.isEmpty());
 
       // Cargo origin and start of first leg should match
-      String firstLegStart = legs.get(0).getFrom();
-      assertEquals(cargo.origin().unLocode().idString(), firstLegStart);
+      assertEquals(cargo.origin(), legs.get(0).from());
 
       // Cargo final destination and last leg stop should match
-      String lastLegStop = legs.get(legs.size() - 1).getTo();
-      assertEquals(cargo.destination().unLocode().idString(), lastLegStop);
+      Location lastLegStop = legs.get(legs.size() - 1).to();
+      assertEquals(cargo.destination(), lastLegStop);
 
       for (int i = 0; i < legs.size() - 1; i++) {
         // Assert that all legs are conencted
-        assertEquals(legs.get(i).getTo(), legs.get(i + 1).getFrom());
+        assertEquals(legs.get(i).to(), legs.get(i + 1).from());
       }
     }
 
-    verify(locationRepository, cargoRepository, carrierMovementRepository);
+    verify(carrierMovementRepository);
   }
 
 }

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

@@ -13,9 +13,7 @@ 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.ItineraryCandidateDTO;
 import se.citerus.dddsample.web.command.TrackCommand;
 
 import java.util.Date;
@@ -116,11 +114,11 @@ public class CargoTrackingControllerTest extends TestCase {
   }
 
   private class EmptyStubCargoService implements CargoService {
-    public TrackingId registerNew(UnLocode origin, UnLocode destination) {
+    public TrackingId registerNewCargo(UnLocode origin, UnLocode destination) {
       return null;
     }
 
-    public List<UnLocode> shippingLocations() {
+    public List<UnLocode> listShippingLocations() {
       return null;
     }
 
@@ -131,15 +129,15 @@ public class CargoTrackingControllerTest extends TestCase {
     public void notify(TrackingId trackingId) {
     }
 
-    public CargoRoutingDTO loadForRouting(TrackingId trackingId) {
+    public Cargo loadCargoForRouting(TrackingId trackingId) {
       return null;
     }
 
-    public List<CargoRoutingDTO> loadAllForRouting() {
+    public List<Cargo> listAllCargos() {
       return null;
     }
 
-    public void assignItinerary(TrackingId trackingId, ItineraryCandidateDTO itinerary) {
+    public void assignCargoToRoute(TrackingId trackingId, Itinerary itinerary) {
     }
 
   }