Voyage

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

@@ -1,61 +0,0 @@
-package se.citerus.dddsample.domain.model.carrier;
-
-import org.apache.commons.lang.Validate;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import se.citerus.dddsample.domain.model.ValueObject;
-
-/**
- * Identifies a particular carrier movement, such as a flight number.
- */
-public final class CarrierMovementId implements ValueObject<CarrierMovementId> {
-
-  private String id;
-
-  /**
-   * Constructor.
-   *
-   * @param id Id string.
-   */
-  public CarrierMovementId(final String id) {
-    Validate.notNull(id);
-    this.id = id;
-  }
-
-  /**
-   * @return String representation of this carrier movement id.
-   */
-  public String idString() {
-    return id;
-  }
-
-  @Override
-  public boolean sameValueAs(CarrierMovementId other) {
-    return other != null && this.id.equals(other.id);
-  }
-
-  @Override
-  public CarrierMovementId copy() {
-    return new CarrierMovementId(id);
-  }
-
-  @Override
-  public boolean equals(final Object obj) {
-    return EqualsBuilder.reflectionEquals(this, obj);
-  }
-
-  @Override
-  public int hashCode() {
-    return HashCodeBuilder.reflectionHashCode(this);
-  }
-
-  @Override
-  public String toString() {
-    return idString();
-  }
-
-  CarrierMovementId() {
-    // Needed by hibernate
-   }
-  
-}

dddsample/src/main/java/se/citerus/dddsample/domain/model/carrier/Voyage.java

@@ -21,7 +21,10 @@ public class Voyage implements Entity<Voyage> {
     new VoyageNumber(""), Schedule.EMPTY
   );
 
-  public Voyage(VoyageNumber voyageNumber, Schedule schedule) {
+  public Voyage(final VoyageNumber voyageNumber, final Schedule schedule) {
+    Validate.notNull(voyageNumber, "Voyage number is required");
+    Validate.notNull(schedule, "Schedule is required");
+
     this.voyageNumber = voyageNumber;
     this.schedule = schedule;
   }
@@ -61,6 +64,11 @@ public class Voyage implements Entity<Voyage> {
     return other != null && this.voyageNumber().sameValueAs(other.voyageNumber());
   }
 
+  @Override
+  public String toString() {
+    return "Voyage " + voyageNumber;
+  }
+
   Voyage() {
     // Needed by Hibernate
   }
@@ -78,16 +86,17 @@ public class Voyage implements Entity<Voyage> {
     private final VoyageNumber voyageNumber;
     private Location departureLocation;
 
-    public Builder(VoyageNumber voyageNumber, Location initialDepartureLocation) {
+    public Builder(final VoyageNumber voyageNumber, final Location departureLocation) {
       Validate.notNull(voyageNumber, "Voyage number is required");
-      Validate.notNull(voyageNumber, "Departure location is required");
+      Validate.notNull(departureLocation, "Departure location is required");
 
       this.voyageNumber = voyageNumber;
-      this.departureLocation = initialDepartureLocation;
+      this.departureLocation = departureLocation;
     }
 
     public Builder addMovement(Location arrivalLocation, Date departureTime, Date arrivalTime) {
       carrierMovements.add(new CarrierMovement(departureLocation, arrivalLocation, departureTime, arrivalTime));
+      // Next departure location is the same as this arrival location
       this.departureLocation = arrivalLocation;
       return this;
     }

dddsample/src/main/java/se/citerus/dddsample/domain/model/carrier/VoyageNumber.java

@@ -45,7 +45,7 @@ public class VoyageNumber implements ValueObject<VoyageNumber> {
 
   @Override
   public String toString() {
-    return "Voyage #" + number;
+    return number;
   }
 
   public String idString() {

dddsample/src/test/java/se/citerus/dddsample/domain/model/carrier/CarrierMovementIdTest.java

@@ -1,14 +0,0 @@
-package se.citerus.dddsample.domain.model.carrier;
-
-import junit.framework.TestCase;
-
-public class CarrierMovementIdTest extends TestCase {
-
-  public void testConstructor() throws Exception {
-    try {
-      new CarrierMovementId(null);
-      fail("Should not accept null constructor argument");
-    } catch (IllegalArgumentException expected) {}
-  }
-
-}

dddsample/src/test/java/se/citerus/dddsample/domain/model/carrier/ScheduleTest.java

@@ -0,0 +1,28 @@
+package se.citerus.dddsample.domain.model.carrier;
+
+import junit.framework.TestCase;
+
+public class ScheduleTest extends TestCase {
+
+    public void testCarrierMovements() throws Exception {
+        //TODO: Test goes here...
+    }
+
+    public void testSameValueAs() throws Exception {
+        //TODO: Test goes here...
+    }
+
+    public void testCopy() throws Exception {
+        //TODO: Test goes here...
+    }
+
+    public void testEquals() throws Exception {
+        //TODO: Test goes here...
+    }
+
+    public void testHashCode() throws Exception {
+        //TODO: Test goes here...
+    }
+
+
+}

dddsample/src/test/java/se/citerus/dddsample/domain/model/carrier/VoyageNumberTest.java

@@ -0,0 +1,32 @@
+package se.citerus.dddsample.domain.model.carrier;
+
+import junit.framework.TestCase;
+
+public class VoyageNumberTest extends TestCase {
+
+    public void testEquals() throws Exception {
+        //TODO: Test goes here...
+    }
+
+    public void testHashCode() throws Exception {
+        //TODO: Test goes here...
+    }
+
+    public void testSameValueAs() throws Exception {
+        //TODO: Test goes here...
+    }
+
+    public void testCopy() throws Exception {
+        //TODO: Test goes here...
+    }
+
+    public void testToString() throws Exception {
+        //TODO: Test goes here...
+    }
+
+    public void testIdString() throws Exception {
+        //TODO: Test goes here...
+    }
+
+
+}

dddsample/src/test/java/se/citerus/dddsample/domain/model/carrier/VoyageTest.java

@@ -0,0 +1,40 @@
+package se.citerus.dddsample.domain.model.carrier;
+
+import junit.framework.TestCase;
+
+public class VoyageTest extends TestCase {
+
+    public void testVoyageNumber() throws Exception {
+        //TODO: Test goes here...
+    }
+
+    public void testSchedule() throws Exception {
+        //TODO: Test goes here...
+    }
+
+    public void testHashCode() throws Exception {
+        //TODO: Test goes here...
+    }
+
+    public void testEquals() throws Exception {
+        //TODO: Test goes here...
+    }
+
+    public void testSameIdentityAs() throws Exception {
+        //TODO: Test goes here...
+    }
+
+    public void testToString() throws Exception {
+        //TODO: Test goes here...
+    }
+
+    public void testAddMovement() throws Exception {
+        //TODO: Test goes here...
+    }
+
+    public void testBuild() throws Exception {
+        //TODO: Test goes here...
+    }
+
+
+}