Mistakenly omitted a few files.

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

@@ -35,6 +35,7 @@ public final class HandlingEvent implements DomainEvent<HandlingEvent> {
   private Date completionTime;
   private Date registrationTime;
   private Cargo cargo;
+  private OperatorCode operatorCode;
 
   /**
    * Handling event type. Either requires or prohibits a carrier movement
@@ -89,6 +90,7 @@ public final class HandlingEvent implements DomainEvent<HandlingEvent> {
    * @param type             type of event
    * @param location         where the event took place
    * @param voyage           the voyage
+   * @param operatorCode     operator code for port operator
    */
   // TODO make package local
   public HandlingEvent(final Cargo cargo,
@@ -96,13 +98,15 @@ public final class HandlingEvent implements DomainEvent<HandlingEvent> {
                        final Date registrationTime,
                        final Type type,
                        final Location location,
-                       final Voyage voyage) {
+                       final Voyage voyage,
+                       final OperatorCode operatorCode) {
     Validate.notNull(cargo, "Cargo is required");
     Validate.notNull(completionTime, "Completion time is required");
     Validate.notNull(registrationTime, "Registration time is required");
     Validate.notNull(type, "Handling event type is required");
     Validate.notNull(location, "Location is required");
     Validate.notNull(voyage, "Voyage is required");
+    Validate.notNull(operatorCode, "Operator code is required");
 
     if (!type.isVoyageRelated()) {
       throw new IllegalArgumentException("Voyage is not allowed with event type " + type);
@@ -113,6 +117,7 @@ public final class HandlingEvent implements DomainEvent<HandlingEvent> {
     this.completionTime = new Date(completionTime.getTime());
     this.registrationTime = new Date(registrationTime.getTime());
     this.activity = new HandlingActivity(type, location, voyage);
+    this.operatorCode = operatorCode;
   }
 
   /**

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

@@ -35,13 +35,15 @@ public class HandlingEventFactory {
    * @param voyageNumber     voyage number
    * @param unlocode         United Nations Location Code for the location of the event
    * @param type             type of event
+   * @param operatorCode     operator code
    * @return A handling event.
    * @throws UnknownVoyageException   if there's no voyage with this number
    * @throws UnknownCargoException    if there's no cargo with this tracking id
    * @throws UnknownLocationException if there's no location with this UN Locode
    */
   public HandlingEvent createHandlingEvent(final Date completionTime, final TrackingId trackingId,
-                                           final VoyageNumber voyageNumber, final UnLocode unlocode, final HandlingEvent.Type type)
+                                           final VoyageNumber voyageNumber, final UnLocode unlocode,
+                                           final HandlingEvent.Type type, final OperatorCode operatorCode)
     throws CannotCreateHandlingEventException {
 
     final Cargo cargo = findCargo(trackingId);
@@ -53,7 +55,7 @@ public class HandlingEventFactory {
       if (voyage == null) {
         return new HandlingEvent(cargo, completionTime, registrationTime, type, location);
       } else {
-        return new HandlingEvent(cargo, completionTime, registrationTime, type, location, voyage);
+        return new HandlingEvent(cargo, completionTime, registrationTime, type, location, voyage, operatorCode);
       }
     } catch (Exception e) {
       throw new CannotCreateHandlingEventException(e);

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

@@ -0,0 +1,40 @@
+package se.citerus.dddsample.tracking.core.domain.model.handling;
+
+import org.apache.commons.lang.Validate;
+import se.citerus.dddsample.tracking.core.domain.patterns.valueobject.ValueObjectSupport;
+
+/**
+ * Port operators are assigned an operator code.
+ */
+public class OperatorCode extends ValueObjectSupport<OperatorCode> {
+
+  private final String code;
+
+  /**
+   * Constructor.
+   *
+   * @param code code, three letters (ex: "AGH")
+   */
+  public OperatorCode(final String code) {
+    Validate.notEmpty(code, "Code is required");
+    Validate.isTrue(code.length() == 5, "Operator codes must be exactly five letters: " + code);
+    this.code = code;
+  }
+
+  /**
+   * @return The operator code as a String
+   */
+  public String stringValue() {
+    return code;
+  }
+
+  @Override
+  public String toString() {
+    return stringValue();
+  }
+
+  OperatorCode() {
+    // Needed by Hibernate
+    code = null;
+  }
+}

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

@@ -15,7 +15,10 @@
     <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"/>
-    <component name="activity">
+    <component name="operatorCode" update="false">
+      <property name="code" column="operator_code" not-null="false" length="3"/>
+    </component>
+    <component name="activity" update="false">
       <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">

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/domain/model/handling/HandlingEventFactoryTest.java

@@ -49,7 +49,7 @@ public class HandlingEventFactoryTest extends TestCase {
     VoyageNumber voyageNumber = CM001.voyageNumber();
     UnLocode unLocode = STOCKHOLM.unLocode();
     HandlingEvent handlingEvent = factory.createHandlingEvent(
-      new Date(100), trackingId, voyageNumber, unLocode, Type.LOAD
+      new Date(100), trackingId, voyageNumber, unLocode, Type.LOAD, new OperatorCode("ABCDE")
     );
 
     assertNotNull(handlingEvent);
@@ -67,7 +67,7 @@ public class HandlingEventFactoryTest extends TestCase {
 
     UnLocode unLocode = STOCKHOLM.unLocode();
     HandlingEvent handlingEvent = factory.createHandlingEvent(
-      new Date(100), trackingId, null, unLocode, Type.CLAIM
+      new Date(100), trackingId, null, unLocode, Type.CLAIM, new OperatorCode("ABCDE")
     );
 
     assertNotNull(handlingEvent);
@@ -86,7 +86,7 @@ public class HandlingEventFactoryTest extends TestCase {
     UnLocode invalid = new UnLocode("NOEXT");
     try {
       factory.createHandlingEvent(
-        new Date(100), trackingId, CM001.voyageNumber(), invalid, Type.LOAD
+        new Date(100), trackingId, CM001.voyageNumber(), invalid, Type.LOAD, new OperatorCode("ABCDE")
       );
       fail("Expected UnknownLocationException");
     } catch (UnknownLocationException expected) {
@@ -101,7 +101,7 @@ public class HandlingEventFactoryTest extends TestCase {
     try {
       VoyageNumber invalid = new VoyageNumber("XXX");
       factory.createHandlingEvent(
-        new Date(100), trackingId, invalid, STOCKHOLM.unLocode(), Type.LOAD
+        new Date(100), trackingId, invalid, STOCKHOLM.unLocode(), Type.LOAD, new OperatorCode("ABCDE")
       );
       fail("Expected UnknownVoyageException");
     } catch (UnknownVoyageException expected) {
@@ -115,7 +115,7 @@ public class HandlingEventFactoryTest extends TestCase {
 
     try {
       factory.createHandlingEvent(
-        new Date(100), trackingId, CM001.voyageNumber(), STOCKHOLM.unLocode(), Type.LOAD
+        new Date(100), trackingId, CM001.voyageNumber(), STOCKHOLM.unLocode(), Type.LOAD, new OperatorCode("ABCDE")
       );
       fail("Expected UnknownCargoException");
     } catch (UnknownCargoException expected) {