Fixed bug when trying to find a nonexisting cargo.

dddsample/src/main/java/se/citerus/dddsample/application/persistence/CargoRepositoryHibernate.java

@@ -22,11 +22,17 @@ public class CargoRepositoryHibernate extends HibernateRepository implements Car
     // Query for id and then perform a standard load()
     // to use metadata-defined query and lazy proxy access
     Long id = (Long) getSession().
-            createQuery("select id from Cargo where trackingId = :tid").
-            setParameter("tid", tid).
-            uniqueResult();
+       createQuery("select id from Cargo where trackingId = :tid").
+       setParameter("tid", tid).
+       uniqueResult();
+
+    if (id != null) {
+      return (Cargo) getSession().get(Cargo.class, id);
+    } else {
+      return null;
+    }
+
 
-    return (Cargo) getSession().load(Cargo.class, id);
   }
 
   public void save(Cargo cargo) {
@@ -35,8 +41,8 @@ public class CargoRepositoryHibernate extends HibernateRepository implements Car
     // Delete orphaned itineraries - conceptually the responsibility
     // of the Cargo aggregate
     final List<Itinerary> orphans = getSession().
-      createQuery("from Itinerary where cargo = null").
-      list();
+       createQuery("from Itinerary where cargo = null").
+       list();
     for (Itinerary orphan : orphans) {
       getSession().delete(orphan);
     }
@@ -45,7 +51,7 @@ public class CargoRepositoryHibernate extends HibernateRepository implements Car
   public TrackingId nextTrackingId() {
     final String random = UUID.randomUUID().toString().toUpperCase();
     return new TrackingId(
-      random.substring(0, random.indexOf("-"))
+       random.substring(0, random.indexOf("-"))
     );
   }
 

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/CargoRepository.java

@@ -8,7 +8,7 @@ public interface CargoRepository {
    * Finds a cargo using given id.
    *
    * @param trackingId Id
-   * @return Cargo
+   * @return Cargo if found, else {@code null}
    */
   Cargo find(TrackingId trackingId);
 

dddsample/src/test/java/se/citerus/dddsample/application/persistence/CargoRepositoryTest.java

@@ -85,6 +85,10 @@ public class CargoRepositoryTest extends AbstractRepositoryTest {
     assertEquals(cargo, event.cargo());
   }
 
+  public void testFindByCargoIdUnknownId() {
+    assertNull(cargoRepository.find(new TrackingId("UNKNOWN")));
+  }
+
   private void assertLeg(Leg firstLeg, String cmId, Location expectedFrom, Location expectedTo) {
     assertEquals(new CarrierMovementId(cmId), firstLeg.carrierMovement().carrierMovementId());
     assertEquals(expectedFrom, firstLeg.from());