Merge pull request #3 from orende/clean-code

Refactored code to remove warnings

src/main/java/se/citerus/dddsample/domain/model/handling/HandlingHistory.java

@@ -4,71 +4,67 @@ import org.apache.commons.lang.Validate;
 import se.citerus.dddsample.domain.shared.ValueObject;
 
 import java.util.*;
+
 import static java.util.Collections.sort;
 
 /**
  * The handling history of a cargo.
- *
  */
 public class HandlingHistory implements ValueObject<HandlingHistory> {
 
-  private final List<HandlingEvent> handlingEvents;
-
-  public static final HandlingHistory EMPTY = new HandlingHistory(Collections.<HandlingEvent>emptyList());
-
-  public HandlingHistory(Collection<HandlingEvent> handlingEvents) {
-    Validate.notNull(handlingEvents, "Handling events are required");
-
-    this.handlingEvents = new ArrayList<HandlingEvent>(handlingEvents);
-  }
-
-  /**
-   * @return A distinct list (no duplicate registrations) of handling events, ordered by completion time.
-   */
-  public List<HandlingEvent> distinctEventsByCompletionTime() {
-    final List<HandlingEvent> ordered = new ArrayList<HandlingEvent>(
-      new HashSet<HandlingEvent>(handlingEvents)
-    );
-    sort(ordered, BY_COMPLETION_TIME_COMPARATOR);
-    return Collections.unmodifiableList(ordered);
-  }
-
-  /**
-   * @return Most recently completed event, or null if the delivery history is empty.
-   */
-  public HandlingEvent mostRecentlyCompletedEvent() {
-    final List<HandlingEvent> distinctEvents = distinctEventsByCompletionTime();
-    if (distinctEvents.isEmpty()) {
-      return null;
-    } else {
-      return distinctEvents.get(distinctEvents.size() - 1);
+    private final List<HandlingEvent> handlingEvents;
+
+    public static final HandlingHistory EMPTY = new HandlingHistory(Collections.<HandlingEvent>emptyList());
+
+    public HandlingHistory(Collection<HandlingEvent> handlingEvents) {
+        Validate.notNull(handlingEvents, "Handling events are required");
+
+        this.handlingEvents = new ArrayList<>(handlingEvents);
+    }
+
+    /**
+     * @return A distinct list (no duplicate registrations) of handling events, ordered by completion time.
+     */
+    public List<HandlingEvent> distinctEventsByCompletionTime() {
+        final List<HandlingEvent> ordered = new ArrayList<>(
+                new HashSet<>(handlingEvents)
+        );
+        sort(ordered, BY_COMPLETION_TIME_COMPARATOR);
+        return Collections.unmodifiableList(ordered);
+    }
+
+    /**
+     * @return Most recently completed event, or null if the delivery history is empty.
+     */
+    public HandlingEvent mostRecentlyCompletedEvent() {
+        final List<HandlingEvent> distinctEvents = distinctEventsByCompletionTime();
+        if (distinctEvents.isEmpty()) {
+            return null;
+        } else {
+            return distinctEvents.get(distinctEvents.size() - 1);
+        }
     }
-  }
-
-  @Override
-  public boolean sameValueAs(HandlingHistory other) {
-    return other != null && this.handlingEvents.equals(other.handlingEvents);
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    final HandlingHistory other = (HandlingHistory) o;
-    return sameValueAs(other);
-  }
-
-  @Override
-  public int hashCode() {
-    return handlingEvents.hashCode();
-  }
-
-  private static final Comparator<HandlingEvent> BY_COMPLETION_TIME_COMPARATOR =
-    new Comparator<HandlingEvent>() {
-      public int compare(final HandlingEvent he1, final HandlingEvent he2) {
-        return he1.completionTime().compareTo(he2.completionTime());
-      }
-    };
+
+    @Override
+    public boolean sameValueAs(HandlingHistory other) {
+        return other != null && this.handlingEvents.equals(other.handlingEvents);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        final HandlingHistory other = (HandlingHistory) o;
+        return sameValueAs(other);
+    }
+
+    @Override
+    public int hashCode() {
+        return handlingEvents.hashCode();
+    }
+
+    private static final Comparator<HandlingEvent> BY_COMPLETION_TIME_COMPARATOR =
+            (he1, he2) -> he1.completionTime().compareTo(he2.completionTime());
 
 }

src/main/java/se/citerus/dddsample/domain/model/voyage/SampleVoyages.java

@@ -1,7 +1,9 @@
 package se.citerus.dddsample.domain.model.voyage;
 
 import static se.citerus.dddsample.application.util.DateTestUtil.toDate;
+
 import se.citerus.dddsample.domain.model.location.Location;
+
 import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
 
 import java.lang.reflect.Field;
@@ -9,126 +11,125 @@ import java.util.*;
 
 /**
  * Sample carrier movements, for test purposes.
- *
  */
 public class SampleVoyages {
 
-  public static final Voyage CM001 = createVoyage("CM001", STOCKHOLM, HAMBURG);
-  public static final Voyage CM002 = createVoyage("CM002", HAMBURG, HONGKONG);
-  public static final Voyage CM003 = createVoyage("CM003", HONGKONG, NEWYORK);
-  public static final Voyage CM004 = createVoyage("CM004", NEWYORK, CHICAGO);
-  public static final Voyage CM005 = createVoyage("CM005", CHICAGO, HAMBURG);
-  public static final Voyage CM006 = createVoyage("CM006", HAMBURG, HANGZOU);
-  private static Voyage createVoyage(String id, Location from, Location to) {
-    return new Voyage(new VoyageNumber(id), new Schedule(Arrays.asList(
-      new CarrierMovement(from, to, new Date(), new Date())
-    )));
-  }
-
-  // TODO CM00[1-6] and createVoyage are deprecated. Remove and refactor tests.
-
-  public final static Voyage v100 = new Voyage.Builder(new VoyageNumber("V100"), HONGKONG).
-    addMovement(TOKYO, toDate("2009-03-03"), toDate("2009-03-05")).
-    addMovement(NEWYORK, toDate("2009-03-06"), toDate("2009-03-09")).
-    build();
-  public final static Voyage v200 = new Voyage.Builder(new VoyageNumber("V200"), TOKYO).
-      addMovement(NEWYORK, toDate("2009-03-06"), toDate("2009-03-08")).
-      addMovement(CHICAGO, toDate("2009-03-10"), toDate("2009-03-14")).
-      addMovement(STOCKHOLM, toDate("2009-03-14"), toDate("2009-03-16")).
-      build();
-  public final static Voyage v300 = new Voyage.Builder(new VoyageNumber("V300"), TOKYO).
-        addMovement(ROTTERDAM, toDate("2009-03-08"), toDate("2009-03-11")).
-        addMovement(HAMBURG, toDate("2009-03-11"), toDate("2009-03-12")).
-        addMovement(MELBOURNE, toDate("2009-03-14"), toDate("2009-03-18")).
-        addMovement(TOKYO, toDate("2009-03-19"), toDate("2009-03-21")).
-        build();
-  public final static Voyage v400 = new Voyage.Builder(new VoyageNumber("V400"), HAMBURG).
-          addMovement(STOCKHOLM, toDate("2009-03-14"), toDate("2009-03-15")).
-          addMovement(HELSINKI, toDate("2009-03-15"), toDate("2009-03-16")).
-          addMovement(HAMBURG, toDate("2009-03-20"), toDate("2009-03-22")).
-          build();
-
-  /**
-   * Voyage number 0100S (by ship)
-   *
-   * Hongkong - Hangzou - Tokyo - Melbourne - New York
-   */
-  public static final Voyage HONGKONG_TO_NEW_YORK =
-    new Voyage.Builder(new VoyageNumber("0100S"), HONGKONG).
-      addMovement(HANGZOU, toDate("2008-10-01", "12:00"), toDate("2008-10-03", "14:30")).
-      addMovement(TOKYO, toDate("2008-10-03", "21:00"), toDate("2008-10-06", "06:15")).
-      addMovement(MELBOURNE, toDate("2008-10-06", "11:00"), toDate("2008-10-12", "11:30")).
-      addMovement(NEWYORK, toDate("2008-10-14", "12:00"), toDate("2008-10-23", "23:10")).
-      build();
-
-
-  /**
-   * Voyage number 0200T (by train)
-   *
-   * New York - Chicago - Dallas
-   */
-  public static final Voyage NEW_YORK_TO_DALLAS =
-    new Voyage.Builder(new VoyageNumber("0200T"), NEWYORK).
-      addMovement(CHICAGO, toDate("2008-10-24", "07:00"), toDate("2008-10-24", "17:45")).
-      addMovement(DALLAS, toDate("2008-10-24", "21:25"), toDate("2008-10-25", "19:30")).
-      build();
-
-  /**
-   * Voyage number 0300A (by airplane)
-   *
-   * Dallas - Hamburg - Stockholm - Helsinki
-   */
-  public static final Voyage DALLAS_TO_HELSINKI =
-    new Voyage.Builder(new VoyageNumber("0300A"), DALLAS).
-      addMovement(HAMBURG, toDate("2008-10-29", "03:30"), toDate("2008-10-31", "14:00")).
-      addMovement(STOCKHOLM, toDate("2008-11-01", "15:20"), toDate("2008-11-01", "18:40")).
-      addMovement(HELSINKI, toDate("2008-11-02", "09:00"), toDate("2008-11-02", "11:15")).
-      build();
-
-  /**
-   * Voyage number 0301S (by ship)
-   *
-   * Dallas - Hamburg - Stockholm - Helsinki, alternate route
-   */
-  public static final Voyage DALLAS_TO_HELSINKI_ALT =
-    new Voyage.Builder(new VoyageNumber("0301S"), DALLAS).
-      addMovement(HELSINKI, toDate("2008-10-29", "03:30"), toDate("2008-11-05", "15:45")).
-      build();
-
-  /**
-   * Voyage number 0400S (by ship)
-   *
-   * Helsinki - Rotterdam - Shanghai - Hongkong
-   *
-   */
-  public static final Voyage HELSINKI_TO_HONGKONG =
-    new Voyage.Builder(new VoyageNumber("0400S"), HELSINKI).
-      addMovement(ROTTERDAM, toDate("2008-11-04", "05:50"), toDate("2008-11-06", "14:10")).
-      addMovement(SHANGHAI, toDate("2008-11-10", "21:45"), toDate("2008-11-22", "16:40")).
-      addMovement(HONGKONG, toDate("2008-11-24", "07:00"), toDate("2008-11-28", "13:37")).
-      build();
-
-  public static final Map<VoyageNumber, Voyage> ALL = new HashMap();
-
-  static {
-    for (Field field : SampleVoyages.class.getDeclaredFields()) {
-      if (field.getType().equals(Voyage.class)) {
-        try {
-          Voyage voyage = (Voyage) field.get(null);
-          ALL.put(voyage.voyageNumber(), voyage);
-        } catch (IllegalAccessException e) {
-          throw new RuntimeException(e);
+    public static final Voyage CM001 = createVoyage("CM001", STOCKHOLM, HAMBURG);
+    public static final Voyage CM002 = createVoyage("CM002", HAMBURG, HONGKONG);
+    public static final Voyage CM003 = createVoyage("CM003", HONGKONG, NEWYORK);
+    public static final Voyage CM004 = createVoyage("CM004", NEWYORK, CHICAGO);
+    public static final Voyage CM005 = createVoyage("CM005", CHICAGO, HAMBURG);
+    public static final Voyage CM006 = createVoyage("CM006", HAMBURG, HANGZOU);
+
+    private static Voyage createVoyage(String id, Location from, Location to) {
+        return new Voyage(new VoyageNumber(id), new Schedule(Collections.singletonList(
+                new CarrierMovement(from, to, new Date(), new Date())
+        )));
+    }
+
+    // TODO CM00[1-6] and createVoyage are deprecated. Remove and refactor tests.
+
+    public final static Voyage v100 = new Voyage.Builder(new VoyageNumber("V100"), HONGKONG).
+            addMovement(TOKYO, toDate("2009-03-03"), toDate("2009-03-05")).
+            addMovement(NEWYORK, toDate("2009-03-06"), toDate("2009-03-09")).
+            build();
+    public final static Voyage v200 = new Voyage.Builder(new VoyageNumber("V200"), TOKYO).
+            addMovement(NEWYORK, toDate("2009-03-06"), toDate("2009-03-08")).
+            addMovement(CHICAGO, toDate("2009-03-10"), toDate("2009-03-14")).
+            addMovement(STOCKHOLM, toDate("2009-03-14"), toDate("2009-03-16")).
+            build();
+    public final static Voyage v300 = new Voyage.Builder(new VoyageNumber("V300"), TOKYO).
+            addMovement(ROTTERDAM, toDate("2009-03-08"), toDate("2009-03-11")).
+            addMovement(HAMBURG, toDate("2009-03-11"), toDate("2009-03-12")).
+            addMovement(MELBOURNE, toDate("2009-03-14"), toDate("2009-03-18")).
+            addMovement(TOKYO, toDate("2009-03-19"), toDate("2009-03-21")).
+            build();
+    public final static Voyage v400 = new Voyage.Builder(new VoyageNumber("V400"), HAMBURG).
+            addMovement(STOCKHOLM, toDate("2009-03-14"), toDate("2009-03-15")).
+            addMovement(HELSINKI, toDate("2009-03-15"), toDate("2009-03-16")).
+            addMovement(HAMBURG, toDate("2009-03-20"), toDate("2009-03-22")).
+            build();
+
+    /**
+     * Voyage number 0100S (by ship)
+     * <p>
+     * Hongkong - Hangzou - Tokyo - Melbourne - New York
+     */
+    public static final Voyage HONGKONG_TO_NEW_YORK =
+            new Voyage.Builder(new VoyageNumber("0100S"), HONGKONG).
+                    addMovement(HANGZOU, toDate("2008-10-01", "12:00"), toDate("2008-10-03", "14:30")).
+                    addMovement(TOKYO, toDate("2008-10-03", "21:00"), toDate("2008-10-06", "06:15")).
+                    addMovement(MELBOURNE, toDate("2008-10-06", "11:00"), toDate("2008-10-12", "11:30")).
+                    addMovement(NEWYORK, toDate("2008-10-14", "12:00"), toDate("2008-10-23", "23:10")).
+                    build();
+
+
+    /**
+     * Voyage number 0200T (by train)
+     * <p>
+     * New York - Chicago - Dallas
+     */
+    public static final Voyage NEW_YORK_TO_DALLAS =
+            new Voyage.Builder(new VoyageNumber("0200T"), NEWYORK).
+                    addMovement(CHICAGO, toDate("2008-10-24", "07:00"), toDate("2008-10-24", "17:45")).
+                    addMovement(DALLAS, toDate("2008-10-24", "21:25"), toDate("2008-10-25", "19:30")).
+                    build();
+
+    /**
+     * Voyage number 0300A (by airplane)
+     * <p>
+     * Dallas - Hamburg - Stockholm - Helsinki
+     */
+    public static final Voyage DALLAS_TO_HELSINKI =
+            new Voyage.Builder(new VoyageNumber("0300A"), DALLAS).
+                    addMovement(HAMBURG, toDate("2008-10-29", "03:30"), toDate("2008-10-31", "14:00")).
+                    addMovement(STOCKHOLM, toDate("2008-11-01", "15:20"), toDate("2008-11-01", "18:40")).
+                    addMovement(HELSINKI, toDate("2008-11-02", "09:00"), toDate("2008-11-02", "11:15")).
+                    build();
+
+    /**
+     * Voyage number 0301S (by ship)
+     * <p>
+     * Dallas - Hamburg - Stockholm - Helsinki, alternate route
+     */
+    public static final Voyage DALLAS_TO_HELSINKI_ALT =
+            new Voyage.Builder(new VoyageNumber("0301S"), DALLAS).
+                    addMovement(HELSINKI, toDate("2008-10-29", "03:30"), toDate("2008-11-05", "15:45")).
+                    build();
+
+    /**
+     * Voyage number 0400S (by ship)
+     * <p>
+     * Helsinki - Rotterdam - Shanghai - Hongkong
+     */
+    public static final Voyage HELSINKI_TO_HONGKONG =
+            new Voyage.Builder(new VoyageNumber("0400S"), HELSINKI).
+                    addMovement(ROTTERDAM, toDate("2008-11-04", "05:50"), toDate("2008-11-06", "14:10")).
+                    addMovement(SHANGHAI, toDate("2008-11-10", "21:45"), toDate("2008-11-22", "16:40")).
+                    addMovement(HONGKONG, toDate("2008-11-24", "07:00"), toDate("2008-11-28", "13:37")).
+                    build();
+
+    public static final Map<VoyageNumber, Voyage> ALL = new HashMap<>();
+
+    static {
+        for (Field field : SampleVoyages.class.getDeclaredFields()) {
+            if (field.getType().equals(Voyage.class)) {
+                try {
+                    Voyage voyage = (Voyage) field.get(null);
+                    ALL.put(voyage.voyageNumber(), voyage);
+                } catch (IllegalAccessException e) {
+                    throw new RuntimeException(e);
+                }
+            }
         }
-      }
     }
-  }
 
-  public static List<Voyage> getAll() {
-    return new ArrayList(ALL.values());
-  }
+    public static List<Voyage> getAll() {
+        return new ArrayList<>(ALL.values());
+    }
+
+    public static Voyage lookup(VoyageNumber voyageNumber) {
+        return ALL.get(voyageNumber);
+    }
 
-  public static Voyage lookup(VoyageNumber voyageNumber) {
-    return ALL.get(voyageNumber);
-  }
-  
 }

src/main/java/se/citerus/dddsample/interfaces/booking/web/RouteAssignmentCommand.java

@@ -78,11 +78,7 @@ public class RouteAssignmentCommand {
     }
 
     public static Factory factory() {
-      return new Factory() {
-        public Object create() {
-          return new LegCommand();
-        }
-      };
+      return LegCommand::new;
     }
 
   }

src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingController.java

@@ -2,11 +2,9 @@ package se.citerus.dddsample.interfaces.tracking;
 
 import org.springframework.context.MessageSource;
 import org.springframework.stereotype.Controller;
-import org.springframework.validation.BindException;
 import org.springframework.validation.BindingResult;
-import org.springframework.validation.Errors;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.support.RequestContextUtils;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.CargoRepository;
@@ -24,59 +22,58 @@ import java.util.Map;
  * Controller for tracking cargo. This interface sits immediately on top of the
  * domain layer, unlike the booking interface which has a a remote facade and supporting
  * DTOs in between.
- * <p/>
+ * <p>
  * An adapter class, designed for the tracking use case, is used to wrap the domain model
  * to make it easier to work with in a web page rendering context. We do not want to apply
  * view rendering constraints to the design of our domain model, and the adapter
- * helps us shield the domain model classes. 
- * <p/>
+ * helps us shield the domain model classes.
+ * <p>
  *
  * @eee se.citerus.dddsample.application.web.CargoTrackingViewAdapter
  * @see se.citerus.dddsample.interfaces.booking.web.CargoAdminController
- *
  */
 @Controller
 public final class CargoTrackingController {
 
-  private CargoRepository cargoRepository;
-  private HandlingEventRepository handlingEventRepository;
-  private MessageSource messageSource;
+    private CargoRepository cargoRepository;
+    private HandlingEventRepository handlingEventRepository;
+    private MessageSource messageSource;
 
-  @RequestMapping(method = RequestMethod.GET)
-  public Map<String, CargoTrackingViewAdapter> get(final TrackCommand trackCommand) {
-      return new HashMap<>();
-  }
+    @RequestMapping(method = RequestMethod.GET)
+    public Map<String, CargoTrackingViewAdapter> get(final TrackCommand trackCommand) {
+        return new HashMap<>();
+    }
 
-  @RequestMapping(method = RequestMethod.POST)
-  protected Map<String, CargoTrackingViewAdapter> onSubmit(final HttpServletRequest request,
-                                                           final TrackCommand command,
-                                                           final BindingResult bindingResult) {
-    new TrackCommandValidator().validate(command, bindingResult);
+    @RequestMapping(method = RequestMethod.POST)
+    protected Map<String, CargoTrackingViewAdapter> onSubmit(final HttpServletRequest request,
+                                                             final TrackCommand command,
+                                                             final BindingResult bindingResult) {
+        new TrackCommandValidator().validate(command, bindingResult);
 
-    final TrackingId trackingId = new TrackingId(command.getTrackingId());
-    final Cargo cargo = cargoRepository.find(trackingId);
+        final TrackingId trackingId = new TrackingId(command.getTrackingId());
+        final Cargo cargo = cargoRepository.find(trackingId);
 
-    final Map<String, CargoTrackingViewAdapter> model = new HashMap<String, CargoTrackingViewAdapter>();
-    if (cargo != null) {
-      final Locale locale = RequestContextUtils.getLocale(request);
-      final List<HandlingEvent> handlingEvents = handlingEventRepository.lookupHandlingHistoryOfCargo(trackingId).distinctEventsByCompletionTime();
-      model.put("cargo", new CargoTrackingViewAdapter(cargo, messageSource, locale, handlingEvents));
-    } else {
-      bindingResult.rejectValue("trackingId", "cargo.unknown_id", new Object[]{command.getTrackingId()}, "Unknown tracking id");
+        final Map<String, CargoTrackingViewAdapter> model = new HashMap<String, CargoTrackingViewAdapter>();
+        if (cargo != null) {
+            final Locale locale = RequestContextUtils.getLocale(request);
+            final List<HandlingEvent> handlingEvents = handlingEventRepository.lookupHandlingHistoryOfCargo(trackingId).distinctEventsByCompletionTime();
+            model.put("cargo", new CargoTrackingViewAdapter(cargo, messageSource, locale, handlingEvents));
+        } else {
+            bindingResult.rejectValue("trackingId", "cargo.unknown_id", new Object[]{command.getTrackingId()}, "Unknown tracking id");
+        }
+        return model;
     }
-    return model;
-  }
 
-  public void setCargoRepository(CargoRepository cargoRepository) {
-    this.cargoRepository = cargoRepository;
-  }
+    public void setCargoRepository(CargoRepository cargoRepository) {
+        this.cargoRepository = cargoRepository;
+    }
 
-  public void setHandlingEventRepository(HandlingEventRepository handlingEventRepository) {
-    this.handlingEventRepository = handlingEventRepository;
-  }
+    public void setHandlingEventRepository(HandlingEventRepository handlingEventRepository) {
+        this.handlingEventRepository = handlingEventRepository;
+    }
 
-  public void setMessageSource(MessageSource messageSource) {
-      this.messageSource = messageSource;
-  }
+    public void setMessageSource(MessageSource messageSource) {
+        this.messageSource = messageSource;
+    }
 
 }

src/test/java/se/citerus/dddsample/infrastructure/persistence/hibernate/CargoRepositoryTest.java

@@ -23,19 +23,19 @@ import se.citerus.dddsample.domain.model.location.UnLocode;
 import se.citerus.dddsample.domain.model.voyage.Voyage;
 import se.citerus.dddsample.domain.model.voyage.VoyageNumber;
 import se.citerus.dddsample.domain.model.voyage.VoyageRepository;
-import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
-import static se.citerus.dddsample.domain.model.voyage.SampleVoyages.*;
-import static se.citerus.dddsample.domain.model.handling.HandlingEvent.Type.*;
 
 import javax.sql.DataSource;
-
 import java.lang.reflect.Field;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 import static org.junit.Assert.*;
+import static se.citerus.dddsample.domain.model.handling.HandlingEvent.Type.LOAD;
+import static se.citerus.dddsample.domain.model.handling.HandlingEvent.Type.RECEIVE;
+import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
+import static se.citerus.dddsample.domain.model.voyage.SampleVoyages.CM004;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(value = {"/context-infrastructure-persistence.xml", "/context-domain.xml"})
@@ -146,7 +146,7 @@ public class CargoRepositoryTest {
         Cargo cargo = new Cargo(trackingId, new RouteSpecification(origin, destination, new Date()));
         cargoRepository.store(cargo);
 
-        cargo.assignToRoute(new Itinerary(Arrays.asList(
+        cargo.assignToRoute(new Itinerary(Collections.singletonList(
                 new Leg(
                         voyageRepository.find(new VoyageNumber("0101")),
                         locationRepository.find(STOCKHOLM.unLocode()),
@@ -181,7 +181,7 @@ public class CargoRepositoryTest {
 
         Location legFrom = locationRepository.find(new UnLocode("FIHEL"));
         Location legTo = locationRepository.find(new UnLocode("DEHAM"));
-        Itinerary newItinerary = new Itinerary(Arrays.asList(new Leg(CM004, legFrom, legTo, new Date(), new Date())));
+        Itinerary newItinerary = new Itinerary(Collections.singletonList(new Leg(CM004, legFrom, legTo, new Date(), new Date())));
 
         cargo.assignToRoute(newItinerary);
 

src/test/java/se/citerus/dddsample/infrastructure/persistence/inmemory/CargoRepositoryInMem.java

@@ -7,6 +7,7 @@ import se.citerus.dddsample.domain.model.cargo.TrackingId;
 import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
 import se.citerus.dddsample.domain.model.handling.HandlingHistory;
 import se.citerus.dddsample.domain.model.location.Location;
+
 import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
 
 import java.util.*;
@@ -14,77 +15,77 @@ import java.util.*;
 /**
  * CargoRepositoryInMem implement the CargoRepository interface but is a test
  * class not intended for usage in real application.
- * <p/>
+ * <p>
  * It setup a simple local hash with a number of Cargo's with TrackingId as key
  * defined at compile time.
- * <p/>
+ * <p>
  */
 public class CargoRepositoryInMem implements CargoRepository {
 
-  private Map<String, Cargo> cargoDb;
-  private HandlingEventRepository handlingEventRepository;
-
-  /**
-   * Constructor.
-   */
-  public CargoRepositoryInMem() {
-    cargoDb = new HashMap<String, Cargo>();
-  }
-
-  public Cargo find(final TrackingId trackingId) {
-    return cargoDb.get(trackingId.idString());
-  }
-
-  public void store(final Cargo cargo) {
-    cargoDb.put(cargo.trackingId().idString(), cargo);
-  }
-
-  public TrackingId nextTrackingId() {
-    String random = UUID.randomUUID().toString().toUpperCase();
-    return new TrackingId(
-      random.substring(0, random.indexOf("-"))
-    );
-  }
-
-  public List<Cargo> findAll() {
-    return new ArrayList(cargoDb.values());
-  }
-
-  public void init() throws Exception {
-    final TrackingId xyz = new TrackingId("XYZ");
-    final Cargo cargoXYZ = createCargoWithDeliveryHistory(
-      xyz, STOCKHOLM, MELBOURNE, handlingEventRepository.lookupHandlingHistoryOfCargo(xyz));
-    cargoDb.put(xyz.idString(), cargoXYZ);
-
-    final TrackingId zyx = new TrackingId("ZYX");
-    final Cargo cargoZYX = createCargoWithDeliveryHistory(
-      zyx, MELBOURNE, STOCKHOLM, handlingEventRepository.lookupHandlingHistoryOfCargo(zyx));
-    cargoDb.put(zyx.idString(), cargoZYX);
-
-    final TrackingId abc = new TrackingId("ABC");
-    final Cargo cargoABC = createCargoWithDeliveryHistory(
-      abc, STOCKHOLM, HELSINKI, handlingEventRepository.lookupHandlingHistoryOfCargo(abc));
-    cargoDb.put(abc.idString(), cargoABC);
-
-    final TrackingId cba = new TrackingId("CBA");
-    final Cargo cargoCBA = createCargoWithDeliveryHistory(
-      cba, HELSINKI, STOCKHOLM, handlingEventRepository.lookupHandlingHistoryOfCargo(cba));
-    cargoDb.put(cba.idString(), cargoCBA);
-  }
-
-  public void setHandlingEventRepository(final HandlingEventRepository handlingEventRepository) {
-    this.handlingEventRepository = handlingEventRepository;
-  }
-
-  public static Cargo createCargoWithDeliveryHistory(TrackingId trackingId,
-                                                     Location origin,
-                                                     Location destination,
-                                                     HandlingHistory handlingHistory) {
-
-    final RouteSpecification routeSpecification = new RouteSpecification(origin, destination, new Date());
-    final Cargo cargo = new Cargo(trackingId, routeSpecification);
-    cargo.deriveDeliveryProgress(handlingHistory);
-
-    return cargo;
-  }
+    private Map<String, Cargo> cargoDb;
+    private HandlingEventRepository handlingEventRepository;
+
+    /**
+     * Constructor.
+     */
+    public CargoRepositoryInMem() {
+        cargoDb = new HashMap<>();
+    }
+
+    public Cargo find(final TrackingId trackingId) {
+        return cargoDb.get(trackingId.idString());
+    }
+
+    public void store(final Cargo cargo) {
+        cargoDb.put(cargo.trackingId().idString(), cargo);
+    }
+
+    public TrackingId nextTrackingId() {
+        String random = UUID.randomUUID().toString().toUpperCase();
+        return new TrackingId(
+                random.substring(0, random.indexOf("-"))
+        );
+    }
+
+    public List<Cargo> findAll() {
+        return new ArrayList<>(cargoDb.values());
+    }
+
+    public void init() throws Exception {
+        final TrackingId xyz = new TrackingId("XYZ");
+        final Cargo cargoXYZ = createCargoWithDeliveryHistory(
+                xyz, STOCKHOLM, MELBOURNE, handlingEventRepository.lookupHandlingHistoryOfCargo(xyz));
+        cargoDb.put(xyz.idString(), cargoXYZ);
+
+        final TrackingId zyx = new TrackingId("ZYX");
+        final Cargo cargoZYX = createCargoWithDeliveryHistory(
+                zyx, MELBOURNE, STOCKHOLM, handlingEventRepository.lookupHandlingHistoryOfCargo(zyx));
+        cargoDb.put(zyx.idString(), cargoZYX);
+
+        final TrackingId abc = new TrackingId("ABC");
+        final Cargo cargoABC = createCargoWithDeliveryHistory(
+                abc, STOCKHOLM, HELSINKI, handlingEventRepository.lookupHandlingHistoryOfCargo(abc));
+        cargoDb.put(abc.idString(), cargoABC);
+
+        final TrackingId cba = new TrackingId("CBA");
+        final Cargo cargoCBA = createCargoWithDeliveryHistory(
+                cba, HELSINKI, STOCKHOLM, handlingEventRepository.lookupHandlingHistoryOfCargo(cba));
+        cargoDb.put(cba.idString(), cargoCBA);
+    }
+
+    public void setHandlingEventRepository(final HandlingEventRepository handlingEventRepository) {
+        this.handlingEventRepository = handlingEventRepository;
+    }
+
+    public static Cargo createCargoWithDeliveryHistory(TrackingId trackingId,
+                                                       Location origin,
+                                                       Location destination,
+                                                       HandlingHistory handlingHistory) {
+
+        final RouteSpecification routeSpecification = new RouteSpecification(origin, destination, new Date());
+        final Cargo cargo = new Cargo(trackingId, routeSpecification);
+        cargo.deriveDeliveryProgress(handlingHistory);
+
+        return cargo;
+    }
 }

src/test/java/se/citerus/dddsample/interfaces/booking/web/ItinerarySelectionCommandTest.java

@@ -1,6 +1,5 @@
 package se.citerus.dddsample.interfaces.booking.web;
 
-import junit.framework.TestCase;
 import org.junit.Test;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.web.bind.ServletRequestDataBinder;