Added some more test data

dddsample/src/main/java/se/citerus/dddsample/domain/CarrierMovementId.java

@@ -32,4 +32,6 @@ public class CarrierMovementId implements Serializable {
     return HashCodeBuilder.reflectionHashCode(this);
   }
 
+  // needed by hibernate
+  public CarrierMovementId() {}
 }

dddsample/src/main/java/se/citerus/dddsample/util/SampleDataGenerator.java

@@ -28,8 +28,30 @@ public class SampleDataGenerator implements ServletContextListener {
       "insert into HandlingEvent (id, completionTime, registrationTime, type, location_id, carrierMovement_id, cargo_id) " +
       "values (?, ?, ?, ?, ?, ?, ?)";
     Object[][] handlingEventArgs = {
-            {UUID.randomUUID().toString().getBytes(), new Timestamp(10), new Timestamp(11), "CLAIM", 1, null, "XYZ"},
-            {UUID.randomUUID().toString().getBytes(), new Timestamp(20), new Timestamp(21), "CLAIM", 2, null, "ABC"}
+        //XYZ (SESTO-FIHEL-DEHAM-CNHKG-JPTOK-AUMEL)
+        {UUID.randomUUID().toString().getBytes(), new Timestamp(0), new Timestamp(1), "RECEIVE", 1, null, "XYZ"},  
+        {UUID.randomUUID().toString().getBytes(), new Timestamp(10), new Timestamp(11), "LOAD", 1, "CAR_001", "XYZ"},
+        {UUID.randomUUID().toString().getBytes(), new Timestamp(20), new Timestamp(21), "UNLOAD", 5, "CAR_001", "XYZ"},
+        {UUID.randomUUID().toString().getBytes(), new Timestamp(30), new Timestamp(31), "LOAD", 5, "CAR_002", "XYZ"},
+        {UUID.randomUUID().toString().getBytes(), new Timestamp(40), new Timestamp(41), "UNLOAD", 6, "CAR_002", "XYZ"},
+        {UUID.randomUUID().toString().getBytes(), new Timestamp(50), new Timestamp(51), "LOAD", 6, "CAR_003", "XYZ"},
+        {UUID.randomUUID().toString().getBytes(), new Timestamp(60), new Timestamp(61), "UNLOAD", 3, "CAR_003", "XYZ"},
+        {UUID.randomUUID().toString().getBytes(), new Timestamp(70), new Timestamp(71), "LOAD", 3, "CAR_004", "XYZ"},
+        {UUID.randomUUID().toString().getBytes(), new Timestamp(80), new Timestamp(81), "UNLOAD", 4, "CAR_004", "XYZ"},
+        {UUID.randomUUID().toString().getBytes(), new Timestamp(90), new Timestamp(91), "LOAD", 4, "CAR_005", "XYZ"},
+        {UUID.randomUUID().toString().getBytes(), new Timestamp(100), new Timestamp(101), "UNLOAD", 2, "CAR_005", "XYZ"},        
+        {UUID.randomUUID().toString().getBytes(), new Timestamp(110), new Timestamp(111), "CLAIM", 2, null, "XYZ"},
+            
+        //ZYX (AUMEL - USCHI - DEHAM - SESTO)
+        {UUID.randomUUID().toString().getBytes(), new Timestamp(0), new Timestamp(1), "RECEIVE", 2, null, "ZYX"},  
+        {UUID.randomUUID().toString().getBytes(), new Timestamp(10), new Timestamp(11), "LOAD", 2, "CAR_007", "ZYX"},
+        {UUID.randomUUID().toString().getBytes(), new Timestamp(20), new Timestamp(21), "UNLOAD", 7, "CAR_007", "ZYX"},
+        {UUID.randomUUID().toString().getBytes(), new Timestamp(30), new Timestamp(31), "LOAD", 7, "CAR_008", "ZYX"},
+        {UUID.randomUUID().toString().getBytes(), new Timestamp(40), new Timestamp(41), "UNLOAD", 6, "CAR_008", "ZYX"},
+        {UUID.randomUUID().toString().getBytes(), new Timestamp(50), new Timestamp(51), "LOAD", 6, "CAR_009", "ZYX"},
+        
+        //ABC
+        {UUID.randomUUID().toString().getBytes(), new Timestamp(20), new Timestamp(21), "CLAIM", 2, null, "ABC"}
     };
     for (Object[] handlingEventArg : handlingEventArgs) {
       jdbcTemplate.update(handlingEventSql, handlingEventArg);
@@ -39,9 +61,20 @@ public class SampleDataGenerator implements ServletContextListener {
   private static void loadCarrierMovementData(JdbcTemplate jdbcTemplate) {
     String carrierMovementSql = "insert into CarrierMovement (id, from_id, to_id) values (?,?,?)";
     Object[][] carrierMovementArgs = {
-      {"CAR_001",1,2},
-      {"CAR_002",2,3},
-      {"CAR_003",3,1}
+     // SESTO-FIHEL-DEHAM-CNHKG-JPTOK-AUMEL
+      {"CAR_001",1,5}, 
+      {"CAR_002",5,6},
+      {"CAR_003",6,3},
+      {"CAR_004",3,4},
+      {"CAR_005",4,2},
+      
+      // FIHEL - SESTO
+      {"CAR_006",5,1},
+      
+      // AUMEL - USCHI - DEHAM - SESTO
+      {"CAR_007",2,7}, 
+      {"CAR_008",7,6},
+      {"CAR_009",6,1}
     };
     for (Object[] carrierMovementArg : carrierMovementArgs) {
       jdbcTemplate.update(carrierMovementSql, carrierMovementArg);
@@ -52,8 +85,9 @@ public class SampleDataGenerator implements ServletContextListener {
     String cargoSql = "insert into Cargo (id, origin_id, finalDestination_id) values (?, ?, ?)";
     Object[][] cargoArgs = {
       {"XYZ",1,2},
-      {"ABC",3,1},
-      {"ZYX",2,3}
+      {"ABC",1,5},
+      {"ZYX",2,1},
+      {"CBA",5,1}
     };
     for (Object[] cargoArg : cargoArgs) {
       jdbcTemplate.update(cargoSql, cargoArg);
@@ -65,7 +99,11 @@ public class SampleDataGenerator implements ServletContextListener {
     Object[][] locationArgs = {
       {1L, "SESTO"},
       {2L, "AUMEL"},
-      {3L, "CNHKG"}
+      {3L, "CNHKG"},
+      {4L, "JPTOK"},
+      {5L, "FIHEL"},
+      {6L, "DEHAM"},
+      {7L, "USCHI"}
     };
     for (Object[] locationArg : locationArgs) {
       jdbcTemplate.update(locationSql, locationArg);