Use UnLocode in CargoService.shippingLocations signature

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

@@ -32,7 +32,7 @@ public interface CargoService {
   /**
    * @return A list of all locations where the company ships cargo to.
    */
-  List<String> shippingLocations();
+  List<UnLocode> shippingLocations();
 
   /**
    * Send relevant notifications to interested parties,

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

@@ -39,11 +39,11 @@ public class CargoServiceImpl implements CargoService {
   }
 
   @Transactional(readOnly = true)
-  public List<String> shippingLocations() {
+  public List<UnLocode> shippingLocations() {
     List<Location> allLocations = locationRepository.findAll();
-    List<String> unlocodes = new ArrayList<String>(allLocations.size());
+    List<UnLocode> unlocodes = new ArrayList<UnLocode>(allLocations.size());
     for (Location location : allLocations) {
-      unlocodes.add(location.unLocode().idString());
+      unlocodes.add(location.unLocode());
     }
     return unlocodes;
   }
@@ -177,7 +177,8 @@ public class CargoServiceImpl implements CargoService {
         locationRepository.find(new UnLocode(legDTO.getTo())))
       );
     }
-
+    // TODO: delete orphaned itineraries manually.
+    // Can't cascade delete-orphan for many-to-one using mapping directives.
     cargo.setItinerary(new Itinerary(legs));
     cargoRepository.save(cargo);
   }

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

@@ -29,7 +29,12 @@ public class CargoAdminController extends MultiActionController {
 
   public Map registrationForm(HttpServletRequest request, HttpServletResponse response) throws Exception {
     Map map = new HashMap();
-    map.put("unlocodes", cargoService.shippingLocations());
+    List<UnLocode> unLocodes = cargoService.shippingLocations();
+    List<String> unLocodeStrings = new ArrayList<String>();
+    for (UnLocode unLocode : unLocodes) {
+      unLocodeStrings.add(unLocode.idString());
+    }
+    map.put("unlocodes", unLocodeStrings);
     return map;
   }
 

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

@@ -51,6 +51,9 @@ public class CargoServiceTest extends AbstractDependencyInjectionSpringContextTe
     this.sessionFactory = sessionFactory;
   }
 
+  // TODO: scrap the mock-persistence-context altogether, don't bother verifying transactions.
+  // TODO: use mocks instead of stubs in this test
+
   protected void onSetUp() {
     Session session = createMock(Session.class);
     Connection connection = createMock(Connection.class);

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

@@ -123,7 +123,7 @@ public class CargoTrackingControllerTest extends TestCase {
       return null;
     }
 
-    public List<String> shippingLocations() {
+    public List<UnLocode> shippingLocations() {
       return null;
     }