Compacted DTO assembly a little. Removed mutability from a DTO.

dddsample/tracking/booking-api/src/main/java/se.citerus.dddsample.tracking.booking.api/BookingServiceFacade.java → dddsample/tracking/booking-api/src/main/java/se/citerus/dddsample/temp/BookingServiceFacade.java

@@ -1,8 +1,4 @@
-package se.citerus.dddsample.tracking.booking.api;
-
-import se.citerus.dddsample.tracking.booking.api.dto.CargoRoutingDTO;
-import se.citerus.dddsample.tracking.booking.api.dto.LocationDTO;
-import se.citerus.dddsample.tracking.booking.api.dto.RouteCandidateDTO;
+package se.citerus.dddsample.temp;
 
 import java.rmi.Remote;
 import java.rmi.RemoteException;

dddsample/tracking/booking-api/src/main/java/se.citerus.dddsample.tracking.booking.api/dto/CargoRoutingDTO.java → dddsample/tracking/booking-api/src/main/java/se/citerus/dddsample/temp/CargoRoutingDTO.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.tracking.booking.api.dto;
+package se.citerus.dddsample.temp;
 
 import java.io.Serializable;
 import java.util.ArrayList;
@@ -26,14 +26,16 @@ public final class CargoRoutingDTO implements Serializable {
    * @param finalDestination
    * @param arrivalDeadline
    * @param misrouted
+   * @param legs
    */
-  public CargoRoutingDTO(String trackingId, String origin, String finalDestination, Date arrivalDeadline, boolean misrouted) {
+  public CargoRoutingDTO(final String trackingId, final String origin, final String finalDestination,
+                         final Date arrivalDeadline, final boolean misrouted, final List<LegDTO> legs) {
     this.trackingId = trackingId;
     this.origin = origin;
     this.finalDestination = finalDestination;
     this.arrivalDeadline = arrivalDeadline;
     this.misrouted = misrouted;
-    this.legs = new ArrayList<LegDTO>();
+    this.legs = legs;
   }
 
   public String getTrackingId() {
@@ -48,10 +50,6 @@ public final class CargoRoutingDTO implements Serializable {
     return finalDestination;
   }
 
-  public void addLeg(String voyageNumber, String from, String to, Date loadTime, Date unloadTime) {
-    legs.add(new LegDTO(voyageNumber, from, to, loadTime, unloadTime));
-  }
-
   /**
    * @return An unmodifiable list DTOs.
    */

dddsample/tracking/booking-api/src/main/java/se.citerus.dddsample.tracking.booking.api/dto/LegDTO.java → dddsample/tracking/booking-api/src/main/java/se/citerus/dddsample/temp/LegDTO.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.tracking.booking.api.dto;
+package se.citerus.dddsample.temp;
 
 import java.io.Serializable;
 import java.util.Date;

dddsample/tracking/booking-api/src/main/java/se.citerus.dddsample.tracking.booking.api/dto/LocationDTO.java → dddsample/tracking/booking-api/src/main/java/se/citerus/dddsample/temp/LocationDTO.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.tracking.booking.api.dto;
+package se.citerus.dddsample.temp;
 
 import java.io.Serializable;
 

dddsample/tracking/booking-api/src/main/java/se.citerus.dddsample.tracking.booking.api/dto/RouteCandidateDTO.java → dddsample/tracking/booking-api/src/main/java/se/citerus/dddsample/temp/RouteCandidateDTO.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.tracking.booking.api.dto;
+package se.citerus.dddsample.temp;
 
 import java.io.Serializable;
 import java.util.Collections;

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

@@ -3,11 +3,7 @@ package se.citerus.dddsample.tracking.bookingui.web;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.web.bind.ServletRequestDataBinder;
 import org.springframework.web.servlet.mvc.multiaction.MultiActionController;
-import se.citerus.dddsample.tracking.booking.api.BookingServiceFacade;
-import se.citerus.dddsample.tracking.booking.api.dto.CargoRoutingDTO;
-import se.citerus.dddsample.tracking.booking.api.dto.LegDTO;
-import se.citerus.dddsample.tracking.booking.api.dto.LocationDTO;
-import se.citerus.dddsample.tracking.booking.api.dto.RouteCandidateDTO;
+import se.citerus.dddsample.temp.*;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;

dddsample/tracking/bookingui/src/main/java/se/citerus/dddsample/tracking/bookingui/web/RouteAssignmentCommand.java

@@ -2,6 +2,7 @@ package se.citerus.dddsample.tracking.bookingui.web;
 
 import org.apache.commons.collections.Factory;
 import org.apache.commons.collections.ListUtils;
+import static org.apache.commons.collections.ListUtils.*;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -10,9 +11,9 @@ import java.util.List;
 public class RouteAssignmentCommand {
 
   private String trackingId;
-  private List<LegCommand> legs = ListUtils.lazyList(
-    new ArrayList(), LegCommand.factory()
-  );
+
+  @SuppressWarnings("unchecked")
+  private List<LegCommand> legs = lazyList(new ArrayList<LegCommand>(), LegCommand.factory());
 
   public String getTrackingId() {
     return trackingId;

dddsample/tracking/bookingui/src/main/resources/context-backend.xml

@@ -5,7 +5,7 @@
 
   <bean id="remoteBookingService" class="org.springframework.remoting.rmi.RmiProxyFactoryBean">
     <property name="serviceUrl" value="rmi://localhost:1099/BookingService"/>
-    <property name="serviceInterface" value="se.citerus.dddsample.tracking.booking.api.BookingServiceFacade"/>
+    <property name="serviceInterface" value="se.citerus.dddsample.temp.BookingServiceFacade"/>
   </bean>
 
 </beans>

dddsample/tracking/bookingui/src/test/java/se/citerus/dddsample/tracking/bookingui/CargoAdminControllerTest.java

@@ -4,7 +4,7 @@ import junit.framework.TestCase;
 import org.easymock.EasyMock;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.mock.web.MockHttpServletResponse;
-import se.citerus.dddsample.tracking.booking.api.BookingServiceFacade;
+import se.citerus.dddsample.temp.BookingServiceFacade;
 import se.citerus.dddsample.tracking.bookingui.web.CargoAdminController;
 
 public class CargoAdminControllerTest extends TestCase {

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/interfaces/booking/facade/internal/BookingServiceFacadeImpl.java → dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/interfaces/booking/facade/BookingServiceFacadeImpl.java

@@ -1,9 +1,5 @@
-package se.citerus.dddsample.tracking.core.interfaces.booking.facade.internal;
+package se.citerus.dddsample.tracking.core.interfaces.booking.facade;
 
-import se.citerus.dddsample.tracking.booking.api.BookingServiceFacade;
-import se.citerus.dddsample.tracking.booking.api.dto.CargoRoutingDTO;
-import se.citerus.dddsample.tracking.booking.api.dto.LocationDTO;
-import se.citerus.dddsample.tracking.booking.api.dto.RouteCandidateDTO;
 import se.citerus.dddsample.tracking.core.application.booking.BookingService;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.Cargo;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.CargoRepository;
@@ -13,14 +9,16 @@ import se.citerus.dddsample.tracking.core.domain.model.location.Location;
 import se.citerus.dddsample.tracking.core.domain.model.location.LocationRepository;
 import se.citerus.dddsample.tracking.core.domain.model.location.UnLocode;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageRepository;
-import se.citerus.dddsample.tracking.core.interfaces.booking.facade.internal.assembler.CargoRoutingDTOAssembler;
-import se.citerus.dddsample.tracking.core.interfaces.booking.facade.internal.assembler.ItineraryCandidateDTOAssembler;
-import se.citerus.dddsample.tracking.core.interfaces.booking.facade.internal.assembler.LocationDTOAssembler;
+import static se.citerus.dddsample.tracking.core.interfaces.booking.facade.DTOAssembler.*;
+import se.citerus.dddsample.temp.BookingServiceFacade;
+import se.citerus.dddsample.temp.LocationDTO;
+import se.citerus.dddsample.temp.CargoRoutingDTO;
+import se.citerus.dddsample.temp.RouteCandidateDTO;
 
 import java.rmi.RemoteException;
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.ArrayList;
 
 
 /**
@@ -30,16 +28,23 @@ import java.util.List;
  */
 public class BookingServiceFacadeImpl implements BookingServiceFacade {
 
-  private BookingService bookingService;
-  private LocationRepository locationRepository;
-  private CargoRepository cargoRepository;
-  private VoyageRepository voyageRepository;
+  private final BookingService bookingService;
+  private final LocationRepository locationRepository;
+  private final CargoRepository cargoRepository;
+  private final VoyageRepository voyageRepository;
+
+  public BookingServiceFacadeImpl(final BookingService bookingService, final LocationRepository locationRepository,
+                                  final CargoRepository cargoRepository, final VoyageRepository voyageRepository) {
+    this.bookingService = bookingService;
+    this.locationRepository = locationRepository;
+    this.cargoRepository = cargoRepository;
+    this.voyageRepository = voyageRepository;
+  }
 
   @Override
   public List<LocationDTO> listShippingLocations() {
     final List<Location> allLocations = locationRepository.findAll();
-    final LocationDTOAssembler assembler = new LocationDTOAssembler();
-    return assembler.toDTOList(allLocations);
+    return toDTOList(allLocations);
   }
 
   @Override
@@ -55,13 +60,12 @@ public class BookingServiceFacadeImpl implements BookingServiceFacade {
   @Override
   public CargoRoutingDTO loadCargoForRouting(String trackingId) {
     final Cargo cargo = bookingService.loadCargoForRouting(new TrackingId(trackingId));
-    final CargoRoutingDTOAssembler assembler = new CargoRoutingDTOAssembler();
-    return assembler.toDTO(cargo);
+    return toDTO(cargo);
   }
 
   @Override
   public void assignCargoToRoute(String trackingIdStr, RouteCandidateDTO routeCandidateDTO) {
-    final Itinerary itinerary = new ItineraryCandidateDTOAssembler().fromDTO(routeCandidateDTO, voyageRepository, locationRepository);
+    final Itinerary itinerary = fromDTO(routeCandidateDTO, voyageRepository, locationRepository);
     final TrackingId trackingId = new TrackingId(trackingIdStr);
 
     bookingService.assignCargoToRoute(itinerary, trackingId);
@@ -76,9 +80,8 @@ public class BookingServiceFacadeImpl implements BookingServiceFacade {
   public List<CargoRoutingDTO> listAllCargos() {
     final List<Cargo> cargoList = cargoRepository.findAll();
     final List<CargoRoutingDTO> dtoList = new ArrayList<CargoRoutingDTO>(cargoList.size());
-    final CargoRoutingDTOAssembler assembler = new CargoRoutingDTOAssembler();
     for (Cargo cargo : cargoList) {
-      dtoList.add(assembler.toDTO(cargo));
+      dtoList.add(toDTO(cargo));
     }
     return dtoList;
   }
@@ -88,27 +91,11 @@ public class BookingServiceFacadeImpl implements BookingServiceFacade {
     final List<Itinerary> itineraries = bookingService.requestPossibleRoutesForCargo(new TrackingId(trackingId));
 
     final List<RouteCandidateDTO> routeCandidates = new ArrayList<RouteCandidateDTO>(itineraries.size());
-    final ItineraryCandidateDTOAssembler dtoAssembler = new ItineraryCandidateDTOAssembler();
     for (Itinerary itinerary : itineraries) {
-      routeCandidates.add(dtoAssembler.toDTO(itinerary));
+      routeCandidates.add(toDTO(itinerary));
     }
 
     return routeCandidates;
   }
 
-  public void setBookingService(BookingService bookingService) {
-    this.bookingService = bookingService;
-  }
-
-  public void setLocationRepository(LocationRepository locationRepository) {
-    this.locationRepository = locationRepository;
-  }
-
-  public void setCargoRepository(CargoRepository cargoRepository) {
-    this.cargoRepository = cargoRepository;
-  }
-
-  public void setVoyageRepository(VoyageRepository voyageRepository) {
-    this.voyageRepository = voyageRepository;
-  }
 }

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/interfaces/booking/facade/internal/assembler/ItineraryCandidateDTOAssembler.java → dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/interfaces/booking/facade/DTOAssembler.java

@@ -1,64 +1,111 @@
-package se.citerus.dddsample.tracking.core.interfaces.booking.facade.internal.assembler;
-
-import se.citerus.dddsample.tracking.booking.api.dto.LegDTO;
-import se.citerus.dddsample.tracking.booking.api.dto.RouteCandidateDTO;
-import se.citerus.dddsample.tracking.core.domain.model.cargo.Itinerary;
-import se.citerus.dddsample.tracking.core.domain.model.cargo.Leg;
-import se.citerus.dddsample.tracking.core.domain.model.location.Location;
-import se.citerus.dddsample.tracking.core.domain.model.location.LocationRepository;
-import se.citerus.dddsample.tracking.core.domain.model.location.UnLocode;
-import se.citerus.dddsample.tracking.core.domain.model.voyage.Voyage;
-import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageNumber;
-import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageRepository;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Assembler class for the ItineraryCandidateDTO.
- */
-public class ItineraryCandidateDTOAssembler {
-
-  /**
-   * @param itinerary itinerary
-   * @return A route candidate DTO
-   */
-  public RouteCandidateDTO toDTO(final Itinerary itinerary) {
-    final List<LegDTO> legDTOs = new ArrayList<LegDTO>(itinerary.legs().size());
-    for (Leg leg : itinerary.legs()) {
-      legDTOs.add(toLegDTO(leg));
-    }
-    return new RouteCandidateDTO(legDTOs);
-  }
-
-  /**
-   * @param leg leg
-   * @return A leg DTO
-   */
-  protected LegDTO toLegDTO(final Leg leg) {
-    final VoyageNumber voyageNumber = leg.voyage().voyageNumber();
-    final UnLocode from = leg.loadLocation().unLocode();
-    final UnLocode to = leg.unloadLocation().unLocode();
-    return new LegDTO(voyageNumber.stringValue(), from.stringValue(), to.stringValue(), leg.loadTime(), leg.unloadTime());
-  }
-
-  /**
-   * @param routeCandidateDTO  route candidate DTO
-   * @param voyageRepository   voyage repository
-   * @param locationRepository location repository
-   * @return An itinerary
-   */
-  public Itinerary fromDTO(final RouteCandidateDTO routeCandidateDTO,
-                           final VoyageRepository voyageRepository,
-                           final LocationRepository locationRepository) {
-    final List<Leg> legs = new ArrayList<Leg>(routeCandidateDTO.getLegs().size());
-    for (LegDTO legDTO : routeCandidateDTO.getLegs()) {
-      final VoyageNumber voyageNumber = new VoyageNumber(legDTO.getVoyageNumber());
-      final Voyage voyage = voyageRepository.find(voyageNumber);
-      final Location from = locationRepository.find(new UnLocode(legDTO.getFrom()));
-      final Location to = locationRepository.find(new UnLocode(legDTO.getTo()));
-      legs.add(new Leg(voyage, from, to, legDTO.getLoadTime(), legDTO.getUnloadTime()));
-    }
-    return new Itinerary(legs);
-  }
-}
+package se.citerus.dddsample.tracking.core.interfaces.booking.facade;
+
+import se.citerus.dddsample.tracking.core.domain.model.cargo.Cargo;
+import se.citerus.dddsample.tracking.core.domain.model.cargo.Leg;
+import se.citerus.dddsample.tracking.core.domain.model.cargo.RoutingStatus;
+import se.citerus.dddsample.tracking.core.domain.model.cargo.Itinerary;
+import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageNumber;
+import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageRepository;
+import se.citerus.dddsample.tracking.core.domain.model.voyage.Voyage;
+import se.citerus.dddsample.tracking.core.domain.model.location.UnLocode;
+import se.citerus.dddsample.tracking.core.domain.model.location.LocationRepository;
+import se.citerus.dddsample.tracking.core.domain.model.location.Location;
+import se.citerus.dddsample.temp.CargoRoutingDTO;
+import se.citerus.dddsample.temp.LegDTO;
+import se.citerus.dddsample.temp.RouteCandidateDTO;
+import se.citerus.dddsample.temp.LocationDTO;
+
+import java.util.List;
+import java.util.ArrayList;
+
+final class DTOAssembler {
+
+  /**
+   * @param cargo cargo
+   * @return A cargo routing DTO
+   */
+  static CargoRoutingDTO toDTO(final Cargo cargo) {
+    final List<Leg> legs = cargo.itinerary().legs();
+
+    final List<LegDTO> legDTOList = new ArrayList<LegDTO>(legs.size());
+    for (Leg leg : legs) {
+      final LegDTO legDTO = new LegDTO(
+        leg.voyage().voyageNumber().stringValue(),
+        leg.loadLocation().unLocode().stringValue(),
+        leg.unloadLocation().unLocode().stringValue(),
+        leg.loadTime(),
+        leg.unloadTime());
+      legDTOList.add(legDTO);
+    }
+
+    return new CargoRoutingDTO(
+      cargo.trackingId().stringValue(),
+      cargo.routeSpecification().origin().unLocode().stringValue(),
+      cargo.routeSpecification().destination().unLocode().stringValue(),
+      cargo.routeSpecification().arrivalDeadline(),
+      cargo.routingStatus().sameValueAs(RoutingStatus.MISROUTED),
+      legDTOList
+    );
+  }
+
+  /**
+   * @param itinerary itinerary
+   * @return A route candidate DTO
+   */
+  static RouteCandidateDTO toDTO(final Itinerary itinerary) {
+    final List<LegDTO> legDTOs = new ArrayList<LegDTO>(itinerary.legs().size());
+    for (Leg leg : itinerary.legs()) {
+      legDTOs.add(toLegDTO(leg));
+    }
+    return new RouteCandidateDTO(legDTOs);
+  }
+
+  /**
+   * @param leg leg
+   * @return A leg DTO
+   */
+  static LegDTO toLegDTO(final Leg leg) {
+    final VoyageNumber voyageNumber = leg.voyage().voyageNumber();
+    final UnLocode from = leg.loadLocation().unLocode();
+    final UnLocode to = leg.unloadLocation().unLocode();
+    return new LegDTO(voyageNumber.stringValue(), from.stringValue(), to.stringValue(), leg.loadTime(), leg.unloadTime());
+  }
+
+  /**
+   * @param routeCandidateDTO  route candidate DTO
+   * @param voyageRepository   voyage repository
+   * @param locationRepository location repository
+   * @return An itinerary
+   */
+  static Itinerary fromDTO(final RouteCandidateDTO routeCandidateDTO,
+                           final VoyageRepository voyageRepository,
+                           final LocationRepository locationRepository) {
+    final List<Leg> legs = new ArrayList<Leg>(routeCandidateDTO.getLegs().size());
+    for (LegDTO legDTO : routeCandidateDTO.getLegs()) {
+      final VoyageNumber voyageNumber = new VoyageNumber(legDTO.getVoyageNumber());
+      final Voyage voyage = voyageRepository.find(voyageNumber);
+      final Location from = locationRepository.find(new UnLocode(legDTO.getFrom()));
+      final Location to = locationRepository.find(new UnLocode(legDTO.getTo()));
+      legs.add(new Leg(voyage, from, to, legDTO.getLoadTime(), legDTO.getUnloadTime()));
+    }
+    return new Itinerary(legs);
+  }
+
+  static LocationDTO toDTO(final Location location) {
+    return new LocationDTO(location.unLocode().stringValue(), location.name());
+  }
+
+  static List<LocationDTO> toDTOList(final List<Location> allLocations) {
+    final List<LocationDTO> dtoList = new ArrayList<LocationDTO>(allLocations.size());
+    for (Location location : allLocations) {
+      dtoList.add(toDTO(location));
+    }
+
+    return dtoList;
+  }
+
+  private DTOAssembler() {
+    // Prevent instantiation
+  }
+
+}

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/interfaces/booking/facade/internal/assembler/CargoRoutingDTOAssembler.java

@@ -1,35 +0,0 @@
-package se.citerus.dddsample.tracking.core.interfaces.booking.facade.internal.assembler;
-
-import se.citerus.dddsample.tracking.booking.api.dto.CargoRoutingDTO;
-import se.citerus.dddsample.tracking.core.domain.model.cargo.Cargo;
-import se.citerus.dddsample.tracking.core.domain.model.cargo.Leg;
-import se.citerus.dddsample.tracking.core.domain.model.cargo.RoutingStatus;
-
-/**
- * Assembler class for the CargoRoutingDTO.
- */
-public class CargoRoutingDTOAssembler {
-
-  /**
-   * @param cargo cargo
-   * @return A cargo routing DTO
-   */
-  public CargoRoutingDTO toDTO(final Cargo cargo) {
-    final CargoRoutingDTO dto = new CargoRoutingDTO(
-      cargo.trackingId().stringValue(),
-      cargo.routeSpecification().origin().unLocode().stringValue(),
-      cargo.routeSpecification().destination().unLocode().stringValue(),
-      cargo.routeSpecification().arrivalDeadline(),
-      cargo.routingStatus().sameValueAs(RoutingStatus.MISROUTED));
-    for (Leg leg : cargo.itinerary().legs()) {
-      dto.addLeg(
-        leg.voyage().voyageNumber().stringValue(),
-        leg.loadLocation().unLocode().stringValue(),
-        leg.unloadLocation().unLocode().stringValue(),
-        leg.loadTime(),
-        leg.unloadTime());
-    }
-    return dto;
-  }
-
-}

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/interfaces/booking/facade/internal/assembler/LocationDTOAssembler.java

@@ -1,22 +0,0 @@
-package se.citerus.dddsample.tracking.core.interfaces.booking.facade.internal.assembler;
-
-import se.citerus.dddsample.tracking.booking.api.dto.LocationDTO;
-import se.citerus.dddsample.tracking.core.domain.model.location.Location;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class LocationDTOAssembler {
-
-  public LocationDTO toDTO(Location location) {
-    return new LocationDTO(location.unLocode().stringValue(), location.name());
-  }
-
-  public List<LocationDTO> toDTOList(List<Location> allLocations) {
-    final List<LocationDTO> dtoList = new ArrayList<LocationDTO>(allLocations.size());
-    for (Location location : allLocations) {
-      dtoList.add(toDTO(location));
-    }
-    return dtoList;
-  }
-}

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/interfaces/booking/facade/internal/assembler/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-	DTO assemblers.
-</p>
-</body>
-</html>

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/interfaces/booking/facade/internal/package.html

@@ -1,7 +0,0 @@
-<html>
-<body>
-<p>
-	Internal parts of the remote facade API.
-</p>
-</body>
-</html>

dddsample/tracking/core/src/main/resources/context-interfaces.xml

@@ -64,15 +64,15 @@
     </property>
   </bean>
 
-  <bean id="bookingServiceFacadeTarget" class="se.citerus.dddsample.tracking.core.interfaces.booking.facade.internal.BookingServiceFacadeImpl">
-    <property name="bookingService" ref="bookingService"/>
-    <property name="cargoRepository" ref="cargoRepository"/>
-    <property name="locationRepository" ref="locationRepository"/>
-    <property name="voyageRepository" ref="voyageRepository"/>
+  <bean id="bookingServiceFacadeTarget" class="se.citerus.dddsample.tracking.core.interfaces.booking.facade.BookingServiceFacadeImpl">
+    <constructor-arg ref="bookingService"/>
+    <constructor-arg ref="locationRepository"/>
+    <constructor-arg ref="cargoRepository"/>
+    <constructor-arg ref="voyageRepository"/>
   </bean>
   
   <bean class="org.springframework.remoting.rmi.RmiServiceExporter">
-    <property name="serviceInterface" value="se.citerus.dddsample.tracking.booking.api.BookingServiceFacade"/>
+    <property name="serviceInterface" value="se.citerus.dddsample.temp.BookingServiceFacade"/>
     <property name="service" ref="bookingServiceFacade"/>
     <property name="serviceName" value="BookingService"/>
   </bean>

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/interfaces/booking/facade/DTOAssemblerTest.java

@@ -0,0 +1,150 @@
+package se.citerus.dddsample.tracking.core.interfaces.booking.facade;
+
+import se.citerus.dddsample.tracking.core.domain.model.location.Location;
+import se.citerus.dddsample.tracking.core.domain.model.location.LocationRepository;
+import se.citerus.dddsample.tracking.core.domain.model.location.UnLocode;
+import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.*;
+import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.STOCKHOLM;
+import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.MELBOURNE;
+import se.citerus.dddsample.tracking.core.domain.model.cargo.*;
+import static se.citerus.dddsample.tracking.core.domain.model.voyage.SampleVoyages.CM001;
+import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageRepository;
+import se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory.VoyageRepositoryInMem;
+import se.citerus.dddsample.temp.LegDTO;
+import se.citerus.dddsample.temp.CargoRoutingDTO;
+import se.citerus.dddsample.temp.RouteCandidateDTO;
+import se.citerus.dddsample.temp.LocationDTO;
+
+import java.util.Date;
+import java.util.Arrays;
+import java.util.List;
+import java.util.ArrayList;
+
+import static org.junit.Assert.*;
+import org.junit.Test;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+
+public class DTOAssemblerTest {
+
+  @Test
+  public void toCargoRoutingDTO() throws Exception {
+    final Location origin = STOCKHOLM;
+    final Location destination = MELBOURNE;
+    final Cargo cargo = new Cargo(new TrackingId("XYZ"), new RouteSpecification(origin, destination, new Date()));
+
+    final Itinerary itinerary = new Itinerary(
+      Arrays.asList(
+        new Leg(CM001, origin, SHANGHAI, new Date(), new Date()),
+        new Leg(CM001, ROTTERDAM, destination, new Date(), new Date())
+      )
+    );
+
+    cargo.assignToRoute(itinerary);
+
+    final CargoRoutingDTO dto = DTOAssembler.toDTO(cargo);
+
+    assertEquals(2, dto.getLegs().size());
+
+    LegDTO legDTO = dto.getLegs().get(0);
+    assertEquals("CM001", legDTO.getVoyageNumber());
+    assertEquals("SESTO", legDTO.getFrom());
+    assertEquals("CNSHA", legDTO.getTo());
+
+    legDTO = dto.getLegs().get(1);
+    assertEquals("CM001", legDTO.getVoyageNumber());
+    assertEquals("NLRTM", legDTO.getFrom());
+    assertEquals("AUMEL", legDTO.getTo());
+  }
+
+  @Test
+  public void toCargoDTONoItinerary() throws Exception {
+    final Cargo cargo = new Cargo(new TrackingId("XYZ"), new RouteSpecification(STOCKHOLM, MELBOURNE, new Date()));
+    final CargoRoutingDTO dto = DTOAssembler.toDTO(cargo);
+
+    assertEquals("XYZ", dto.getTrackingId());
+    assertEquals("SESTO", dto.getOrigin());
+    assertEquals("AUMEL", dto.getFinalDestination());
+    assertTrue(dto.getLegs().isEmpty());
+  }
+
+  @Test
+  public void toRouteCandidateDTO() throws Exception {
+    final Location origin = STOCKHOLM;
+    final Location destination = MELBOURNE;
+
+    final Itinerary itinerary = new Itinerary(
+      Arrays.asList(
+        new Leg(CM001, origin, SHANGHAI, new Date(), new Date()),
+        new Leg(CM001, ROTTERDAM, destination, new Date(), new Date())
+      )
+    );
+
+    final RouteCandidateDTO dto = DTOAssembler.toDTO(itinerary);
+
+    assertEquals(2, dto.getLegs().size());
+    LegDTO legDTO = dto.getLegs().get(0);
+    assertEquals("CM001", legDTO.getVoyageNumber());
+    assertEquals("SESTO", legDTO.getFrom());
+    assertEquals("CNSHA", legDTO.getTo());
+
+    legDTO = dto.getLegs().get(1);
+    assertEquals("CM001", legDTO.getVoyageNumber());
+    assertEquals("NLRTM", legDTO.getFrom());
+    assertEquals("AUMEL", legDTO.getTo());
+  }
+
+  @Test
+  public void formRouteCandidateDTO() throws Exception {
+    final List<LegDTO> legs = new ArrayList<LegDTO>();
+    legs.add(new LegDTO("CM001", "AAAAA", "BBBBB", new Date(), new Date()));
+    legs.add(new LegDTO("CM001", "BBBBB", "CCCCC", new Date(), new Date()));
+
+    final LocationRepository locationRepository = createMock(LocationRepository.class);
+    expect(locationRepository.find(new UnLocode("AAAAA"))).andReturn(HONGKONG);
+    expect(locationRepository.find(new UnLocode("BBBBB"))).andReturn(TOKYO).times(2);
+    expect(locationRepository.find(new UnLocode("CCCCC"))).andReturn(CHICAGO);
+
+    final VoyageRepository voyageRepository = new VoyageRepositoryInMem();
+
+    replay(locationRepository);
+
+
+    // Tested call
+    final Itinerary itinerary = DTOAssembler.fromDTO(new RouteCandidateDTO(legs), voyageRepository, locationRepository);
+
+
+    assertNotNull(itinerary);
+    assertNotNull(itinerary.legs());
+    assertEquals(2, itinerary.legs().size());
+
+    final Leg leg1 = itinerary.legs().get(0);
+    assertNotNull(leg1);
+    assertEquals(HONGKONG, leg1.loadLocation());
+    assertEquals(TOKYO, leg1.unloadLocation());
+
+    final Leg leg2 = itinerary.legs().get(1);
+    assertNotNull(leg2);
+    assertEquals(TOKYO, leg2.loadLocation());
+    assertEquals(CHICAGO, leg2.unloadLocation());
+  }
+
+  @Test
+  public void toDTOList() {
+    final List<Location> locationList = Arrays.asList(STOCKHOLM, HAMBURG);
+
+    final List<LocationDTO> dtos = DTOAssembler.toDTOList(locationList);
+
+    assertEquals(2, dtos.size());
+
+    LocationDTO dto = dtos.get(0);
+    assertEquals("SESTO", dto.getUnLocode());
+    assertEquals("Stockholm", dto.getName());
+
+    dto = dtos.get(1);
+    assertEquals("DEHAM", dto.getUnLocode());
+    assertEquals("Hamburg", dto.getName());
+  }
+
+}

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/interfaces/booking/facade/internal/assembler/CargoRoutingDTOAssemblerTest.java

@@ -1,58 +0,0 @@
-package se.citerus.dddsample.tracking.core.interfaces.booking.facade.internal.assembler;
-
-import junit.framework.TestCase;
-import se.citerus.dddsample.tracking.booking.api.dto.CargoRoutingDTO;
-import se.citerus.dddsample.tracking.booking.api.dto.LegDTO;
-import se.citerus.dddsample.tracking.core.domain.model.cargo.*;
-import se.citerus.dddsample.tracking.core.domain.model.location.Location;
-import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.*;
-import static se.citerus.dddsample.tracking.core.domain.model.voyage.SampleVoyages.CM001;
-
-import java.util.Arrays;
-import java.util.Date;
-
-public class CargoRoutingDTOAssemblerTest extends TestCase {
-
-  public void testToDTO() throws Exception {
-    final CargoRoutingDTOAssembler assembler = new CargoRoutingDTOAssembler();
-
-    final Location origin = STOCKHOLM;
-    final Location destination = MELBOURNE;
-    final Cargo cargo = new Cargo(new TrackingId("XYZ"), new RouteSpecification(origin, destination, new Date()));
-
-    final Itinerary itinerary = new Itinerary(
-      Arrays.asList(
-        new Leg(CM001, origin, SHANGHAI, new Date(), new Date()),
-        new Leg(CM001, ROTTERDAM, destination, new Date(), new Date())
-      )
-    );
-
-    cargo.assignToRoute(itinerary);
-
-    final CargoRoutingDTO dto = assembler.toDTO(cargo);
-
-    assertEquals(2, dto.getLegs().size());
-
-    LegDTO legDTO = dto.getLegs().get(0);
-    assertEquals("CM001", legDTO.getVoyageNumber());
-    assertEquals("SESTO", legDTO.getFrom());
-    assertEquals("CNSHA", legDTO.getTo());
-
-    legDTO = dto.getLegs().get(1);
-    assertEquals("CM001", legDTO.getVoyageNumber());
-    assertEquals("NLRTM", legDTO.getFrom());
-    assertEquals("AUMEL", legDTO.getTo());
-  }
-
-  public void testToDTO_NoItinerary() throws Exception {
-    final CargoRoutingDTOAssembler assembler = new CargoRoutingDTOAssembler();
-
-    final Cargo cargo = new Cargo(new TrackingId("XYZ"), new RouteSpecification(STOCKHOLM, MELBOURNE, new Date()));
-    final CargoRoutingDTO dto = assembler.toDTO(cargo);
-
-    assertEquals("XYZ", dto.getTrackingId());
-    assertEquals("SESTO", dto.getOrigin());
-    assertEquals("AUMEL", dto.getFinalDestination());
-    assertTrue(dto.getLegs().isEmpty());
-  }
-}

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/interfaces/booking/facade/internal/assembler/ItineraryCandidateDTOAssemblerTest.java

@@ -1,86 +0,0 @@
-package se.citerus.dddsample.tracking.core.interfaces.booking.facade.internal.assembler;
-
-import junit.framework.TestCase;
-import static org.easymock.EasyMock.*;
-import se.citerus.dddsample.tracking.booking.api.dto.LegDTO;
-import se.citerus.dddsample.tracking.booking.api.dto.RouteCandidateDTO;
-import se.citerus.dddsample.tracking.core.domain.model.cargo.Itinerary;
-import se.citerus.dddsample.tracking.core.domain.model.cargo.Leg;
-import se.citerus.dddsample.tracking.core.domain.model.location.Location;
-import se.citerus.dddsample.tracking.core.domain.model.location.LocationRepository;
-import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.*;
-import se.citerus.dddsample.tracking.core.domain.model.location.UnLocode;
-import static se.citerus.dddsample.tracking.core.domain.model.voyage.SampleVoyages.CM001;
-import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageRepository;
-import se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory.VoyageRepositoryInMem;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-public class ItineraryCandidateDTOAssemblerTest extends TestCase {
-
-  public void testToDTO() throws Exception {
-    final ItineraryCandidateDTOAssembler assembler = new ItineraryCandidateDTOAssembler();
-
-    final Location origin = STOCKHOLM;
-    final Location destination = MELBOURNE;
-
-    final Itinerary itinerary = new Itinerary(
-      Arrays.asList(
-        new Leg(CM001, origin, SHANGHAI, new Date(), new Date()),
-        new Leg(CM001, ROTTERDAM, destination, new Date(), new Date())
-      )
-    );
-
-    final RouteCandidateDTO dto = assembler.toDTO(itinerary);
-
-    assertEquals(2, dto.getLegs().size());
-    LegDTO legDTO = dto.getLegs().get(0);
-    assertEquals("CM001", legDTO.getVoyageNumber());
-    assertEquals("SESTO", legDTO.getFrom());
-    assertEquals("CNSHA", legDTO.getTo());
-
-    legDTO = dto.getLegs().get(1);
-    assertEquals("CM001", legDTO.getVoyageNumber());
-    assertEquals("NLRTM", legDTO.getFrom());
-    assertEquals("AUMEL", legDTO.getTo());
-  }
-
-  public void testFromDTO() throws Exception {
-    final ItineraryCandidateDTOAssembler assembler = new ItineraryCandidateDTOAssembler();
-
-    final List<LegDTO> legs = new ArrayList<LegDTO>();
-    legs.add(new LegDTO("CM001", "AAAAA", "BBBBB", new Date(), new Date()));
-    legs.add(new LegDTO("CM001", "BBBBB", "CCCCC", new Date(), new Date()));
-
-    final LocationRepository locationRepository = createMock(LocationRepository.class);
-    expect(locationRepository.find(new UnLocode("AAAAA"))).andReturn(HONGKONG);
-    expect(locationRepository.find(new UnLocode("BBBBB"))).andReturn(TOKYO).times(2);
-    expect(locationRepository.find(new UnLocode("CCCCC"))).andReturn(CHICAGO);
-
-    final VoyageRepository voyageRepository = new VoyageRepositoryInMem();
-
-    replay(locationRepository);
-
-
-    // Tested call
-    final Itinerary itinerary = assembler.fromDTO(new RouteCandidateDTO(legs), voyageRepository, locationRepository);
-
-
-    assertNotNull(itinerary);
-    assertNotNull(itinerary.legs());
-    assertEquals(2, itinerary.legs().size());
-
-    final Leg leg1 = itinerary.legs().get(0);
-    assertNotNull(leg1);
-    assertEquals(HONGKONG, leg1.loadLocation());
-    assertEquals(TOKYO, leg1.unloadLocation());
-
-    final Leg leg2 = itinerary.legs().get(1);
-    assertNotNull(leg2);
-    assertEquals(TOKYO, leg2.loadLocation());
-    assertEquals(CHICAGO, leg2.unloadLocation());
-  }
-}

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/interfaces/booking/facade/internal/assembler/LocationDTOAssemblerTest.java

@@ -1,31 +0,0 @@
-package se.citerus.dddsample.tracking.core.interfaces.booking.facade.internal.assembler;
-
-import junit.framework.TestCase;
-import se.citerus.dddsample.tracking.booking.api.dto.LocationDTO;
-import se.citerus.dddsample.tracking.core.domain.model.location.Location;
-import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.HAMBURG;
-import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.STOCKHOLM;
-
-import java.util.Arrays;
-import java.util.List;
-
-public class LocationDTOAssemblerTest extends TestCase {
-
-  public void testToDTOList() {
-    final LocationDTOAssembler assembler = new LocationDTOAssembler();
-    final List<Location> locationList = Arrays.asList(STOCKHOLM, HAMBURG);
-
-    final List<LocationDTO> dtos = assembler.toDTOList(locationList);
-
-    assertEquals(2, dtos.size());
-
-    LocationDTO dto = dtos.get(0);
-    assertEquals("SESTO", dto.getUnLocode());
-    assertEquals("Stockholm", dto.getName());
-
-    dto = dtos.get(1);
-    assertEquals("DEHAM", dto.getUnLocode());
-    assertEquals("Hamburg", dto.getName());
-  }
-
-}