Accidentally excluded from previous commit

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

@@ -1,10 +1,10 @@
 package se.citerus.dddsample.service;
 
+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.CargoRoutingDTO;
 import se.citerus.dddsample.service.dto.CargoTrackingDTO;
-import se.citerus.dddsample.service.dto.ItineraryCandidateDTO;
 
 import java.util.List;
 
@@ -14,26 +14,12 @@ import java.util.List;
 public interface CargoService {
 
   /**
-   * Registers a new cargo in the tracking system, not yet routed.
-   *
-   * @param origin      cargo origin
-   * @param destination cargo destination
-   * @return Cargo tracking id
-   */
-  TrackingId registerNew(UnLocode origin, UnLocode destination);
-
-  /**
    * @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);
 
   /**
-   * @return A list of all locations where the company ships cargo to.
-   */
-  List<UnLocode> shippingLocations();
-
-  /**
    * Send relevant notifications to interested parties,
    * for example if a cargo has been misdirected, or unloaded
    * at the final destination.
@@ -43,27 +29,40 @@ public interface CargoService {
   void notify(TrackingId trackingId);
 
   /**
-   * Loads a cargo for routing operations.
+   * @return A list of all locations where the company ships cargo to.
+   */
+  List<UnLocode> listShippingLocations();
+
+  /**
+   * Lists all cargos.
    *
-   * @param trackingId cargo tracking id
-   * @return A cargo with it's itinerary, or null if none found.
+   * @return All cargos.
    */
-  CargoRoutingDTO loadForRouting(TrackingId trackingId);
+  List<Cargo> listAllCargos();
 
   /**
-   * Loads all cargos for routing operations.
+   * Registers a new cargo in the tracking system, not yet routed.
    *
-   * @return All cargos with their itineraries.
+   * @param origin      cargo origin
+   * @param destination cargo destination
+   * @return Cargo tracking id
+   */
+  TrackingId registerNewCargo(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.
    */
-  List<CargoRoutingDTO> loadAllForRouting();
+  Cargo loadCargoForRouting(TrackingId trackingId);
 
   /**
-   * Assigns a new itinerary to a cargo,
-   * based on this list of legs.
+   * Assigns a cargo to route.
    *
    * @param trackingId cargo tracking id
-   * @param itinerary  the new itinerary, from a selection
+   * @param itinerary  the new itinerary describing the route
    */
-  void assignItinerary(TrackingId trackingId, ItineraryCandidateDTO itinerary);
+  void assignCargoToRoute(TrackingId trackingId, Itinerary itinerary);
 
 }