Fixed a few Hibernate issues: tracking id sequence, null itinerary after load when legs collection is empty.

dddsample/tracking/core/pom.xml

@@ -8,6 +8,9 @@
     <artifactId>tracking</artifactId>
     <version>1.2-SNAPSHOT</version>
   </parent>
+  <properties>
+    <jetty.port>8082</jetty.port>
+  </properties>
   <packaging>war</packaging>
   <name>Tracking context: Core</name>
   <version>${project.parent.version}</version>

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/model/handling/HandlingHistory.java

@@ -11,6 +11,8 @@ import static java.util.Collections.sort;
 
 /**
  * The handling history of a cargo.
+ *
+ * TODO eliminate from 1.2
  */
 public class HandlingHistory implements ValueObject<HandlingHistory> {
 

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/infrastructure/persistence/hibernate/CargoPostLoadEventListener.java

@@ -0,0 +1,44 @@
+package se.citerus.dddsample.tracking.core.infrastructure.persistence.hibernate;
+
+import org.hibernate.event.PostLoadEvent;
+import org.hibernate.event.def.DefaultPostLoadEventListener;
+import se.citerus.dddsample.tracking.core.domain.model.cargo.Cargo;
+
+import java.lang.reflect.Field;
+
+public class CargoPostLoadEventListener extends DefaultPostLoadEventListener {
+
+  private static final Field ITINERARY_FIELD;
+  static {
+    try {
+      ITINERARY_FIELD = Cargo.class.getDeclaredField("itinerary");
+      ITINERARY_FIELD.setAccessible(true);
+    } catch (NoSuchFieldException e) {
+      throw new AssertionError(e);
+    }
+  }
+
+  @Override
+  public void onPostLoad(PostLoadEvent event) {
+    if (event.getEntity() instanceof Cargo) {
+      /*
+       * Itinerary is a column-less component with a collection field,
+       * and there's no way (that I know of) to map this behaviour in metadata.
+       *
+       * Hibernate is all about reflection, so helping the mapping along with
+       * another field manipulation is OK. This avoids the need for a public method
+       * on Cargo.
+       */
+      Cargo cargo = (Cargo) event.getEntity();
+      if (cargo.itinerary() != null && cargo.itinerary().legs().isEmpty()) {
+        try {
+          ITINERARY_FIELD.set(cargo, null);
+        } catch (IllegalAccessException e) {
+          throw new RuntimeException(e);
+        }
+      }
+    }
+    super.onPostLoad(event);
+  }
+
+}

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/infrastructure/persistence/hibernate/DatabaseTrackingIdFactory.java

@@ -6,12 +6,20 @@
  */
 package se.citerus.dddsample.tracking.core.infrastructure.persistence.hibernate;
 
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
 import org.hibernate.SessionFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.orm.hibernate3.HibernateCallback;
+import org.springframework.orm.hibernate3.HibernateTemplate;
 import org.springframework.stereotype.Repository;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingId;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingIdFactory;
 
+import javax.annotation.PostConstruct;
+import java.math.BigInteger;
+import java.sql.SQLException;
+
 @Repository
 public class DatabaseTrackingIdFactory implements TrackingIdFactory {
 
@@ -23,14 +31,26 @@ public class DatabaseTrackingIdFactory implements TrackingIdFactory {
     this.sessionFactory = sessionFactory;
   }
 
+  @PostConstruct
+  public void createSequence() {
+    final HibernateTemplate template = new HibernateTemplate(sessionFactory);
+    final HibernateCallback callback = new HibernateCallback() {
+      @Override
+      public Object doInHibernate(final Session session) throws HibernateException, SQLException {
+        return session.createSQLQuery("create sequence " + SEQUENCE_NAME + " as bigint start with 1").executeUpdate();
+      }
+    };
+
+    template.execute(callback);
+  }
+
   @Override
   public TrackingId nextTrackingId() {
-    final Long seq = (Long) sessionFactory.getCurrentSession().
-      createSQLQuery("select next_value from system_sequences where sequence_name = ?").
-      setParameter(1, SEQUENCE_NAME).
+    final BigInteger seq = (BigInteger) sessionFactory.getCurrentSession().
+      createSQLQuery("call next value for " + SEQUENCE_NAME).
       uniqueResult();
 
-    return new TrackingId(seq);
+    return new TrackingId(seq.longValue());
   }
 
 }

dddsample/tracking/core/src/main/resources/contexts/context-infrastructure-persistence.xml

@@ -24,8 +24,15 @@
   <bean id="sessionFactory" class="org.springframework.orm.hibernate3.LocalSessionFactoryBean">
     <property name="dataSource" ref="dataSource"/>
     <property name="configLocation" value="classpath:hibernate.cfg.xml"/>
+    <property name="eventListeners">
+      <map>
+        <entry key="post-load" value-ref="cargoPostLoadEventListener"/>
+      </map>
+    </property>
   </bean>
 
+  <bean id="cargoPostLoadEventListener" class="se.citerus.dddsample.tracking.core.infrastructure.persistence.hibernate.CargoPostLoadEventListener"/>
+
   <bean id="transactionManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager">
     <property name="sessionFactory" ref="sessionFactory"/>
   </bean>

dddsample/tracking/core/src/main/resources/se/citerus/dddsample/tracking/core/infrastructure/persistence/hibernate/Cargo.hbm.xml

@@ -28,7 +28,6 @@
     </component>
 
     <component name="itinerary">
-      <!-- cascade=all-delete-orphan would be better, but it doesn't seem to work inside a component -->
       <list name="legs" lazy="true" cascade="all">
         <key column="cargo_id" foreign-key="itinerary_fk"/>
         <index column="leg_index"/>

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/infrastructure/persistence/hibernate/CargoRepositoryTest.java

@@ -107,6 +107,12 @@ public class CargoRepositoryTest extends AbstractRepositoryTest {
     Cargo cargo = new Cargo(trackingId, new RouteSpecification(origin, destination, new Date()));
     cargoRepository.store(cargo);
 
+    getSession().flush();
+    getSession().clear();
+
+    cargo = cargoRepository.find(trackingId);
+    assertNull(cargo.itinerary());
+
     cargo.assignToRoute(new Itinerary(
       Leg.deriveLeg(
         voyageRepository.find(new VoyageNumber("0101")),

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/infrastructure/persistence/hibernate/DatabaseTrackingIdFactoryTest.java

@@ -0,0 +1,22 @@
+package se.citerus.dddsample.tracking.core.infrastructure.persistence.hibernate;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingId;
+
+/**
+ *
+ */
+public class DatabaseTrackingIdFactoryTest extends AbstractRepositoryTest {
+
+  @Autowired
+  DatabaseTrackingIdFactory trackingIdFactory;
+
+  public void testNext() throws Exception {
+    TrackingId id1 = trackingIdFactory.nextTrackingId();
+    TrackingId id2 = trackingIdFactory.nextTrackingId();
+    assertNotNull(id1);
+    assertNotNull(id2);
+    assertFalse(id1.equals(id2));
+  }
+
+}