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

peterbacklund · peterbacklund · commit 41f76db69e1b · 2008-08-27T18:30:26.000Z
Also, there's no "load for routing" in the ubiquitous language as it's a technical aspect.
diff --git a/dddsample/src/main/java/se/citerus/dddsample/application/remoting/BookingServiceFacadeImpl.java b/dddsample/src/main/java/se/citerus/dddsample/application/remoting/BookingServiceFacadeImpl.java
@@ -47,14 +47,16 @@ public String registerNewCargo(String origin, String destination) {
   }
 
   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);
   }
 
   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() {
diff --git a/dddsample/src/main/java/se/citerus/dddsample/domain/service/BookingService.java b/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;
@@ -21,14 +20,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.
    * 
diff --git a/dddsample/src/main/java/se/citerus/dddsample/domain/service/impl/BookingServiceImpl.java b/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 TrackingId bookNewCargo(final UnLocode originUnLocode, final UnLocode des
   }
 
   @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 void assignCargoToRoute(final TrackingId trackingId, final Itinerary newI
     cargoRepository.save(cargo);
 
     logger.info("Assigned cargo " + trackingId + " to new route");
-
-    // TODO
-    //lockManager.unlockCargo(cargoLock, trackingId);
   }
 
   public void setCargoRepository(final CargoRepository cargoRepository) {

Original file line number	Diff line number	Diff line change
`@@ -47,14 +47,16 @@ public String registerNewCargo(String origin, String destination) {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`public CargoRoutingDTO loadCargoForRouting(String trackingId) {`
`50`		`- final Cargo cargo = bookingService.loadCargoForRouting(new TrackingId(trackingId));`
	`50`	`+ // TODO lock`
	`51`	`+ final Cargo cargo = cargoRepository.find(new TrackingId(trackingId));`
`51`	`52`	`final CargoRoutingDTOAssembler assembler = new CargoRoutingDTOAssembler();`
`52`	`53`	`return assembler.toDTO(cargo);`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`public void assignCargoToRoute(String trackingId, ItineraryCandidateDTO itineraryCandidateDTO) {`
`56`	`57`	`final Itinerary itinerary = new ItineraryCandidateDTOAssembler().fromDTO(itineraryCandidateDTO, carrierMovementRepository, locationRepository);`
`57`	`58`	`bookingService.assignCargoToRoute(new TrackingId(trackingId), itinerary);`
	`59`	`+ // TODO unlock`
`58`	`60`	`}`
`59`	`61`
`60`	`62`	`public List<CargoRoutingDTO> listAllCargos() {`