HandlingEvent now has a HandlingActivity field internally. HaAct is moved to shared package, as it's being used persistently by both Cargo and HandlingEvent.

Also improved a few toString() methods and added a CargoFactoryTest.

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

@@ -176,12 +176,12 @@ public class Cargo implements Entity<Cargo> {
    */
   @Override
   public int hashCode() {
-    return trackingId().hashCode();
+    return trackingId.hashCode();
   }
 
   @Override
   public String toString() {
-    return trackingId().toString();
+    return trackingId + " (" + routeSpecification + ")";
   }
 
   Cargo() {

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

@@ -8,6 +8,7 @@ import static se.citerus.dddsample.domain.model.cargo.TransportStatus.*;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.domain.model.handling.HandlingHistory;
 import se.citerus.dddsample.domain.model.location.Location;
+import se.citerus.dddsample.domain.model.shared.HandlingActivity;
 import se.citerus.dddsample.domain.model.voyage.Voyage;
 import se.citerus.dddsample.domain.shared.DomainObjectUtils;
 import se.citerus.dddsample.domain.shared.ValueObject;

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

@@ -116,6 +116,11 @@ public class RouteSpecification extends AbstractSpecification<Itinerary> impleme
       toHashCode();
   }
 
+  @Override
+  public String toString() {
+    return origin + " to " + destination + " by " + arrivalDeadline;
+  }
+
   RouteSpecification() {
     // Needed by Hibernate
   }

dddsample/src/main/java/se/citerus/dddsample/domain/model/handling/HandlingEvent.java

@@ -5,6 +5,7 @@ import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.location.Location;
+import se.citerus.dddsample.domain.model.shared.HandlingActivity;
 import se.citerus.dddsample.domain.model.voyage.Voyage;
 import se.citerus.dddsample.domain.shared.DomainEvent;
 import se.citerus.dddsample.domain.shared.DomainObjectUtils;
@@ -30,9 +31,7 @@ import java.util.Date;
  */
 public final class HandlingEvent implements DomainEvent<HandlingEvent> {
 
-  private Type type;
-  private Voyage voyage;
-  private Location location;
+  private HandlingActivity handlingActivity;
   private Date completionTime;
   private Date registrationTime;
   private Cargo cargo;
@@ -105,12 +104,10 @@ public final class HandlingEvent implements DomainEvent<HandlingEvent> {
       throw new IllegalArgumentException("Voyage is not allowed with event type " + type);
     }
 
-    this.voyage = voyage;
     this.completionTime = (Date) completionTime.clone();
     this.registrationTime = (Date) registrationTime.clone();
-    this.type = type;
-    this.location = location;
     this.cargo = cargo;
+    this.handlingActivity = new HandlingActivity(type, location, voyage);
   }
 
   /**
@@ -137,18 +134,16 @@ public final class HandlingEvent implements DomainEvent<HandlingEvent> {
 
     this.completionTime = (Date) completionTime.clone();
     this.registrationTime = (Date) registrationTime.clone();
-    this.type = type;
-    this.location = location;
     this.cargo = cargo;
-    this.voyage = null;
+    this.handlingActivity = new HandlingActivity(type, location);
   }
 
   public Type type() {
-    return this.type;
+    return handlingActivity.type();
   }
 
   public Voyage voyage() {
-    return DomainObjectUtils.nullSafe(this.voyage, Voyage.NONE);
+    return DomainObjectUtils.nullSafe(handlingActivity.voyage(), Voyage.NONE);
   }
 
   public Date completionTime() {
@@ -160,7 +155,7 @@ public final class HandlingEvent implements DomainEvent<HandlingEvent> {
   }
 
   public Location location() {
-    return this.location;
+    return handlingActivity.location();
   }
 
   public Cargo cargo() {
@@ -181,10 +176,8 @@ public final class HandlingEvent implements DomainEvent<HandlingEvent> {
   public boolean sameEventAs(final HandlingEvent other) {
     return other != null && new EqualsBuilder().
       append(this.cargo, other.cargo).
-      append(this.voyage, other.voyage).
       append(this.completionTime, other.completionTime).
-      append(this.location, other.location).
-      append(this.type, other.type).
+      append(this.handlingActivity, other.handlingActivity).
       isEquals();
   }
 
@@ -192,27 +185,17 @@ public final class HandlingEvent implements DomainEvent<HandlingEvent> {
   public int hashCode() {
     return new HashCodeBuilder().
       append(cargo).
-      append(voyage).
       append(completionTime).
-      append(location).
-      append(type).
+      append(handlingActivity).
       toHashCode();
   }
 
   @Override
   public String toString() {
-    final StringBuilder builder = new StringBuilder("\n--- Handling event ---\n").
-      append("Cargo: ").append(cargo.trackingId()).append("\n").
-      append("Type: ").append(type).append("\n").
-      append("Location: ").append(location.name()).append("\n").
-      append("Completed on: ").append(completionTime).append("\n").
-      append("Registered on: ").append(registrationTime).append("\n");
-
-    if (voyage != null) {
-      builder.append("Voyage: ").append(voyage.voyageNumber()).append("\n");
-    }
-
-    return builder.toString();
+    return "Cargo: " + cargo +
+      "\nActivity: " + handlingActivity +
+      "\nCompleted on: " + completionTime +
+      "\nRegistered on: " + registrationTime;
   }
 
   HandlingEvent() {

dddsample/src/main/java/se/citerus/dddsample/domain/model/cargo/HandlingActivity.java → dddsample/src/main/java/se/citerus/dddsample/domain/model/shared/HandlingActivity.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.domain.model.cargo;
+package se.citerus.dddsample.domain.model.shared;
 
 import org.apache.commons.lang.Validate;
 import org.apache.commons.lang.builder.EqualsBuilder;
@@ -12,12 +12,9 @@ import se.citerus.dddsample.domain.shared.ValueObject;
  * A handling activity represents how and where a cargo can be handled,
  * and can be used to express predictions about what is expected to
  * happen to a cargo in the future.
- *
  */
 public class HandlingActivity implements ValueObject<HandlingActivity> {
 
-  // TODO make HandlingActivity a part of HandlingEvent too? There is some overlap. 
-
   private HandlingEvent.Type type;
   private Location location;
   private Voyage voyage;
@@ -89,5 +86,5 @@ public class HandlingActivity implements ValueObject<HandlingActivity> {
   HandlingActivity() {
     // Needed by Hibernate
   }
-  
+
 }

dddsample/src/main/java/se/citerus/dddsample/domain/model/shared/package.html

@@ -0,0 +1,7 @@
+<html>
+<body>
+<p>
+	Value objects that are shared between several aggregates.
+</p>
+</body>
+</html>

dddsample/src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingViewAdapter.java

@@ -3,9 +3,9 @@ package se.citerus.dddsample.interfaces.tracking;
 import org.springframework.context.MessageSource;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.Delivery;
-import se.citerus.dddsample.domain.model.cargo.HandlingActivity;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.domain.model.location.Location;
+import se.citerus.dddsample.domain.model.shared.HandlingActivity;
 import se.citerus.dddsample.domain.model.voyage.Voyage;
 
 import java.text.SimpleDateFormat;

dddsample/src/main/resources/se/citerus/dddsample/infrastructure/persistence/hibernate/HandlingEvent.hbm.xml

@@ -1,24 +1,27 @@
 <?xml version="1.0"?>
 
 <!DOCTYPE hibernate-mapping PUBLIC
-  "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
-  "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
+        "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+        "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd">
 
 <hibernate-mapping default-access="field">
   <class name="se.citerus.dddsample.domain.model.handling.HandlingEvent" table="HandlingEvent">
     <id name="id" column="id">
       <generator class="org.hibernate.id.IdentityGenerator"/>
     </id>
-    <many-to-one name="voyage" column="voyage_id" not-null="false" cascade="none" foreign-key="event_voyage_fk"/>
-    <many-to-one name="location" column="location_id" not-null="true" cascade="none" foreign-key="location_fk"/>
     <many-to-one name="cargo" column="cargo_id" not-null="true" cascade="none" foreign-key="cargo_fk"/>
     <property name="completionTime" column="completionTime" not-null="true"/>
     <property name="registrationTime" column="registrationTime" not-null="true"/>
-    <property name="type" column="type" not-null="true">
-      <type name="org.hibernate.type.EnumType">
-        <param name="enumClass">se.citerus.dddsample.domain.model.handling.HandlingEvent$Type</param>
-        <param name="type">12</param><!-- 12 is java.sql.Types.VARCHAR -->
-      </type>
-    </property>
+    <component name="handlingActivity">
+      <many-to-one name="voyage" column="voyage_id" not-null="false" cascade="none" foreign-key="event_voyage_fk"/>
+      <many-to-one name="location" column="location_id" not-null="true" cascade="none" foreign-key="location_fk"/>
+      <property name="type" column="type" not-null="true">
+        <type name="org.hibernate.type.EnumType">
+          <param name="enumClass">se.citerus.dddsample.domain.model.handling.HandlingEvent$Type</param>
+          <param name="type">12</param>
+          <!-- 12 is java.sql.Types.VARCHAR -->
+        </type>
+      </property>
+    </component>
   </class>
 </hibernate-mapping>

dddsample/src/test/java/se/citerus/dddsample/domain/model/cargo/CargoFactoryTest.java

@@ -0,0 +1,31 @@
+/**
+ * Purpose
+ * @author peter
+ * @created 2009-aug-08
+ * $Id$
+ */
+package se.citerus.dddsample.domain.model.cargo;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import org.junit.Test;
+import static se.citerus.dddsample.application.util.DateTestUtil.toDate;
+import static se.citerus.dddsample.domain.model.location.SampleLocations.HONGKONG;
+import static se.citerus.dddsample.domain.model.location.SampleLocations.ROTTERDAM;
+import se.citerus.dddsample.infrastructure.persistence.inmemory.CargoRepositoryInMem;
+import se.citerus.dddsample.infrastructure.persistence.inmemory.LocationRepositoryInMem;
+
+public class CargoFactoryTest {
+
+  @Test
+  public void createNewCargo() {
+    CargoFactory cargoFactory = new CargoFactory(new CargoRepositoryInMem(), new LocationRepositoryInMem());
+    Cargo cargo = cargoFactory.newCargo(
+      HONGKONG.unLocode(), ROTTERDAM.unLocode(), toDate("2009-07-01")
+    );
+    assertNotNull(cargo);
+    assertNotNull(cargo.trackingId());
+    assertEquals(cargo.routeSpecification(), new RouteSpecification(HONGKONG, ROTTERDAM, toDate("2009-07-01")));
+  }
+
+}

dddsample/src/test/java/se/citerus/dddsample/scenario/CargoLifecycleScenarioTest.java

@@ -13,6 +13,7 @@ import static se.citerus.dddsample.domain.model.handling.HandlingEvent.Type.*;
 import se.citerus.dddsample.domain.model.location.Location;
 import se.citerus.dddsample.domain.model.location.LocationRepository;
 import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
+import se.citerus.dddsample.domain.model.shared.HandlingActivity;
 import static se.citerus.dddsample.domain.model.voyage.SampleVoyages.*;
 import se.citerus.dddsample.domain.model.voyage.Voyage;
 import static se.citerus.dddsample.domain.model.voyage.Voyage.NONE;