Introduced OperatorCode on HandlingEvent to align it more closely with the domain event pattern.

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/application/handling/HandlingEventService.java

 import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingId;
 import se.citerus.dddsample.tracking.core.domain.model.handling.CannotCreateHandlingEventException;
 import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent;
+import se.citerus.dddsample.tracking.core.domain.model.handling.OperatorCode;
 import se.citerus.dddsample.tracking.core.domain.model.location.UnLocode;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageNumber;
 
    * @param voyageNumber   voyage number
    * @param unLocode       UN locode for the location where the event occurred
    * @param type           type of event
+   * @param operatorCode
    * @throws se.citerus.dddsample.tracking.core.domain.model.handling.CannotCreateHandlingEventException
    *          if a handling event that represents an actual event that's relevant to a cargo we're tracking
    *          can't be created from the parameters
                              TrackingId trackingId,
                              VoyageNumber voyageNumber,
                              UnLocode unLocode,
-                             HandlingEvent.Type type) throws CannotCreateHandlingEventException;
+                             HandlingEvent.Type type, OperatorCode operatorCode) throws CannotCreateHandlingEventException;
 
 }

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/application/handling/HandlingEventServiceImpl.java

 import org.springframework.transaction.annotation.Transactional;
 import se.citerus.dddsample.tracking.core.application.event.SystemEvents;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.tracking.core.domain.model.handling.CannotCreateHandlingEventException;
-import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent;
-import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEventFactory;
-import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEventRepository;
+import se.citerus.dddsample.tracking.core.domain.model.handling.*;
 import se.citerus.dddsample.tracking.core.domain.model.location.UnLocode;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageNumber;
 
   @Transactional
   public void registerHandlingEvent(final Date completionTime, final TrackingId trackingId,
                                     final VoyageNumber voyageNumber, final UnLocode unLocode,
-                                    final HandlingEvent.Type type) throws CannotCreateHandlingEventException {
+                                    final HandlingEvent.Type type, final OperatorCode operatorCode) throws CannotCreateHandlingEventException {
 
     /* Using a factory to create a HandlingEvent (aggregate). This is where
        it is determined wether the incoming data, the attempt, actually is capable
        of representing a real handling handlingEvent. */
     final HandlingEvent handlingEvent = handlingEventFactory.createHandlingEvent(
-      completionTime, trackingId, voyageNumber, unLocode, type
+      completionTime, trackingId, voyageNumber, unLocode, type, operatorCode
     );
 
     /* Store the new handling handlingEvent, which updates the persistent

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/application/util/SampleDataGenerator.java

 import org.springframework.web.context.support.WebApplicationContextUtils;
 import static se.citerus.dddsample.tracking.core.application.util.DateTestUtil.toDate;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.*;
-import se.citerus.dddsample.tracking.core.domain.model.handling.CannotCreateHandlingEventException;
-import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent;
-import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEventFactory;
-import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEventRepository;
+import se.citerus.dddsample.tracking.core.domain.model.handling.*;
 import se.citerus.dddsample.tracking.core.domain.model.location.Location;
 import se.citerus.dddsample.tracking.core.domain.model.location.LocationRepository;
 import se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations;
 
   private static void loadHandlingEventData(JdbcTemplate jdbcTemplate) {
     String handlingEventSql =
-      "insert into HandlingEvent (sequence_number, completionTime, registrationTime, type, location_id, voyage_id, cargo_id) " +
-        "values (?, ?, ?, ?, ?, ?, ?)";
+      "insert into HandlingEvent (sequence_number, completionTime, registrationTime, type, location_id, voyage_id, cargo_id, operator_code) " +
+        "values (?, ?, ?, ?, ?, ?, ?,?)";
 
     Object[][] handlingEventArgs = {
       //XYZ (SESTO-FIHEL-DEHAM-CNHKG-JPTOK-AUMEL)
-      {1, ts(0), ts((0)), "RECEIVE", 1, null, 1},
-      {2, ts((4)), ts((5)), "LOAD", 1, 1, 1},
-      {3, ts((14)), ts((14)), "UNLOAD", 5, 1, 1},
-      {4, ts((15)), ts((15)), "LOAD", 5, 1, 1},
-      {5, ts((30)), ts((30)), "UNLOAD", 6, 1, 1},
-      {6, ts((33)), ts((33)), "LOAD", 6, 1, 1},
-      {7, ts((34)), ts((34)), "UNLOAD", 3, 1, 1},
-      {8, ts((60)), ts((60)), "LOAD", 3, 1, 1},
-      {9, ts((70)), ts((71)), "UNLOAD", 4, 1, 1},
-      {10, ts((75)), ts((75)), "LOAD", 4, 1, 1},
-      {11, ts((88)), ts((88)), "UNLOAD", 2, 1, 1},
-      {12, ts((100)), ts((102)), "CLAIM", 2, null, 1},
+      {1, ts(0), ts((0)), "RECEIVE", 1, null, 1, null},
+      {2, ts((4)), ts((5)), "LOAD", 1, 1, 1, "AS34F"},
+      {3, ts((14)), ts((14)), "UNLOAD", 5, 1, 1, "AS34F"},
+      {4, ts((15)), ts((15)), "LOAD", 5, 1, 1, "AS34F"},
+      {5, ts((30)), ts((30)), "UNLOAD", 6, 1, 1, "AS34F"},
+      {6, ts((33)), ts((33)), "LOAD", 6, 1, 1, "AS34F"},
+      {7, ts((34)), ts((34)), "UNLOAD", 3, 1, 1, "AS34F"},
+      {8, ts((60)), ts((60)), "LOAD", 3, 1, 1, "AS34F"},
+      {9, ts((70)), ts((71)), "UNLOAD", 4, 1, 1, "AS34F"},
+      {10, ts((75)), ts((75)), "LOAD", 4, 1, 1, "AS34F"},
+      {11, ts((88)), ts((88)), "UNLOAD", 2, 1, 1, "AS34F"},
+      {12, ts((100)), ts((102)), "CLAIM", 2, null, 1, null},
 
       //ZYX (AUMEL - USCHI - DEHAM -)
-      {13, ts((200)), ts((201)), "RECEIVE", 2, null, 3},
-      {14, ts((202)), ts((202)), "LOAD", 2, 2, 3},
-      {15, ts((208)), ts((208)), "UNLOAD", 7, 2, 3},
-      {16, ts((212)), ts((212)), "LOAD", 7, 2, 3},
-      {17, ts((230)), ts((230)), "UNLOAD", 6, 2, 3},
-      {18, ts((235)), ts((235)), "LOAD", 6, 2, 3},
+      {13, ts((200)), ts((201)), "RECEIVE", 2, null, 3, null},
+      {14, ts((202)), ts((202)), "LOAD", 2, 2, 3, "AS34F"},
+      {15, ts((208)), ts((208)), "UNLOAD", 7, 2, 3, "AS34F"},
+      {16, ts((212)), ts((212)), "LOAD", 7, 2, 3, "AS34F"},
+      {17, ts((230)), ts((230)), "UNLOAD", 6, 2, 3, "AS34F"},
+      {18, ts((235)), ts((235)), "LOAD", 6, 2, 3, "AS34F"},
 
       //ABC
-      {19, ts((20)), ts((21)), "CLAIM", 2, null, 2},
+      {19, ts((20)), ts((21)), "CLAIM", 2, null, 2, null},
 
       //CBA
-      {20, ts((0)), ts((1)), "RECEIVE", 2, null, 4},
-      {21, ts((10)), ts((11)), "LOAD", 2, 2, 4},
-      {22, ts((20)), ts((21)), "UNLOAD", 7, 2, 4},
+      {20, ts((0)), ts((1)), "RECEIVE", 2, null, 4, null},
+      {21, ts((10)), ts((11)), "LOAD", 2, 2, 4, "AS34F"},
+      {22, ts((20)), ts((21)), "UNLOAD", 7, 2, 4, "AS34F"},
 
       //FGH
-      {23, ts(100), ts(160), "RECEIVE", 3, null, 5},
-      {24, ts(150), ts(110), "LOAD", 3, 3, 5},
+      {23, ts(100), ts(160), "RECEIVE", 3, null, 5, null},
+      {24, ts(150), ts(110), "LOAD", 3, 3, 5, "AS34F"},
 
       // JKL
-      {25, ts(200), ts(220), "RECEIVE", 6, null, 6},
-      {26, ts(300), ts(330), "LOAD", 6, 3, 6},
+      {25, ts(200), ts(220), "RECEIVE", 6, null, 6, null},
+      {26, ts(300), ts(330), "LOAD", 6, 3, 6, "AS34F"},
       {27, ts(400), ts(440), "UNLOAD", 5, 3, 6}  // Unexpected event
     };
     executeUpdate(jdbcTemplate, handlingEventSql, handlingEventArgs);
 
         try {
           HandlingEvent event1 = handlingEventFactory.createHandlingEvent(
-            toDate("2009-03-01"), trackingId, null, HONGKONG.unLocode(), HandlingEvent.Type.RECEIVE
+            toDate("2009-03-01"), trackingId, null, HONGKONG.unLocode(), HandlingEvent.Type.RECEIVE, new OperatorCode("ABCDE")
           );
           session.save(event1);
 
           HandlingEvent event2 = handlingEventFactory.createHandlingEvent(
-            toDate("2009-03-02"), trackingId, HONGKONG_TO_NEW_YORK.voyageNumber(), HONGKONG.unLocode(), HandlingEvent.Type.LOAD
+            toDate("2009-03-02"), trackingId, HONGKONG_TO_NEW_YORK.voyageNumber(), HONGKONG.unLocode(), HandlingEvent.Type.LOAD, new OperatorCode("ABCDE")
           );
           session.save(event2);
 
           HandlingEvent event3 = handlingEventFactory.createHandlingEvent(
-            toDate("2009-03-05"), trackingId, HONGKONG_TO_NEW_YORK.voyageNumber(), NEWYORK.unLocode(), HandlingEvent.Type.UNLOAD
+            toDate("2009-03-05"), trackingId, HONGKONG_TO_NEW_YORK.voyageNumber(), NEWYORK.unLocode(), HandlingEvent.Type.UNLOAD, new OperatorCode("ABCDE")
           );
           session.save(event3);
         } catch (CannotCreateHandlingEventException e) {
 
         try {
           HandlingEvent event1 = handlingEventFactory.createHandlingEvent(
-            toDate("2009-03-01"), trackingId1, null, HANGZOU.unLocode(), HandlingEvent.Type.RECEIVE
+            toDate("2009-03-01"), trackingId1, null, HANGZOU.unLocode(), HandlingEvent.Type.RECEIVE, new OperatorCode("ABCDE")
           );
           session.save(event1);
 
           HandlingEvent event2 = handlingEventFactory.createHandlingEvent(
-            toDate("2009-03-03"), trackingId1, HONGKONG_TO_NEW_YORK.voyageNumber(), HANGZOU.unLocode(), HandlingEvent.Type.LOAD
+            toDate("2009-03-03"), trackingId1, HONGKONG_TO_NEW_YORK.voyageNumber(), HANGZOU.unLocode(), HandlingEvent.Type.LOAD, new OperatorCode("ABCDE")
           );
           session.save(event2);
 
           HandlingEvent event3 = handlingEventFactory.createHandlingEvent(
-            toDate("2009-03-05"), trackingId1, HONGKONG_TO_NEW_YORK.voyageNumber(), NEWYORK.unLocode(), HandlingEvent.Type.UNLOAD
+            toDate("2009-03-05"), trackingId1, HONGKONG_TO_NEW_YORK.voyageNumber(), NEWYORK.unLocode(), HandlingEvent.Type.UNLOAD, new OperatorCode("ABCDE")
           );
           session.save(event3);
 
           HandlingEvent event4 = handlingEventFactory.createHandlingEvent(
-            toDate("2009-03-06"), trackingId1, HONGKONG_TO_NEW_YORK.voyageNumber(), NEWYORK.unLocode(), HandlingEvent.Type.LOAD
+            toDate("2009-03-06"), trackingId1, HONGKONG_TO_NEW_YORK.voyageNumber(), NEWYORK.unLocode(), HandlingEvent.Type.LOAD, new OperatorCode("ABCDE")
           );
           session.save(event4);
 

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/interfaces/handling/HandlingReportParser.java

 import org.apache.commons.lang.StringUtils;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingId;
 import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent;
+import se.citerus.dddsample.tracking.core.domain.model.handling.OperatorCode;
 import se.citerus.dddsample.tracking.core.domain.model.location.UnLocode;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageNumber;
 
 
     return completionTime.toGregorianCalendar().getTime();
   }
+
+  public static OperatorCode parseOperatorCode() {
+    // TODO stubbed atm
+    return new OperatorCode("ABCDE");
+  }
 }

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/application/event/CargoUpdaterTest.java

       cargo.trackingId(),
       HONGKONG_TO_NEW_YORK.voyageNumber(),
       HONGKONG.unLocode(),
-      LOAD
+      LOAD, new OperatorCode("ABCDE")
     );
     handlingEventRepository.store(handlingEvent);
 

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/application/handling/HandlingEventServiceTest.java

 import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEventFactory;
 import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEventRepository;
+import se.citerus.dddsample.tracking.core.domain.model.handling.OperatorCode;
 import se.citerus.dddsample.tracking.core.domain.model.location.LocationRepository;
 import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.*;
 import static se.citerus.dddsample.tracking.core.domain.model.voyage.SampleVoyages.CM001;
 
     replay(cargoRepository, voyageRepository, handlingEventRepository, locationRepository, systemEvents);
 
-    service.registerHandlingEvent(new Date(), cargo.trackingId(), CM001.voyageNumber(), STOCKHOLM.unLocode(), HandlingEvent.Type.LOAD);
+    service.registerHandlingEvent(new Date(), cargo.trackingId(), CM001.voyageNumber(), STOCKHOLM.unLocode(), HandlingEvent.Type.LOAD, new OperatorCode("ABCDE"));
   }
 
 }

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

 
   public void testNewWithCarrierMovement() throws Exception {
 
-    HandlingEvent e1 = new HandlingEvent(cargo, new Date(), new Date(), LOAD, HONGKONG, CM003);
+    HandlingEvent e1 = new HandlingEvent(cargo, new Date(), new Date(), LOAD, HONGKONG, CM003, new OperatorCode("ABCDE"));
     assertEquals(HONGKONG, e1.location());
 
-    HandlingEvent e2 = new HandlingEvent(cargo, new Date(), new Date(), UNLOAD, NEWYORK, CM003);
+    HandlingEvent e2 = new HandlingEvent(cargo, new Date(), new Date(), UNLOAD, NEWYORK, CM003, new OperatorCode("ABCDE"));
     assertEquals(NEWYORK, e2.location());
 
     // These event types prohibit a carrier movement association
     for (HandlingEvent.Type type : asList(CLAIM, RECEIVE, CUSTOMS)) {
       try {
-        new HandlingEvent(cargo, new Date(), new Date(), type, HONGKONG, CM003);
+        new HandlingEvent(cargo, new Date(), new Date(), type, HONGKONG, CM003, new OperatorCode("ABCDE"));
         fail("Handling event type " + type + " prohibits carrier movement");
       } catch (IllegalArgumentException expected) {
       }
     // These event types requires a carrier movement association
     for (HandlingEvent.Type type : asList(LOAD, UNLOAD)) {
       try {
-        new HandlingEvent(cargo, new Date(), new Date(), type, HONGKONG, null);
+        new HandlingEvent(cargo, new Date(), new Date(), type, HONGKONG, null, new OperatorCode("ABCDE"));
         fail("Handling event type " + type + " requires carrier movement");
       } catch (IllegalArgumentException expected) {
       }
 
   public void testCurrentLocationLoadEvent() throws Exception {
 
-    HandlingEvent ev = new HandlingEvent(cargo, new Date(), new Date(), LOAD, CHICAGO, CM004);
+    HandlingEvent ev = new HandlingEvent(cargo, new Date(), new Date(), LOAD, CHICAGO, CM004, new OperatorCode("ABCDE"));
 
     assertEquals(CHICAGO, ev.location());
   }
 
   public void testCurrentLocationUnloadEvent() throws Exception {
-    HandlingEvent ev = new HandlingEvent(cargo, new Date(), new Date(), UNLOAD, HAMBURG, CM004);
+    HandlingEvent ev = new HandlingEvent(cargo, new Date(), new Date(), UNLOAD, HAMBURG, CM004, new OperatorCode("ABCDE"));
 
     assertEquals(HAMBURG, ev.location());
   }
     Date timeOccured = new Date();
     Date timeRegistered = new Date();
 
-    HandlingEvent ev1 = new HandlingEvent(cargo, timeOccured, timeRegistered, LOAD, CHICAGO, SampleVoyages.CM005);
-    HandlingEvent ev2 = new HandlingEvent(cargo, timeOccured, timeRegistered, LOAD, CHICAGO, SampleVoyages.CM005);
+    HandlingEvent ev1 = new HandlingEvent(cargo, timeOccured, timeRegistered, LOAD, CHICAGO, SampleVoyages.CM005, new OperatorCode("ABCDE"));
+    HandlingEvent ev2 = new HandlingEvent(cargo, timeOccured, timeRegistered, LOAD, CHICAGO, SampleVoyages.CM005, new OperatorCode("ABCDE"));
 
-    // Two handling events are not equal() even if all non-uuid fields are identical
     assertTrue(ev1.equals(ev2));
     assertTrue(ev2.equals(ev1));
 
     assertTrue(ev1.equals(ev1));
 
+    //noinspection ObjectEqualsNull
     assertFalse(ev2.equals(null));
+
     assertFalse(ev2.equals(new Object()));
   }
 

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

       addMovement(SHANGHAI, new Date(1), new Date(2)).
       addMovement(DALLAS, new Date(3), new Date(4)).
       build();
-    event1 = new HandlingEvent(cargo, toDate("2009-03-05"), toDate("2009-03-05"), HandlingEvent.Type.LOAD, SHANGHAI, voyage);
-    event1duplicate = new HandlingEvent(cargo, toDate("2009-03-05"), toDate("2009-03-07"), HandlingEvent.Type.LOAD, SHANGHAI, voyage);
-    event2 = new HandlingEvent(cargo, toDate("2009-03-10"), toDate("2009-03-06"), HandlingEvent.Type.UNLOAD, DALLAS, voyage);
-    eventOfCargo2 = new HandlingEvent(cargo2, toDate("2009-03-11"), toDate("2009-03-08"), HandlingEvent.Type.LOAD, GOTHENBURG, voyage);
+    event1 = new HandlingEvent(cargo, toDate("2009-03-05"), toDate("2009-03-05"), HandlingEvent.Type.LOAD, SHANGHAI, voyage, new OperatorCode("ABCDE"));
+    event1duplicate = new HandlingEvent(cargo, toDate("2009-03-05"), toDate("2009-03-07"), HandlingEvent.Type.LOAD, SHANGHAI, voyage, new OperatorCode("ABCDE"));
+    event2 = new HandlingEvent(cargo, toDate("2009-03-10"), toDate("2009-03-06"), HandlingEvent.Type.UNLOAD, DALLAS, voyage, new OperatorCode("ABCDE"));
+    eventOfCargo2 = new HandlingEvent(cargo2, toDate("2009-03-11"), toDate("2009-03-08"), HandlingEvent.Type.LOAD, GOTHENBURG, voyage, new OperatorCode("ABCDE"));
   }
 
   public void testDistinctEventsByCompletionTime() {

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

 import se.citerus.dddsample.tracking.core.domain.model.cargo.*;
 import static se.citerus.dddsample.tracking.core.domain.model.cargo.RoutingStatus.*;
 import static se.citerus.dddsample.tracking.core.domain.model.cargo.TransportStatus.*;
-import se.citerus.dddsample.tracking.core.domain.model.handling.CannotCreateHandlingEventException;
-import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent;
+import se.citerus.dddsample.tracking.core.domain.model.handling.*;
 import static se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent.Type.*;
-import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEventFactory;
-import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEventRepository;
 import se.citerus.dddsample.tracking.core.domain.model.location.Location;
 import se.citerus.dddsample.tracking.core.domain.model.location.LocationRepository;
 import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.*;
 
   private void updateHandlingEventAggregate(Date completionTime, Voyage voyage, Location location, HandlingEvent.Type type) throws CannotCreateHandlingEventException {
     VoyageNumber voyageNumber = voyage != null ? voyage.voyageNumber() : null;
-    HandlingEvent handlingEvent = handlingEventFactory.createHandlingEvent(completionTime, trackingId, voyageNumber, location.unLocode(), type);
+    HandlingEvent handlingEvent = handlingEventFactory.createHandlingEvent(completionTime, trackingId, voyageNumber, location.unLocode(), type, new OperatorCode("ABCDE"));
     handlingEventRepository.store(handlingEvent);
   }