Renamed LegMatch to LegActivityMatch, more in line with the UL

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/model/cargo/Itinerary.java

@@ -2,16 +2,17 @@ package se.citerus.dddsample.tracking.core.domain.model.cargo;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.Validate;
-import static se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent.Type.*;
 import se.citerus.dddsample.tracking.core.domain.model.location.Location;
 import se.citerus.dddsample.tracking.core.domain.model.shared.HandlingActivity;
-import static se.citerus.dddsample.tracking.core.domain.model.shared.HandlingActivity.claimIn;
-import static se.citerus.dddsample.tracking.core.domain.model.shared.HandlingActivity.receiveIn;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.Voyage;
 import se.citerus.dddsample.tracking.core.domain.patterns.valueobject.ValueObjectSupport;
 
 import java.util.*;
 
+import static se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent.Type.*;
+import static se.citerus.dddsample.tracking.core.domain.model.shared.HandlingActivity.claimIn;
+import static se.citerus.dddsample.tracking.core.domain.model.shared.HandlingActivity.receiveIn;
+
 /**
  * An itinerary.
  */
@@ -93,7 +94,7 @@ public class Itinerary extends ValueObjectSupport<Itinerary> {
    * @return <code>true</code> if the event is expected
    */
   boolean isExpectedActivity(final HandlingActivity handlingActivity) {
-    return legMatchOf(handlingActivity).leg() != null;
+    return matchLeg(handlingActivity).leg() != null;
   }
 
   /**
@@ -172,7 +173,7 @@ public class Itinerary extends ValueObjectSupport<Itinerary> {
     if (previousActivity == null) {
       return receiveIn(firstLeg().loadLocation());
     } else {
-      return deriveFromMatchingLeg(previousActivity, legMatchOf(previousActivity).leg());
+      return deriveFromMatchingLeg(previousActivity, matchLeg(previousActivity).leg());
     }
   }
 
@@ -182,8 +183,8 @@ public class Itinerary extends ValueObjectSupport<Itinerary> {
    * @return The activity which is strictly prior to the other, according to the itinerary, or null if neither is strictly prior.
    */
   HandlingActivity strictlyPriorOf(final HandlingActivity handlingActivity1, final HandlingActivity handlingActivity2) {
-    final LegMatch match1 = legMatchOf(handlingActivity1);
-    final LegMatch match2 = legMatchOf(handlingActivity2);
+    final LegActivityMatch match1 = matchLeg(handlingActivity1);
+    final LegActivityMatch match2 = matchLeg(handlingActivity2);
     final int compared = match1.compareTo(match2);
 
     if (compared < 0) {
@@ -213,13 +214,13 @@ public class Itinerary extends ValueObjectSupport<Itinerary> {
    * @param handlingActivity handling activity
    * @return The leg match of this handling activity. Never null.
    */
-  LegMatch legMatchOf(final HandlingActivity handlingActivity) {
+  LegActivityMatch matchLeg(final HandlingActivity handlingActivity) {
     if (handlingActivity == null) {
-      return LegMatch.noMatch(handlingActivity, this);
+      return LegActivityMatch.noMatch(handlingActivity, this);
     } else if (handlingActivity.type() == RECEIVE) {
-      return LegMatch.ifLoadLocationSame(firstLeg(), handlingActivity, this);
+      return LegActivityMatch.ifLoadLocationSame(firstLeg(), handlingActivity, this);
     } else if (handlingActivity.type() == CLAIM) {
-      return LegMatch.ifUnloadLocationSame(lastLeg(), handlingActivity, this);
+      return LegActivityMatch.ifUnloadLocationSame(lastLeg(), handlingActivity, this);
     } else {
       return findLegMatchingActivity(handlingActivity);
     }
@@ -239,14 +240,14 @@ public class Itinerary extends ValueObjectSupport<Itinerary> {
     return legs.get(legs.size() - 1);
   }
 
-  private LegMatch findLegMatchingActivity(final HandlingActivity handlingActivity) {
+  private LegActivityMatch findLegMatchingActivity(final HandlingActivity handlingActivity) {
     for (Leg leg : legs) {
       if (leg.matchesActivity(handlingActivity)) {
-        return LegMatch.match(leg, handlingActivity, this);
+        return LegActivityMatch.match(leg, handlingActivity, this);
       }
     }
 
-    return LegMatch.noMatch(handlingActivity, this);
+    return LegActivityMatch.noMatch(handlingActivity, this);
   }
 
   private HandlingActivity deriveFromMatchingLeg(final HandlingActivity handlingActivity, final Leg matchingLeg) {

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/model/cargo/LegMatch.java → dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/model/cargo/LegActivityMatch.java

@@ -1,10 +1,11 @@
 package se.citerus.dddsample.tracking.core.domain.model.cargo;
 
-import static se.citerus.dddsample.tracking.core.domain.model.cargo.LegMatch.LegEnd.*;
 import se.citerus.dddsample.tracking.core.domain.model.shared.HandlingActivity;
 import se.citerus.dddsample.tracking.core.domain.patterns.valueobject.ValueObjectSupport;
 
-class LegMatch extends ValueObjectSupport<LegMatch> implements Comparable<LegMatch> {
+import static se.citerus.dddsample.tracking.core.domain.model.cargo.LegActivityMatch.LegEnd.*;
+
+class LegActivityMatch extends ValueObjectSupport<LegActivityMatch> implements Comparable<LegActivityMatch> {
 
   private final Leg leg;
   private final LegEnd legEnd;
@@ -13,45 +14,45 @@ class LegMatch extends ValueObjectSupport<LegMatch> implements Comparable<LegMat
 
   enum LegEnd { LOAD_END, UNLOAD_END, NO_END }
 
-  private LegMatch(final Leg leg, final LegEnd legEnd, final HandlingActivity handlingActivity, final Itinerary itinerary) {
+  private LegActivityMatch(final Leg leg, final LegEnd legEnd, final HandlingActivity handlingActivity, final Itinerary itinerary) {
     this.leg = leg;
     this.legEnd = legEnd;
     this.handlingActivity = handlingActivity;
     this.itinerary = itinerary;
   }
 
-  static LegMatch match(final Leg leg, final HandlingActivity handlingActivity, final Itinerary itinerary) {
+  static LegActivityMatch match(final Leg leg, final HandlingActivity handlingActivity, final Itinerary itinerary) {
     switch (handlingActivity.type()) {
       case RECEIVE:
       case LOAD:
-        return new LegMatch(leg, LOAD_END, handlingActivity, itinerary);
+        return new LegActivityMatch(leg, LOAD_END, handlingActivity, itinerary);
       case UNLOAD:
       case CLAIM:
       case CUSTOMS:
-        return new LegMatch(leg, UNLOAD_END, handlingActivity, itinerary);
+        return new LegActivityMatch(leg, UNLOAD_END, handlingActivity, itinerary);
       default:
         return noMatch(handlingActivity, itinerary);
     }
   }
 
-  static LegMatch ifLoadLocationSame(final Leg leg, final HandlingActivity handlingActivity, final Itinerary itinerary) {
+  static LegActivityMatch ifLoadLocationSame(final Leg leg, final HandlingActivity handlingActivity, final Itinerary itinerary) {
     if (leg.loadLocation().sameAs(handlingActivity.location())) {
-      return new LegMatch(leg, LOAD_END, handlingActivity, itinerary);
+      return new LegActivityMatch(leg, LOAD_END, handlingActivity, itinerary);
     } else {
       return noMatch(handlingActivity, itinerary);
     }
   }
 
-  static LegMatch ifUnloadLocationSame(final Leg leg, final HandlingActivity handlingActivity, final Itinerary itinerary) {
+  static LegActivityMatch ifUnloadLocationSame(final Leg leg, final HandlingActivity handlingActivity, final Itinerary itinerary) {
     if (leg.unloadLocation().sameAs(handlingActivity.location())) {
-      return new LegMatch(leg, UNLOAD_END, handlingActivity, itinerary);
+      return new LegActivityMatch(leg, UNLOAD_END, handlingActivity, itinerary);
     } else {
       return noMatch(handlingActivity, itinerary);
     }
   }
 
-  static LegMatch noMatch(final HandlingActivity handlingActivity, final Itinerary itinerary) {
-    return new LegMatch(null, NO_END, handlingActivity, itinerary);
+  static LegActivityMatch noMatch(final HandlingActivity handlingActivity, final Itinerary itinerary) {
+    return new LegActivityMatch(null, NO_END, handlingActivity, itinerary);
   }
 
   Leg leg() {
@@ -63,7 +64,7 @@ class LegMatch extends ValueObjectSupport<LegMatch> implements Comparable<LegMat
   }
 
   @Override
-  public int compareTo(final LegMatch other) {
+  public int compareTo(final LegActivityMatch other) {
     final Integer thisLegIndex = itinerary.legs().indexOf(this.leg);
     final Integer otherLegIndex = itinerary.legs().indexOf(other.leg);
 

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/domain/model/cargo/CargoTest.java

@@ -1,21 +1,22 @@
 package se.citerus.dddsample.tracking.core.domain.model.cargo;
 
 import junit.framework.TestCase;
+import se.citerus.dddsample.tracking.core.domain.model.location.Location;
+import se.citerus.dddsample.tracking.core.domain.model.shared.HandlingActivity;
+import se.citerus.dddsample.tracking.core.domain.model.voyage.Voyage;
+import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageNumber;
+
+import java.util.Date;
+
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertThat;
 import static se.citerus.dddsample.tracking.core.application.util.DateTestUtil.toDate;
 import static se.citerus.dddsample.tracking.core.domain.model.cargo.RoutingStatus.*;
 import static se.citerus.dddsample.tracking.core.domain.model.cargo.TransportStatus.*;
 import static se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent.Type.*;
-import se.citerus.dddsample.tracking.core.domain.model.location.Location;
 import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.*;
-import se.citerus.dddsample.tracking.core.domain.model.shared.HandlingActivity;
 import static se.citerus.dddsample.tracking.core.domain.model.shared.HandlingActivity.*;
 import static se.citerus.dddsample.tracking.core.domain.model.voyage.SampleVoyages.*;
-import se.citerus.dddsample.tracking.core.domain.model.voyage.Voyage;
-import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageNumber;
-
-import java.util.Date;
 
 public class CargoTest extends TestCase {
 
@@ -269,11 +270,11 @@ public class CargoTest extends TestCase {
     assertTrue(cargo.routingStatus() == MISROUTED);
 
     /**
-     * This is a perfect example of how LegMatch is a modelling breakthrough.
+     * This is a perfect example of how LegActivityMatch is a modelling breakthrough.
      * It allows us to easily construct an itinerary that completes the remainder of the
      * old itinerary and appends the new and different path.
      */
-    Leg currentLeg = cargo.itinerary().legMatchOf(cargo.mostRecentHandlingActivity()).leg();
+    Leg currentLeg = cargo.itinerary().matchLeg(cargo.mostRecentHandlingActivity()).leg();
     Itinerary newItinerary = new Itinerary(
       currentLeg,
       Leg.deriveLeg(continental3, SEATTLE, NEWYORK)

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/domain/model/cargo/ItineraryTest.java

@@ -1,13 +1,7 @@
 package se.citerus.dddsample.tracking.core.domain.model.cargo;
 
 import junit.framework.TestCase;
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.core.IsEqual.equalTo;
-import static org.junit.Assert.assertThat;
-import static se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent.Type.*;
-import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.*;
 import se.citerus.dddsample.tracking.core.domain.model.shared.HandlingActivity;
-import static se.citerus.dddsample.tracking.core.domain.model.shared.HandlingActivity.*;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.Voyage;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.VoyageNumber;
 
@@ -15,6 +9,13 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import static org.hamcrest.core.Is.is;
+import static org.hamcrest.core.IsEqual.equalTo;
+import static org.junit.Assert.assertThat;
+import static se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent.Type.*;
+import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.*;
+import static se.citerus.dddsample.tracking.core.domain.model.shared.HandlingActivity.*;
+
 public class ItineraryTest extends TestCase {
 
   Voyage voyage, wrongVoyage, pacific, transcontinental, atlantic;
@@ -102,19 +103,19 @@ public class ItineraryTest extends TestCase {
     Leg rotterdamToGothenburg = Leg.deriveLeg(voyage, ROTTERDAM, GOTHENBURG);
     Itinerary itinerary = new Itinerary(shanghaiToRotterdam, rotterdamToGothenburg);
 
-    assertThat(itinerary.legMatchOf(receiveIn(SHANGHAI)).leg(), is(shanghaiToRotterdam));
-    assertThat(itinerary.legMatchOf(loadOnto(voyage).in(SHANGHAI)).leg(), is(shanghaiToRotterdam));
-    assertThat(itinerary.legMatchOf(unloadOff(voyage).in(ROTTERDAM)).leg(), is(shanghaiToRotterdam));
-    assertThat(itinerary.legMatchOf(claimIn(GOTHENBURG)).leg(), is(rotterdamToGothenburg));
+    assertThat(itinerary.matchLeg(receiveIn(SHANGHAI)).leg(), is(shanghaiToRotterdam));
+    assertThat(itinerary.matchLeg(loadOnto(voyage).in(SHANGHAI)).leg(), is(shanghaiToRotterdam));
+    assertThat(itinerary.matchLeg(unloadOff(voyage).in(ROTTERDAM)).leg(), is(shanghaiToRotterdam));
+    assertThat(itinerary.matchLeg(claimIn(GOTHENBURG)).leg(), is(rotterdamToGothenburg));
 
-    assertNull(itinerary.legMatchOf(loadOnto(wrongVoyage).in(SHANGHAI)).leg());
-    assertNull(itinerary.legMatchOf(loadOnto(wrongVoyage).in(NEWYORK)).leg());
+    assertNull(itinerary.matchLeg(loadOnto(wrongVoyage).in(SHANGHAI)).leg());
+    assertNull(itinerary.matchLeg(loadOnto(wrongVoyage).in(NEWYORK)).leg());
 
-    assertNull(itinerary.legMatchOf(unloadOff(wrongVoyage).in(ROTTERDAM)).leg());
-    assertNull(itinerary.legMatchOf(unloadOff(wrongVoyage).in(NEWYORK)).leg());
+    assertNull(itinerary.matchLeg(unloadOff(wrongVoyage).in(ROTTERDAM)).leg());
+    assertNull(itinerary.matchLeg(unloadOff(wrongVoyage).in(NEWYORK)).leg());
 
-    assertNull(itinerary.legMatchOf(receiveIn(NEWYORK)).leg());
-    assertNull(itinerary.legMatchOf(claimIn(NEWYORK)).leg());
+    assertNull(itinerary.matchLeg(receiveIn(NEWYORK)).leg());
+    assertNull(itinerary.matchLeg(claimIn(NEWYORK)).leg());
   }
 
   public void testNextLeg() {

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/domain/model/cargo/LegMatchTest.java → dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/domain/model/cargo/LegActivityMatchTest.java

@@ -15,7 +15,7 @@ import static se.citerus.dddsample.tracking.core.domain.model.voyage.SampleVoyag
 import static se.citerus.dddsample.tracking.core.domain.model.voyage.SampleVoyages.pacific1;
 
 @RunWith(JUnit4ClassRunner.class)
-public class LegMatchTest {
+public class LegActivityMatchTest {
 
   @Test
   public void compareMatches() {
@@ -24,21 +24,21 @@ public class LegMatchTest {
       deriveLeg(continental2, LONGBEACH, DALLAS)
     );
 
-    LegMatch startMatch = LegMatch.match(
+    LegActivityMatch startMatch = LegActivityMatch.match(
       deriveLeg(pacific1, TOKYO, LONGBEACH),
       loadOnto(pacific1).in(TOKYO), itinerary);
 
     assertThat(startMatch.handlingActivity(), equalTo(loadOnto(pacific1).in(TOKYO)));
     assertThat(startMatch.leg(), equalTo(deriveLeg(pacific1, TOKYO, LONGBEACH)));
 
-    LegMatch endMatch = LegMatch.match(
+    LegActivityMatch endMatch = LegActivityMatch.match(
       deriveLeg(pacific1, TOKYO, LONGBEACH),
       unloadOff(pacific1).in(LONGBEACH), itinerary);
 
     assertThat(endMatch.handlingActivity(), equalTo(unloadOff(pacific1).in(LONGBEACH)));
     assertThat(endMatch.leg(), equalTo(deriveLeg(pacific1, TOKYO, LONGBEACH)));
 
-    LegMatch nextMatch = LegMatch.match(
+    LegActivityMatch nextMatch = LegActivityMatch.match(
       deriveLeg(continental2, LONGBEACH, DALLAS),
       loadOnto(continental2).in(LONGBEACH), itinerary);