Removed loadForRouting() from domain service layer, since it only delegated to repository. Remote facade in application layer now calls repository directly.

Also, there's no "load for routing" in the ubiquitous language as it's a technical aspect.

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

@@ -47,7 +47,8 @@ public class BookingServiceFacadeImpl implements BookingServiceFacade {
   }
 
   public CargoRoutingDTO loadCargoForRouting(String trackingId) {
-    final Cargo cargo = bookingService.loadCargoForRouting(new TrackingId(trackingId));
+    // TODO lock
+    final Cargo cargo = cargoRepository.find(new TrackingId(trackingId));
     final CargoRoutingDTOAssembler assembler = new CargoRoutingDTOAssembler();
     return assembler.toDTO(cargo);
   }
@@ -55,6 +56,7 @@ public class BookingServiceFacadeImpl implements BookingServiceFacade {
   public void assignCargoToRoute(String trackingId, ItineraryCandidateDTO itineraryCandidateDTO) {
     final Itinerary itinerary = new ItineraryCandidateDTOAssembler().fromDTO(itineraryCandidateDTO, carrierMovementRepository, locationRepository);
     bookingService.assignCargoToRoute(new TrackingId(trackingId), itinerary);
+    // TODO unlock
   }
 
   public List<CargoRoutingDTO> listAllCargos() {

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

@@ -1,6 +1,5 @@
 package se.citerus.dddsample.domain.service;
 
-import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.Itinerary;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
 import se.citerus.dddsample.domain.model.location.UnLocode;
@@ -22,14 +21,6 @@ public interface BookingService {
   TrackingId bookNewCargo(UnLocode origin, UnLocode destination);
 
   /**
-   * Loads a cargo for routing operations.
-   *
-   * @param trackingId cargo tracking id
-   * @return A cargo with it's itinerary, or null if none found.
-   */
-  Cargo loadCargoForRouting(TrackingId trackingId);
-
-  /**
    * Requests a list of itineraries describing possible routes for this cargo.
    * 
    * @param trackingId cargo tracking id

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

@@ -19,8 +19,6 @@ public final class BookingServiceImpl implements BookingService {
   private CargoRepository cargoRepository;
   private LocationRepository locationRepository;
   private RoutingService routingService;
-  // TODO
-  //private LockManager lockManager;
 
   private final Log logger = LogFactory.getLog(getClass());
 
@@ -41,20 +39,10 @@ public final class BookingServiceImpl implements BookingService {
   }
 
   @Transactional(readOnly = true)
-  public Cargo loadCargoForRouting(final TrackingId trackingId) {
+  public List<Itinerary> requestPossibleRoutesForCargo(TrackingId trackingId) {
     Validate.notNull(trackingId);
-
-    // TODO
-    //CargoLock cargoLock = lockManager.lockCargo(trackingId);
-
+    
     final Cargo cargo = cargoRepository.find(trackingId);
-
-    return cargo;
-  }
-
-  @Transactional(readOnly = true)
-  public List<Itinerary> requestPossibleRoutesForCargo(TrackingId trackingId) {
-    final Cargo cargo = loadCargoForRouting(trackingId);
     final RouteSpecification routeSpecification = RouteSpecification.forCargo(cargo, new Date());
 
     return routingService.fetchRoutesForSpecification(routeSpecification);
@@ -74,9 +62,6 @@ public final class BookingServiceImpl implements BookingService {
     cargoRepository.save(cargo);
 
     logger.info("Assigned cargo " + trackingId + " to new route");
-
-    // TODO
-    //lockManager.unlockCargo(cargoLock, trackingId);
   }
 
   public void setCargoRepository(final CargoRepository cargoRepository) {