Split CargoService into BookingService and TrackingService.

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

@@ -4,29 +4,13 @@ import se.citerus.dddsample.domain.Cargo;
 import se.citerus.dddsample.domain.Itinerary;
 import se.citerus.dddsample.domain.TrackingId;
 import se.citerus.dddsample.domain.UnLocode;
-import se.citerus.dddsample.service.dto.CargoTrackingDTO;
 
 import java.util.List;
 
 /**
- * Cargo service.
+ * Cargo booking service.
  */
-public interface CargoService {
-
-  /**
-   * @param trackingId tracking id
-   * @return A cargo and its delivery history, or null if no cargo with given tracking id is found.
-   */
-  CargoTrackingDTO track(TrackingId trackingId);
-
-  /**
-   * Send relevant notifications to interested parties,
-   * for example if a cargo has been misdirected, or unloaded
-   * at the final destination.
-   *
-   * @param trackingId cargo tracking id
-   */
-  void notify(TrackingId trackingId);
+public interface BookingService {
 
   /**
    * @return A list of all locations where the company ships cargo to.
@@ -34,13 +18,6 @@ public interface CargoService {
   List<UnLocode> listShippingLocations();
 
   /**
-   * Lists all cargos.
-   *
-   * @return All cargos.
-   */
-  List<Cargo> listAllCargos();
-
-  /**
    * Registers a new cargo in the tracking system, not yet routed.
    *
    * @param origin      cargo origin
@@ -65,4 +42,11 @@ public interface CargoService {
    */
   void assignCargoToRoute(TrackingId trackingId, Itinerary itinerary);
 
+  /**
+   * Lists all cargos.
+   *
+   * @return All cargos.
+   */
+  List<Cargo> listAllCargos();
+
 }

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

@@ -7,13 +7,11 @@ 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.CargoTrackingDTO;
-import se.citerus.dddsample.service.dto.assembler.CargoTrackingDTOAssembler;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public final class CargoServiceImpl implements CargoService {
+public final class BookingServiceImpl implements BookingService {
 
   private CargoRepository cargoRepository;
   private LocationRepository locationRepository;
@@ -46,40 +44,6 @@ public final class CargoServiceImpl implements CargoService {
     return unlocodes;
   }
 
-  // TODO: move track() and notify() to TrackingService, rename this class BookingService
-  @Transactional(readOnly = true)
-  public CargoTrackingDTO track(final TrackingId trackingId) {
-    Validate.notNull(trackingId);
-
-    final Cargo cargo = cargoRepository.find(trackingId);
-    if (cargo == null) {
-      return null;
-    }
-
-    return new CargoTrackingDTOAssembler().toDTO(cargo);
-  }
-
-  @Transactional(readOnly = true)
-  public void notify(final TrackingId trackingId) {
-    Validate.notNull(trackingId);
-
-    final 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. " +
-        "Last event was " + cargo.deliveryHistory().lastEvent());
-    }
-    if (cargo.isUnloadedAtDestination()) {
-      logger.info("Cargo " + trackingId + " has been unloaded " +
-        "at its final destination " + cargo.destination());
-    }
-  }
-
   @Transactional(readOnly = true)
   public List<Cargo> listAllCargos() {
     final List<Cargo> allCargos = cargoRepository.findAll();

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

@@ -18,7 +18,7 @@ import javax.jms.MessageListener;
  */
 public class HandlingEventMessageDelegate implements MessageListener {
 
-  private CargoService cargoService;
+  private TrackingService trackingService;
   private final Log logger = LogFactory.getLog(getClass());
 
   public void onMessage(final Message message) {
@@ -27,13 +27,13 @@ public class HandlingEventMessageDelegate implements MessageListener {
     }
     try {
       String tidString = message.getStringProperty(JmsEventServiceImpl.TRACKING_ID_KEY);
-      cargoService.notify(new TrackingId(tidString));
+      trackingService.notify(new TrackingId(tidString));
     } catch (JMSException e) {
       logger.error(e, e);
     }
   }
 
-  public void setCargoService(CargoService cargoService) {
-    this.cargoService = cargoService;
+  public void setTrackingService(TrackingService trackingService) {
+    this.trackingService = trackingService;
   }
 }

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

@@ -7,17 +7,17 @@ import se.citerus.dddsample.domain.HandlingEvent;
  */
 public class ThreadBasedEventServiceImpl implements EventService {
 
-  private CargoService cargoService;
+  private TrackingService trackingService;
 
   public void fireHandlingEventRegistered(final HandlingEvent event) {
     new Thread(new Runnable() {
       public void run() {
-        cargoService.notify(event.cargo().trackingId());
+        trackingService.notify(event.cargo().trackingId());
       }
     }).start();
   }
 
-  public void setCargoService(CargoService cargoService) {
-    this.cargoService = cargoService;
+  public void setTrackingService(TrackingService trackingService) {
+    this.trackingService = trackingService;
   }
 }

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

@@ -0,0 +1,27 @@
+package se.citerus.dddsample.service;
+
+import se.citerus.dddsample.domain.TrackingId;
+import se.citerus.dddsample.service.dto.CargoTrackingDTO;
+
+/**
+ * Cargo tracking service.
+ *
+ */
+public interface TrackingService {
+
+  /**
+   * @param trackingId tracking id
+   * @return A cargo and its delivery history, or null if no cargo with given tracking id is found.
+   */
+  CargoTrackingDTO track(TrackingId trackingId);
+
+  /**
+   * Send relevant notifications to interested parties,
+   * for example if a cargo has been misdirected, or unloaded
+   * at the final destination.
+   *
+   * @param trackingId cargo tracking id
+   */
+  void notify(TrackingId trackingId);
+
+}

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

@@ -0,0 +1,56 @@
+package se.citerus.dddsample.service;
+
+import org.apache.commons.lang.Validate;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.transaction.annotation.Transactional;
+import se.citerus.dddsample.domain.Cargo;
+import se.citerus.dddsample.domain.TrackingId;
+import se.citerus.dddsample.repository.CargoRepository;
+import se.citerus.dddsample.service.dto.CargoTrackingDTO;
+import se.citerus.dddsample.service.dto.assembler.CargoTrackingDTOAssembler;
+
+public class TrackingServiceImpl implements TrackingService {
+
+  private CargoRepository cargoRepository;
+
+  private final Log logger = LogFactory.getLog(getClass());
+
+  @Transactional(readOnly = true)
+  public CargoTrackingDTO track(final TrackingId trackingId) {
+    Validate.notNull(trackingId);
+
+    final Cargo cargo = cargoRepository.find(trackingId);
+    if (cargo == null) {
+      return null;
+    }
+
+    return new CargoTrackingDTOAssembler().toDTO(cargo);
+  }
+
+  @Transactional(readOnly = true)
+  public void notify(final TrackingId trackingId) {
+    Validate.notNull(trackingId);
+
+    final 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. " +
+        "Last event was " + cargo.deliveryHistory().lastEvent());
+    }
+    if (cargo.isUnloadedAtDestination()) {
+      logger.info("Cargo " + trackingId + " has been unloaded " +
+        "at its final destination " + cargo.destination());
+    }
+  }
+
+  public void setCargoRepository(CargoRepository cargoRepository) {
+    this.cargoRepository = cargoRepository;
+  }
+
+}

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

@@ -4,7 +4,7 @@ import org.springframework.web.servlet.mvc.multiaction.MultiActionController;
 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.BookingService;
 import se.citerus.dddsample.service.RoutingService;
 import se.citerus.dddsample.service.dto.CargoRoutingDTO;
 import se.citerus.dddsample.service.dto.ItineraryCandidateDTO;
@@ -23,7 +23,7 @@ import java.util.*;
  */
 public final class CargoAdminController extends MultiActionController {
 
-  private CargoService cargoService;
+  private BookingService bookingService;
   private RoutingService routingService;
   private LocationRepository locationRepository;
   private CarrierMovementRepository carrierMovementRepository;
@@ -33,7 +33,7 @@ public final class CargoAdminController extends MultiActionController {
 
   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.listShippingLocations();
+    final List<UnLocode> unLocodes = bookingService.listShippingLocations();
     final List<String> unLocodeStrings = new ArrayList<String>();
 
     for (UnLocode unLocode : unLocodes) {
@@ -47,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.registerNewCargo(
+    final TrackingId trackingId = bookingService.registerNewCargo(
       new UnLocode(command.getOriginUnlocode()),
       new UnLocode(command.getDestinationUnlocode())
     );
@@ -56,7 +56,7 @@ public final class CargoAdminController extends MultiActionController {
 
   public Map list(HttpServletRequest request, HttpServletResponse response) {
     final Map<String, Object> map = new HashMap<String, Object>();
-    final List<Cargo> allCargos = cargoService.listAllCargos();
+    final List<Cargo> allCargos = bookingService.listAllCargos();
 
     final CargoRoutingDTOAssembler assembler = new CargoRoutingDTOAssembler();
     final List<CargoRoutingDTO> dtoList = new ArrayList<CargoRoutingDTO>(allCargos.size());
@@ -72,7 +72,7 @@ public final class CargoAdminController extends MultiActionController {
   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"));
-    final Cargo cargo = cargoService.loadCargoForRouting(trackingId);
+    final Cargo cargo = bookingService.loadCargoForRouting(trackingId);
     final CargoRoutingDTO dto = new CargoRoutingDTOAssembler().toDTO(cargo);
     map.put("cargo", dto);
     return map;
@@ -82,7 +82,7 @@ public final class CargoAdminController extends MultiActionController {
     final Map<String, Object> map = new HashMap<String, Object>();
     final TrackingId trackingId = new TrackingId(request.getParameter("trackingId"));
 
-    final Cargo cargo = cargoService.loadCargoForRouting(trackingId);
+    final Cargo cargo = bookingService.loadCargoForRouting(trackingId);
     final RouteSpecification routeSpecification = RouteSpecification.forCargo(cargo, new Date());
     final List<Itinerary> itineraries = routingService.requestPossibleRoutes(routeSpecification);
 
@@ -114,13 +114,13 @@ public final class CargoAdminController extends MultiActionController {
     final ItineraryCandidateDTO selectedItinerary = new ItineraryCandidateDTO(legDTOs);
     final Itinerary itinerary = new ItineraryCandidateDTOAssembler().fromDTO(selectedItinerary, carrierMovementRepository, locationRepository);
 
-    cargoService.assignCargoToRoute(trackingId, itinerary);
+    bookingService.assignCargoToRoute(trackingId, itinerary);
 
     response.sendRedirect("list.html");
   }
 
-  public void setCargoService(final CargoService cargoService) {
-    this.cargoService = cargoService;
+  public void setBookingService(final BookingService bookingService) {
+    this.bookingService = bookingService;
   }
 
   public void setRoutingService(final RoutingService routingService) {

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

@@ -4,7 +4,7 @@ import org.springframework.validation.BindException;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.SimpleFormController;
 import se.citerus.dddsample.domain.TrackingId;
-import se.citerus.dddsample.service.CargoService;
+import se.citerus.dddsample.service.TrackingService;
 import se.citerus.dddsample.service.dto.CargoTrackingDTO;
 import se.citerus.dddsample.web.command.TrackCommand;
 
@@ -21,7 +21,7 @@ public final class CargoTrackingController extends SimpleFormController {
   /**
    * Service instance.
    */
-  private CargoService cargoService;
+  private TrackingService trackingService;
 
   public CargoTrackingController() {
     setCommandClass(TrackCommand.class);
@@ -33,7 +33,7 @@ public final class CargoTrackingController extends SimpleFormController {
 
     final TrackCommand trackCommand = (TrackCommand) command;
     final String tidStr = trackCommand.getTrackingId();
-    final CargoTrackingDTO cargo = cargoService.track(new TrackingId(tidStr));
+    final CargoTrackingDTO cargo = trackingService.track(new TrackingId(tidStr));
 
     final Map<String, CargoTrackingDTO> model = new HashMap<String, CargoTrackingDTO>();
     if (cargo != null) {
@@ -45,14 +45,7 @@ public final class CargoTrackingController extends SimpleFormController {
     return showForm(request, response, errors, model);
   }
 
-
-  /**
-   * Sets the cargo service instance.
-   *
-   * @param cargoService The service.
-   */
-  public void setCargoService(final CargoService cargoService) {
-    this.cargoService = cargoService;
+  public void setTrackingService(TrackingService trackingService) {
+    this.trackingService = trackingService;
   }
-
 }

dddsample/src/main/resources/context-messaging-jms.xml

@@ -20,7 +20,7 @@
   <amq:topic id="handlingEventTopic" name="HandlingEventTopic" physicalName="HandlingEventTopic"/>
 
   <bean id="handlingEventMessageDelegate" class="se.citerus.dddsample.service.HandlingEventMessageDelegate">
-    <property name="cargoService" ref="cargoService"/>
+    <property name="trackingService" ref="trackingService"/>
   </bean>
 
   <bean id="jmsContainer" class="org.springframework.jms.listener.DefaultMessageListenerContainer">

dddsample/src/main/resources/context-messaging-thread.xml

@@ -5,7 +5,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
   <bean id="eventService" class="se.citerus.dddsample.service.ThreadBasedEventServiceImpl">
-    <property name="cargoService" ref="cargoService"/>
+    <property name="bookingService" ref="bookingService"/>
   </bean>
 
 </beans>

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

@@ -9,11 +9,15 @@
 
   <tx:annotation-driven transaction-manager="transactionManager"/>
 
-  <bean id="cargoService" class="se.citerus.dddsample.service.CargoServiceImpl">
+  <bean id="bookingService" class="se.citerus.dddsample.service.BookingServiceImpl">
     <property name="cargoRepository" ref="cargoRepository"/>
     <property name="locationRepository" ref="locationRepository"/>
   </bean>
 
+  <bean id="trackingService" class="se.citerus.dddsample.service.TrackingServiceImpl">
+    <property name="cargoRepository" ref="cargoRepository"/>
+  </bean>
+
   <bean id="handlingEventService" class="se.citerus.dddsample.service.HandlingEventServiceImpl">
     <property name="cargoRepository" ref="cargoRepository"/>
     <property name="handlingEventRepository" ref="handlingEventRepository"/>

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

@@ -16,15 +16,15 @@
     <property name="commandName" value="trackCommand"/>
     <property name="formView" value="cargo/track"/>
     <property name="successView" value="start"/>
-    <property name="cargoService" ref="cargoService"/>
+    <property name="trackingService" ref="trackingService"/>
     <property name="validator" ref="trackCommandValidator"/>
   </bean>
 
   <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"/>
+    <property name="bookingService" ref="bookingService"/>
     <property name="carrierMovementRepository" ref="carrierMovementRepository"/>
     <property name="locationRepository" ref="locationRepository"/>
   </bean>

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

@@ -0,0 +1,55 @@
+package se.citerus.dddsample.service;
+
+import junit.framework.TestCase;
+import static org.easymock.EasyMock.*;
+import se.citerus.dddsample.domain.Cargo;
+import static se.citerus.dddsample.domain.SampleLocations.CHICAGO;
+import static se.citerus.dddsample.domain.SampleLocations.STOCKHOLM;
+import se.citerus.dddsample.domain.TrackingId;
+import se.citerus.dddsample.domain.UnLocode;
+import se.citerus.dddsample.repository.CargoRepository;
+import se.citerus.dddsample.repository.LocationRepository;
+
+public class BookingServiceTest extends TestCase {
+
+  BookingServiceImpl cargoService;
+  CargoRepository cargoRepository;
+  LocationRepository locationRepository;
+
+  protected void setUp() throws Exception {
+    cargoService = new BookingServiceImpl();
+    cargoRepository = createMock(CargoRepository.class);
+    locationRepository = createMock(LocationRepository.class);
+    cargoService.setCargoRepository(cargoRepository);
+    cargoService.setLocationRepository(locationRepository);
+  }
+
+  public void testRegisterNew() {
+    TrackingId expectedTrackingId = new TrackingId("TRK1");
+    UnLocode fromUnlocode = new UnLocode("USCHI");
+    UnLocode toUnlocode = new UnLocode("SESTO");
+
+    expect(cargoRepository.nextTrackingId()).andReturn(expectedTrackingId);
+    expect(locationRepository.find(fromUnlocode)).andReturn(CHICAGO);
+    expect(locationRepository.find(toUnlocode)).andReturn(STOCKHOLM);
+
+    cargoRepository.save(isA(Cargo.class));
+
+    replay(cargoRepository, locationRepository);
+
+    TrackingId trackingId = cargoService.registerNewCargo(fromUnlocode, toUnlocode);
+    assertEquals(expectedTrackingId, trackingId);
+  }
+
+  public void testRegisterNewNullArguments() {
+    replay(cargoRepository, locationRepository);
+    try {
+      cargoService.registerNewCargo(null, null);
+      fail("Null arguments should not be allowed");
+    } catch (IllegalArgumentException expected) {}
+  }
+
+  protected void tearDown() throws Exception {
+    verify(cargoRepository, locationRepository);
+  }
+}

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

@@ -6,7 +6,6 @@ import se.citerus.dddsample.domain.*;
 import static se.citerus.dddsample.domain.SampleLocations.CHICAGO;
 import static se.citerus.dddsample.domain.SampleLocations.STOCKHOLM;
 import se.citerus.dddsample.repository.CargoRepository;
-import se.citerus.dddsample.repository.LocationRepository;
 import se.citerus.dddsample.service.dto.CargoTrackingDTO;
 import se.citerus.dddsample.service.dto.HandlingEventDTO;
 
@@ -15,19 +14,16 @@ import java.util.Date;
 import java.util.List;
 
 
-public class CargoServiceTest extends TestCase {
+public class TrackingServiceTest extends TestCase {
 
-  CargoServiceImpl cargoService;
+  TrackingServiceImpl cargoService;
   CargoRepository cargoRepository;
-  LocationRepository locationRepository;
 
   protected void setUp() throws Exception {
-    cargoService = new CargoServiceImpl();
+    cargoService = new TrackingServiceImpl();
     cargoRepository = createMock(CargoRepository.class);
-    locationRepository = createMock(LocationRepository.class);
 
     cargoService.setCargoRepository(cargoRepository);
-    cargoService.setLocationRepository(locationRepository);
   }
 
   public void testTrackingScenario() {
@@ -90,32 +86,8 @@ public class CargoServiceTest extends TestCase {
     assertNull(cargoDTO);
   }
 
-  public void testRegisterNew() {
-    TrackingId expectedTrackingId = new TrackingId("TRK1");
-    UnLocode fromUnlocode = new UnLocode("USCHI");
-    UnLocode toUnlocode = new UnLocode("SESTO");
-
-    expect(cargoRepository.nextTrackingId()).andReturn(expectedTrackingId);
-    expect(locationRepository.find(fromUnlocode)).andReturn(CHICAGO);
-    expect(locationRepository.find(toUnlocode)).andReturn(STOCKHOLM);
-
-    cargoRepository.save(isA(Cargo.class));
-
-    replay(cargoRepository, locationRepository);
-    
-    TrackingId trackingId = cargoService.registerNewCargo(fromUnlocode, toUnlocode);
-    assertEquals(expectedTrackingId, trackingId);
-  }
-
-  public void testRegisterNewNullArguments() {
-    try {
-      cargoService.registerNewCargo(null, null);
-      fail("Null arguments should not be allowed");
-    } catch (IllegalArgumentException expected) {}
-  }
-
   protected void onTearDown() throws Exception {
-    verify(cargoRepository, locationRepository);
+    verify(cargoRepository);
   }
 
 }

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

@@ -9,15 +9,17 @@ import org.springframework.validation.BindingResult;
 import org.springframework.validation.Errors;
 import org.springframework.validation.FieldError;
 import org.springframework.web.servlet.ModelAndView;
-import se.citerus.dddsample.domain.*;
+import se.citerus.dddsample.domain.Cargo;
+import se.citerus.dddsample.domain.HandlingEvent;
 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.domain.StatusCode;
+import se.citerus.dddsample.domain.TrackingId;
+import se.citerus.dddsample.service.TrackingService;
 import se.citerus.dddsample.service.dto.CargoTrackingDTO;
 import se.citerus.dddsample.web.command.TrackCommand;
 
 import java.util.Date;
-import java.util.List;
 
 public class CargoTrackingControllerTest extends TestCase {
   CargoTrackingController controller;
@@ -39,8 +41,8 @@ public class CargoTrackingControllerTest extends TestCase {
     controller.setCommandName("test-command-name");
   }
 
-  private CargoService getCargoServiceMock() {
-    return new EmptyStubCargoService() {
+  private TrackingService getCargoServiceMock() {
+    return new EmptyStubTrackingService() {
 
       public CargoTrackingDTO track(TrackingId trackingId) {
         final Cargo cargo = new Cargo(trackingId, HONGKONG, TOKYO);
@@ -64,12 +66,12 @@ public class CargoTrackingControllerTest extends TestCase {
     };
   }
 
-  private CargoService getCargoServiceNullMock() {
-    return new EmptyStubCargoService();
+  private TrackingService getTrackingServiceNullMock() {
+    return new EmptyStubTrackingService();
   }
 
   public void testHandleGet() throws Exception {
-    controller.setCargoService(getCargoServiceMock());
+    controller.setTrackingService(getCargoServiceMock());
     request.setMethod("GET");
 
     ModelAndView mav = controller.handleRequest(request, response);
@@ -80,7 +82,7 @@ public class CargoTrackingControllerTest extends TestCase {
   }
 
   public void testHandlePost() throws Exception {
-    controller.setCargoService(getCargoServiceMock());
+    controller.setTrackingService(getCargoServiceMock());
     request.addParameter("trackingId", "JKL456");
     request.setMethod("POST");
 
@@ -94,7 +96,7 @@ public class CargoTrackingControllerTest extends TestCase {
   }
 
   public void testUnknownCargo() throws Exception {
-    controller.setCargoService(getCargoServiceNullMock());
+    controller.setTrackingService(getTrackingServiceNullMock());
     request.setMethod("POST");
     request.setParameter("trackingId", "unknown-id");
 
@@ -113,32 +115,11 @@ public class CargoTrackingControllerTest extends TestCase {
     assertEquals(command.getTrackingId(), fe.getArguments()[0]);
   }
 
-  private class EmptyStubCargoService implements CargoService {
-    public TrackingId registerNewCargo(UnLocode origin, UnLocode destination) {
-      return null;
-    }
-
-    public List<UnLocode> listShippingLocations() {
-      return null;
-    }
-
+  private class EmptyStubTrackingService implements TrackingService {
     public CargoTrackingDTO track(TrackingId trackingId) {
       return null;
     }
-
     public void notify(TrackingId trackingId) {
     }
-
-    public Cargo loadCargoForRouting(TrackingId trackingId) {
-      return null;
-    }
-
-    public List<Cargo> listAllCargos() {
-      return null;
-    }
-
-    public void assignCargoToRoute(TrackingId trackingId, Itinerary itinerary) {
-    }
-
   }
 }