Added Checkstyle configuration file that checks the sun coding conventions.

Misc CheckStyle fixes.

Removed magic numbers from HashCodeBuilder.

Created a separate sub package for DTO assemblers.

Minor refactorings to increase readability.

dddsample/checkstyle.xml

+<?xml version="1.0"?>
+<!-- 
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ -->
+
+<!DOCTYPE module PUBLIC
+    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
+
+<!--
+
+  Checkstyle configuration that checks the sun coding conventions from:
+
+    - the Java Language Specification at
+      http://java.sun.com/docs/books/jls/second_edition/html/index.html
+
+    - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
+
+    - the Javadoc guidelines at
+      http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
+
+    - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
+
+    - some best practices
+
+  Checkstyle is very configurable. Be sure to read the documentation at
+  http://checkstyle.sf.net (or in your downloaded distribution).
+
+  Most Checks are configurable, be sure to consult the documentation.
+
+  To completely disable a check, just comment it out or delete it from the file.
+
+  Finally, it is worth reading the documentation.
+
+-->
+
+<module name="Checker">
+
+    <!-- Checks that a package.html file exists for each package.     -->
+    <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
+    <module name="PackageHtml"/>
+
+    <!-- Checks whether files end with a new line.                        -->
+    <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
+    <module name="NewlineAtEndOfFile"/>
+
+    <!-- Checks that property files contain the same keys.         -->
+    <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
+    <module name="Translation"/>
+
+
+    <module name="TreeWalker">
+
+        <property name="cacheFile" value="${checkstyle.cache.file}"/>
+
+        <!-- Checks for Javadoc comments.                     -->
+        <!-- See http://checkstyle.sf.net/config_javadoc.html -->
+        <module name="JavadocMethod"/>
+        <module name="JavadocType">
+          <property name="scope" value="public"/>
+        </module>
+        <module name="JavadocVariable">
+          <property name="scope" value="public"/>
+        </module>
+        <module name="JavadocStyle"/>
+
+        <!-- Checks for Naming Conventions.                  -->
+        <!-- See http://checkstyle.sf.net/config_naming.html -->
+        <module name="ConstantName"/>
+        <module name="LocalFinalVariableName"/>
+        <module name="LocalVariableName"/>
+        <module name="MemberName"/>
+        <module name="MethodName"/>
+        <module name="PackageName"/>
+        <module name="ParameterName"/>
+        <module name="StaticVariableName"/>
+        <module name="TypeName"/>
+
+
+        <!-- Checks for Headers                                -->
+        <!-- See http://checkstyle.sf.net/config_header.html   -->
+        <!-- <module name="Header">                            -->
+            <!-- The follow property value demonstrates the ability     -->
+            <!-- to have access to ANT properties. In this case it uses -->
+            <!-- the ${basedir} property to allow Checkstyle to be run  -->
+            <!-- from any directory within a project. See property      -->
+            <!-- expansion,                                             -->
+            <!-- http://checkstyle.sf.net/config.html#properties        -->
+            <!-- <property                                              -->
+            <!--     name="headerFile"                                  -->
+            <!--     value="${basedir}/java.header"/>                   -->
+        <!-- </module> -->
+
+        <!-- Following interprets the header file as regular expressions. -->
+        <!-- <module name="RegexpHeader"/>                                -->
+
+
+        <!-- Checks for imports                              -->
+        <!-- See http://checkstyle.sf.net/config_import.html -->
+        <module name="AvoidStarImport"/>
+        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+        <module name="RedundantImport"/>
+        <module name="UnusedImports"/>
+
+
+        <!-- Checks for Size Violations.                    -->
+        <!-- See http://checkstyle.sf.net/config_sizes.html -->
+        <module name="FileLength"/>
+
+        <module name="LineLength">
+         <property name="max" value="120"/>
+        </module>
+
+        <module name="MethodLength"/>
+        <module name="ParameterNumber"/>
+
+
+        <!-- Checks for whitespace                               -->
+        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
+        <module name="EmptyForIteratorPad"/>
+        <module name="MethodParamPad"/>
+
+        <module name="NoWhitespaceAfter">
+          <!-- Default tokens and additional GENERIC_START -->
+          <property name="tokens" value="ARRAY_INIT, BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS, GENERIC_START"/>
+        </module>
+        
+        <module name="NoWhitespaceBefore">
+          <!-- Default tokens and additional GENERIC_START and GENERIC_END -->
+          <property name="tokens" value="SEMI, POST_DEC, POST_INC, GENERIC_START, GENERIC_END"/>
+        </module>
+        
+        <module name="WhitespaceAfter">
+          <!-- Default tokens and additional GENERIC_END -->
+          <property name="tokens" value="COMMA, SEMI, TYPECAST, GENERIC_END"/>
+        </module>
+        
+        <module name="WhitespaceAround">
+          <!-- Default tokens without GENERIC_START and GENERIC_END -->
+          <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN,
+        BOR, BOR_ASSIGN, BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON,
+        DIV, DIV_ASSIGN, EQUAL, GE, GT, LAND, LCURLY, LE, 
+        LITERAL_ASSERT, LITERAL_CATCH, LITERAL_DO, LITERAL_ELSE, 
+        LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF, LITERAL_RETURN,
+        LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE, LOR, LT, MINUS,
+        MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS, PLUS_ASSIGN,
+        QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN, STAR, STAR_ASSIGN,
+        TYPE_EXTENSION_AND, WILDCARD_TYPE"/>
+        </module>
+        
+        <module name="OperatorWrap"/>
+        <module name="ParenPad"/>
+        <module name="TypecastParenPad"/>
+        <module name="TabCharacter"/>
+
+
+        <!-- Modifier Checks                                    -->
+        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
+        <module name="ModifierOrder"/>
+        <module name="RedundantModifier"/>
+
+
+        <!-- Checks for blocks. You know, those {}'s         -->
+        <!-- See http://checkstyle.sf.net/config_blocks.html -->
+        <module name="AvoidNestedBlocks"/>
+        <module name="EmptyBlock"/>
+        <module name="LeftCurly"/>
+        <module name="NeedBraces"/>
+        <module name="RightCurly"/>
+
+
+        <!-- Checks for common coding problems               -->
+        <!-- See http://checkstyle.sf.net/config_coding.html -->
+        <module name="DoubleCheckedLocking"/>    <!-- MY FAVOURITE -->
+        <module name="EmptyStatement"/>
+        <module name="EqualsHashCode"/>
+        <module name="IllegalInstantiation"/>
+        <module name="InnerAssignment"/>
+        <module name="MagicNumber"/>
+        <module name="MissingSwitchDefault"/>
+        <module name="RedundantThrows"/>
+        <module name="SimplifyBooleanExpression"/>
+        <module name="SimplifyBooleanReturn"/>
+
+        <!-- Checks for class design                         -->
+        <!-- See http://checkstyle.sf.net/config_design.html -->
+        <module name="DesignForExtension"/>
+        <module name="FinalClass"/>
+        <module name="HideUtilityClassConstructor"/>
+        <module name="InterfaceIsType"/>
+        <module name="VisibilityModifier"/>
+
+
+        <!-- Miscellaneous other checks.                   -->
+        <!-- See http://checkstyle.sf.net/config_misc.html -->
+        <module name="ArrayTypeStyle"/>
+        <module name="FinalParameters"/>
+        <module name="GenericIllegalRegexp">
+            <property name="format" value="\s+$"/>
+            <property name="message" value="Line has trailing spaces."/>
+        </module>
+        <module name="TodoComment"/>
+        <module name="UpperEll"/>
+
+    </module>
+
+</module>

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

 
 import javax.persistence.*;
 
-
 /**
  * A Cargo.
  */
 @Entity
-public class Cargo {
+public final class Cargo {
 
   @Id
   @GeneratedValue
   private Location destination;
 
   @Transient
-  private DeliveryHistory deliveryHistory = new DeliveryHistory();
+  private final DeliveryHistory deliveryHistory = new DeliveryHistory();
 
   @ManyToOne(cascade = CascadeType.ALL)
   private Itinerary itinerary;
 
-  public Cargo(TrackingId trackingId, Location origin, Location destination) {
-    Validate.noNullElements(new Object[] {trackingId, origin, destination});
+  /**
+   * Constructor.
+   *
+   * @param trackingId
+   * @param origin
+   * @param destination
+   */
+  public Cargo(final TrackingId trackingId, final Location origin, final Location destination) {
+    Validate.noNullElements(new Object[]{trackingId, origin, destination});
     this.trackingId = trackingId;
     this.origin = origin;
     this.destination = destination;
     return this.origin;
   }
 
-  public void setOrigin(Location origin) {
+  public void setOrigin(final Location origin) {
     Validate.notNull(origin);
     this.origin = origin;
   }
 
-  public void setDestination(Location destination) {
+  public void setDestination(final Location destination) {
     Validate.notNull(destination);
     this.destination = destination;
   }
    * @return Last known location of the cargo, or Location.UNKNOWN if the delivery history is empty.
    */
   public Location lastKnownLocation() {
-    HandlingEvent lastEvent = deliveryHistory.lastEvent();
+    final HandlingEvent lastEvent = deliveryHistory.lastEvent();
     if (lastEvent != null) {
       return lastEvent.location();
     } else {
    *
    * @param itinerary an itinerary
    */
-  public void setItinerary(Itinerary itinerary) {
+  public void setItinerary(final Itinerary itinerary) {
     Validate.notNull(itinerary);
     this.itinerary = itinerary;
   }
    */
   public boolean isMisdirected() {
     final HandlingEvent lastEvent = deliveryHistory.lastEvent();
-    if (itinerary == null || lastEvent == null)
+    if (itinerary == null || lastEvent == null) {
       return false;
-
-    return !itinerary.isExpected(lastEvent);
+    } else {
+      return !itinerary.isExpected(lastEvent);
+    }
   }
 
   /**
    * @return True if the cargo has been unloaded at the final destination.
    */
   public boolean isUnloadedAtDestination() {
-    Location destination = finalDestination();
+    final Location destination = finalDestination();
     if (destination == null) {
       return false;
     }
     for (HandlingEvent event : deliveryHistory.eventsOrderedByCompletionTime()) {
-      if (HandlingEvent.Type.UNLOAD.equals(event.type()) &&
-          destination.equals(event.location())) {
+      if (HandlingEvent.Type.UNLOAD.equals(event.type())
+        && destination.equals(event.location())) {
         return true;
       }
     }
    * @return <code>true</code> if the given cargo's and this cargos's trackingId is the same, regardles of other
    *         attributes.
    */
-  private boolean sameIdentityAs(Cargo other) {
+  private boolean sameIdentityAs(final Cargo other) {
     return other != null && trackingId.equals(other.trackingId);
   }
 
    * @see #sameIdentityAs(Cargo)
    */
   @Override
-  public boolean equals(Object object) {
+  public boolean equals(final Object object) {
     if (!(object instanceof Cargo)) {
       return false;
     }
-    Cargo other = (Cargo) object;
+    final Cargo other = (Cargo) object;
     return sameIdentityAs(other);
   }
 

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

  * A carrier movement is a vessel voyage from one location to another.
  */
 @Entity
-public class CarrierMovement {
+public final class CarrierMovement {
 
   @Id
   @GeneratedValue
   @ManyToOne
   private Location to;
 
-  public CarrierMovement(CarrierMovementId carrierMovementId, Location from, Location to) {
-    Validate.noNullElements(new Object[] {carrierMovementId, from, to});
+  /**
+   * Constructor.
+   *
+   * @param carrierMovementId
+   * @param from
+   * @param to
+   */
+  public CarrierMovement(final CarrierMovementId carrierMovementId, final Location from, final Location to) {
+    Validate.noNullElements(new Object[]{carrierMovementId, from, to});
     this.carrierMovementId = carrierMovementId;
     this.from = from;
     this.to = to;
    * @return <code>true</code> if the given carrier movement's and this carrier movement's carrier id are the same,
    *         regardles of other attributes.
    */
-  public boolean sameIdentityAs(CarrierMovement other) {
+  public boolean sameIdentityAs(final CarrierMovement other) {
     return carrierMovementId.equals(other.carrierMovementId);
   }
 
   @Override
-  public boolean equals(Object o) {
+  public boolean equals(final Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
 
-    CarrierMovement that = (CarrierMovement) o;
+    final CarrierMovement that = (CarrierMovement) o;
 
     return sameIdentityAs(that);
   }

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

 
 /**
  * Identifies a particular carrier movement, such as a flight number.
- *
  */
 @Embeddable
-public class CarrierMovementId {
+public final class CarrierMovementId {
 
   @Column(name = "carrier_movement_id")
   private String id;
 
-  public CarrierMovementId(String id) {
+  /**
+   * Constructor.
+   *
+   * @param id Id string.
+   */
+  public CarrierMovementId(final String id) {
     Validate.notNull(id);
     this.id = id;
   }
   }
 
   @Override
-  public boolean equals(Object obj) {
+  public boolean equals(final Object obj) {
     return EqualsBuilder.reflectionEquals(this, obj);
   }
 
   }
 
   // Needed by hibernate
-  CarrierMovementId() {}
+  CarrierMovementId() {
+  }
 
 }

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

 
 /**
  * The delivery history of a cargo.
- *
+ * <p/>
  * Is this an entiy or a value object?
  */
-public class DeliveryHistory {
+public final class DeliveryHistory {
 
-  private Set<HandlingEvent> events = new HashSet<HandlingEvent>();
+  private final Set<HandlingEvent> events = new HashSet<HandlingEvent>();
 
   /**
    * Adds all HandlingEvent to the delivery history.
    *
    * @param events events to add
    */
-  public void addAllEvents(Collection<HandlingEvent> events) {
+  public void addAllEvents(final Collection<HandlingEvent> events) {
     this.events.addAll(events);
   }
 
    *
    * @param event event to add.
    */
-  public void addEvent(HandlingEvent event) {
+  public void addEvent(final HandlingEvent event) {
     this.events.add(event);
   }
 
    * @return An <b>unmodifiable</b> list of handling events, ordered by the time the events occured.
    */
   public List<HandlingEvent> eventsOrderedByCompletionTime() {
-    List<HandlingEvent> eventList = new ArrayList<HandlingEvent>(events);
+    final List<HandlingEvent> eventList = new ArrayList<HandlingEvent>(events);
     Collections.sort(eventList, HandlingEvent.BY_COMPLETION_TIME_COMPARATOR);
     return Collections.unmodifiableList(eventList);
   }
     if (events.isEmpty()) {
       return null;
     } else {
-      List<HandlingEvent> orderedEvents = eventsOrderedByCompletionTime();
+      final List<HandlingEvent> orderedEvents = eventsOrderedByCompletionTime();
       return orderedEvents.get(orderedEvents.size() - 1);
     }
   }
     if (lastEvent() == null)
       return StatusCode.NOT_RECEIVED;
 
-    HandlingEvent.Type type = lastEvent().type();
+    final HandlingEvent.Type type = lastEvent().type();
     if (type == HandlingEvent.Type.LOAD)
       return StatusCode.ONBOARD_CARRIER;
 

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

  * {@link Type#UNLOAD}. All other events must be of {@link Type#RECEIVE}, {@link Type#CLAIM} or {@link Type#CUSTOMS}.
  */
 @Entity
-public class HandlingEvent {
+public final class HandlingEvent {
 
   /**
    * Comparator used to be able to sort HandlingEvents according to their completion time
    */
   public static final Comparator<HandlingEvent> BY_COMPLETION_TIME_COMPARATOR = new Comparator<HandlingEvent>() {
-    public int compare(HandlingEvent o1, HandlingEvent o2) {
+    public int compare(final HandlingEvent o1, final HandlingEvent o2) {
       return o1.completionTime().compareTo(o2.completionTime());
     }
   };
 
     private boolean carrierMovementRequired;
 
-    private Type(boolean carrierMovementRequired) {
+    /**
+     * Private enum constructor.
+     *
+     * @param carrierMovementRequired Required status.
+     */
+    private Type(final boolean carrierMovementRequired) {
       this.carrierMovementRequired = carrierMovementRequired;
     }
 
     }
   }
 
-
   /**
    * @param cargo            cargo
    * @param completionTime   completion time, the reported time that the event actually happened (e.g. the receive took place).
    * @param location         where the event took place
    * @param carrierMovement  carrier movement.
    */
-  public HandlingEvent(Cargo cargo, Date completionTime, Date registrationTime, Type type, Location location, CarrierMovement carrierMovement) {
-    Validate.noNullElements(new Object[] {cargo, completionTime, registrationTime, type, location});
+  public HandlingEvent(final Cargo cargo, final Date completionTime, final Date registrationTime, final Type type,
+                       final Location location, final CarrierMovement carrierMovement) {
+    Validate.noNullElements(new Object[]{cargo, completionTime, registrationTime, type, location});
     this.registrationTime = registrationTime;
     this.completionTime = completionTime;
     this.type = type;
     return this.cargo;
   }
 
-  public boolean equals(Object o) {
+  public boolean equals(final Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
 
-    HandlingEvent event = (HandlingEvent) o;
+    final HandlingEvent event = (HandlingEvent) o;
 
     return sameEventAs(event);
   }
   /**
    * Events compare by the attributes that identify the underlying event as opposed to the report of the event.
    * Therefore the completion time is part of the comparison but not the registration time.
-   *
+   * <p/>
    * Compare this behavior to the value object {@link se.citerus.dddsample.domain.Leg#sameValueAs(Leg)}
    * Compare this behavior to the entity {@link se.citerus.dddsample.domain.Cargo#sameIdentityAs(Cargo)}
    *
    * @param other The other hanling event.
    * @return <code>true</code> if the given handling event and this event are regarded as the same.
    */
-  public boolean sameEventAs(HandlingEvent other) {
+  public boolean sameEventAs(final HandlingEvent other) {
     return other != null && new EqualsBuilder().
       append(this.cargo, other.cargo).
       append(this.carrierMovement, other.carrierMovement).
 
   @Override
   public int hashCode() {
-    return new HashCodeBuilder(13,41).
+    return new HashCodeBuilder().
       append(cargo).
       append(carrierMovement).
       append(completionTime).

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

  *
  */
 @Entity
-public class Itinerary {
+public final class Itinerary {
 
   @Id
   @GeneratedValue
 
   public static final Itinerary EMPTY_ITINERARY = new Itinerary();
 
-  public Itinerary(List<Leg> legs) {
+  /**
+   * Constructor.
+   *
+   * @param legs List of legs for this itinerary.
+   */
+  public Itinerary(final List<Leg> legs) {
     Validate.notEmpty(legs);
     Validate.noNullElements(legs);
     this.legs = legs;
   }
 
-  public Itinerary(Leg... legs) {
+  public Itinerary(final Leg... legs) {
     this(Arrays.asList(legs));
   }
 
    * @param event Event to test.
    * @return <code>true</code> if the event is expected
    */
-  public boolean isExpected(HandlingEvent event) {
+  public boolean isExpected(final HandlingEvent event) {
     if (legs.isEmpty()) {
       return true;
     }
 
     if (event.type() == HandlingEvent.Type.RECEIVE) {
       //Check that the first leg's origin is the event's location
-      Leg leg = legs.get(0);
+      final Leg leg = legs.get(0);
       return (leg.from().equals(event.location()));
     }
 
       //Check that the there is one leg with same from location and carrier movement
       for (Leg leg : legs) {
         if (leg.from().equals(event.location())
-           && leg.carrierMovement().equals(event.carrierMovement()))
+          && leg.carrierMovement().equals(event.carrierMovement()))
           return true;
       }
       return false;
       //Check that the there is one leg with same to loc and carrier movement
       for (Leg leg : legs) {
         if (leg.to().equals(event.location())
-           && leg.carrierMovement().equals(event.carrierMovement()))
+          && leg.carrierMovement().equals(event.carrierMovement()))
           return true;
       }
       return false;
 
     if (event.type() == HandlingEvent.Type.CLAIM) {
       //Check that the last leg's destination is from the event's location
-      Leg leg = legs.get(legs.size() - 1);
+      final Leg leg = legs.get(legs.size() - 1);
       return (leg.to().equals(event.location()));
     }
 
    * @param other itinerary to compare
    * @return <code>true</code> if the legs in this and the other itinerary are all equal.
    */
-  public boolean sameValueAs(Itinerary other) {
+  public boolean sameValueAs(final Itinerary other) {
     return other != null && legs.equals(other.legs);
   }
 
   @Override
-  public boolean equals(Object o) {
+  public boolean equals(final Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
 
-    Itinerary itinerary = (Itinerary) o;
+    final Itinerary itinerary = (Itinerary) o;
 
     return sameValueAs(itinerary);
   }

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

  * An itinerary consists of one or more legs.
  */
 @Entity
-public class Leg {
+public final class Leg {
   @Id
   @GeneratedValue
   private Long id;
   @ManyToOne
   private Location to;
 
-  public Leg(CarrierMovement carrierMovement, Location from, Location to) {
-    Validate.noNullElements(new Object[] {carrierMovement, from, to});
+  /**
+   * Constructor.
+   *
+   * @param carrierMovement
+   * @param from
+   * @param to
+   */
+  public Leg(final CarrierMovement carrierMovement, final Location from, final Location to) {
+    Validate.noNullElements(new Object[]{carrierMovement, from, to});
     this.carrierMovement = carrierMovement;
     this.from = from;
     this.to = to;
     return carrierMovement;
   }
 
-  
+
   /**
    * Value objects compare by value, therefore the id field which must be part of the class in order to support
    * persistence is ignored in the comparison.
    * @param other The other leg.
    * @return <code>true</code> if the given leg's and this leg's attributes are the same.
    */
-  public boolean sameValueAs(Leg other) {
+  public boolean sameValueAs(final Leg other) {
     return other != null && new EqualsBuilder().
       append(this.carrierMovement, other.carrierMovement).
       append(this.from, other.from).
   }
 
   @Override
-  public boolean equals(Object o) {
+  public boolean equals(final Object o) {
     if (this == o) return true;
     if (o == null || getClass() != o.getClass()) return false;
 
 
   @Override
   public int hashCode() {
-    return new HashCodeBuilder(13,17).
+    return new HashCodeBuilder().
       append(carrierMovement).
       append(from).
       append(to).

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

 import javax.persistence.Id;
 
 @Entity
-public class Location {
+public final class Location {
 
   @Id
   @GeneratedValue
   /**
    * Special Location object that marks an unknown location.
    */
-  public static final Location UNKNOWN = new Location(
-     new UnLocode("XXXXX"), "Unknown location"
-  );
+  public static final Location UNKNOWN = new Location(new UnLocode("XXXXX"), "Unknown location");
 
   /**
    * Package-level constructor, visible for test only.
-   * 
+   *
    * @param unLocode UN Locode
    * @param name     location name
    * @throws IllegalArgumentException if the UN Locode or name is null
    */
-  Location(UnLocode unLocode, String name) {
-    Validate.noNullElements(new Object[] {unLocode, name});
+  Location(final UnLocode unLocode, final String name) {
+    Validate.noNullElements(new Object[]{unLocode, name});
     Validate.notNull(unLocode);
     Validate.notNull(name);
     this.unLocode = unLocode;
    * @return Since this is an entiy this will be true iff UN locodes are equal.
    */
   @Override
-  public boolean equals(Object object) {
+  public boolean equals(final Object object) {
     if (object == null) {
       return false;
     }
   /**
    * Entities compare by identity, therefore the unLocode field is the only basis of comparison. For persistence we
    * have an id field, but it is not used for identiy comparison.
-   *
+   * <p/>
    * Compare this behavior to the value object {@link se.citerus.dddsample.domain.Leg#sameValueAs(Leg)}
    *
    * @param other The other location.
    * @return <code>true</code> if the given location's and this locations's unLocode is the same, regardles of other
-   * attributes.
+   *         attributes.
    */
-  public boolean sameIdentityAs(Location other) {
+  public boolean sameIdentityAs(final Location other) {
     return this.unLocode.equals(other.unLocode);
   }
 

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

 package se.citerus.dddsample.domain;
 
 /**
- * 
+ *
  */
 public interface Specification {
 }

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

 package se.citerus.dddsample.domain;
 
 /**
- * These are the different status codes for a cargo.
+ * Represents the different status codes for a cargo.
  */
 public enum StatusCode {
   NOT_RECEIVED, IN_PORT, ONBOARD_CARRIER, CLAIMED

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

 
 /**
  * Identifies a particular cargo.
- * <p>
+ * <p/>
  * Make sure to put a constraint in the database to make sure TrackingId is unique.
  */
 @Embeddable
-public class TrackingId {
+public final class TrackingId {
 
   @Column(name = "tracking_id")
   private String id;
 
-  public TrackingId(String id) {
+  /**
+   * Constructor.
+   *
+   * @param id Id string.
+   */
+  public TrackingId(final String id) {
     Validate.notNull(id);
     this.id = id;
   }
   }
 
   @Override
-  public boolean equals(Object obj) {
+  public boolean equals(final Object obj) {
     return EqualsBuilder.reflectionEquals(this, obj);
   }
 

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

 
 /**
  * United nations location code.
- *
+ * <p/>
  * http://www.unece.org/cefact/locode/
  * http://www.unece.org/cefact/locode/DocColumnDescription.htm#LOCODE
  */
 @Embeddable
-public class UnLocode {
+public final class UnLocode {
 
   private String unlocode;
 
   // Country code is exactly two letters.
   // Location code is usually three letters, but may contain the numbers 2-9 as well
-  private static final Pattern validPattern = Pattern.compile("[a-zA-Z]{2}[a-zA-Z2-9]{3}");
+  private static final Pattern VALID_PATTERN = Pattern.compile("[a-zA-Z]{2}[a-zA-Z2-9]{3}");
 
-  public UnLocode(String countryAndLocation) {
+  /**
+   * Constructor.
+   *
+   * @param countryAndLocation Location string.
+   */
+  public UnLocode(final String countryAndLocation) {
     Validate.notNull(countryAndLocation);
-    Validate.isTrue(validPattern.matcher(countryAndLocation).matches());
+    Validate.isTrue(VALID_PATTERN.matcher(countryAndLocation).matches());
 
     this.unlocode = countryAndLocation.toUpperCase();
   }
 
   /**
-   * @return country code and location code concatenated
+   * @return country code and location code concatenated.
    */
   public String idString() {
     return unlocode;
   }
 
   @Override
-  public boolean equals(Object obj) {
+  public boolean equals(final Object obj) {
     return EqualsBuilder.reflectionEquals(this, obj);
   }
 

dddsample/src/main/java/se/citerus/dddsample/repository/CargoRepository.java

 
 public interface CargoRepository {
 
+  /**
+   * Finds a cargo using given id.
+   *
+   * @param trackingId Id
+   * @return Cargo
+   */
   Cargo find(TrackingId trackingId);
 
+  /**
+   * Finds all cargo.
+   *
+   * @return All cargo.
+   */
   List<Cargo> findAll();
 
+  /**
+   * Saves given cargo.
+   *
+   * @param cargo Cargo to save.
+   */
   void save(Cargo cargo);
 
+  /**
+   * @return A new generated tracking Id.
+   */
   TrackingId nextTrackingId();
 
 }

dddsample/src/main/java/se/citerus/dddsample/repository/CargoRepositoryInMem.java

 /**
  * CargoRepositoryInMem implement the CargoRepository interface but is a test
  * class not intended for usage in real application.
- * 
+ * <p/>
  * It setup a simple local hash with a number of Cargo's with TrackingId as key
  * defined at compile time.
- * 
+ * <p/>
  * To be able to test exceptions, a DataRetrievalFailureException is thrown when finding a Cargo with trackingId "DAE".
- * 
  */
 public class CargoRepositoryInMem implements CargoRepository {
+
   private Map<String, Cargo> cargoDb;
   private HandlingEventRepository handlingEventRepository;
 
-  public CargoRepositoryInMem() throws Exception {
+  /**
+   * Constructor.
+   */
+  public CargoRepositoryInMem() {
     cargoDb = new HashMap<String, Cargo>();
   }
 
-  public Cargo find(TrackingId trackingId) {
-    if (trackingId.idString().equalsIgnoreCase("DAE")){
+  public Cargo find(final TrackingId trackingId) {
+    if (trackingId.idString().equalsIgnoreCase("DAE")) {
       throw new DataRetrievalFailureException("Network failure. Please try again");
     }
-    
+
     return cargoDb.get(trackingId.idString());
   }
-  
-  public void save(Cargo cargo) {
+
+  public void save(final Cargo cargo) {
     //No need to save anything with InMem
   }
 
   }
 
   /**
-   * 
    * @throws Exception
    */
   public void init() throws Exception {
     */
   }
 
-  public void setHandlingEventRepository(HandlingEventRepository handlingEventRepository) {
+  public void setHandlingEventRepository(final HandlingEventRepository handlingEventRepository) {
     this.handlingEventRepository = handlingEventRepository;
   }
 }

dddsample/src/main/java/se/citerus/dddsample/repository/CarrierMovementRepository.java

 
 public interface CarrierMovementRepository {
 
+  /**
+   * Finds a carrier movement using given id.
+   *
+   * @param carrierMovementId Id
+   * @return The carrier movement.
+   */
   CarrierMovement find(CarrierMovementId carrierMovementId);
 
 }

dddsample/src/main/java/se/citerus/dddsample/repository/CarrierMovementRepositoryHibernate.java

 
 /**
  * Hibernate implementation of CarrierMovementRepository.
- *
  */
 @Repository
-public class CarrierMovementRepositoryHibernate extends HibernateRepository implements CarrierMovementRepository {
+public final class CarrierMovementRepositoryHibernate extends HibernateRepository implements CarrierMovementRepository {
 
-  public CarrierMovement find(CarrierMovementId carrierMovementId) {
+  public CarrierMovement find(final CarrierMovementId carrierMovementId) {
     return (CarrierMovement) getSession().
-            createQuery("from CarrierMovement where carrierMovementId = ?").
-            setParameter(0, carrierMovementId).
-            uniqueResult();
+      createQuery("from CarrierMovement where carrierMovementId = ?").
+      setParameter(0, carrierMovementId).
+      uniqueResult();
   }
 
 }

dddsample/src/main/java/se/citerus/dddsample/repository/CarrierMovementRepositoryInMem.java

 import java.util.HashMap;
 import java.util.Map;
 
-public class CarrierMovementRepositoryInMem implements CarrierMovementRepository {
+public final class CarrierMovementRepositoryInMem implements CarrierMovementRepository {
+
   private Map<CarrierMovementId, CarrierMovement> carriers;
 
+  /**
+   * Constructor.
+   */
   public CarrierMovementRepositoryInMem() {
     carriers = new HashMap<CarrierMovementId, CarrierMovement>();
     setup();
 */
   }
 
-  public CarrierMovement find(CarrierMovementId carrierMovementId) {
+  public CarrierMovement find(final CarrierMovementId carrierMovementId) {
     return carriers.get(carrierMovementId);
   }
 

dddsample/src/main/java/se/citerus/dddsample/repository/HandlingEventRepository.java

 
 /**
  * Handling event repository.
- *
  */
 public interface HandlingEventRepository {
 
    *
    * @param event handling event to save
    */
-  void save(HandlingEvent event);
+  void save(final HandlingEvent event);
 
   /**
    * @param trackingId cargo tracking id
    * @return All handling events for this cargo, ordered by completion time.
    */
-  List<HandlingEvent> findEventsForCargo(TrackingId trackingId);
+  List<HandlingEvent> findEventsForCargo(final TrackingId trackingId);
 }

dddsample/src/main/java/se/citerus/dddsample/repository/HandlingEventRepositoryInMem.java

 import java.text.SimpleDateFormat;
 import java.util.*;
 
-public class HandlingEventRepositoryInMem implements HandlingEventRepository{
-  private HashMap<String, HandlingEvent> eventDB;
-  private CarrierMovementRepository carrierMovementRepository;
-  
+public class HandlingEventRepositoryInMem implements HandlingEventRepository {
   private final Log logger = LogFactory.getLog(getClass());
-
-  public HandlingEventRepositoryInMem() throws ParseException {
-    eventDB = new HashMap<String, HandlingEvent>();
-  }
+  private final HashMap<String, HandlingEvent> eventDB = new HashMap<String, HandlingEvent>();
+  private CarrierMovementRepository carrierMovementRepository;
 
   /**
    * Initilaze the in mem repository.
-   * 
+   * <p/>
    * SpringIoC will call this init-method after the bean has bean created and properties has been set.
-   * 
+   *
    * @throws ParseException
    */
   public void init() throws ParseException {
 */
   }
 
-  
-  private void registerEvent(Cargo cargo, String date, Type type, CarrierMovement carrierMovement) throws ParseException{
+  private void registerEvent(Cargo cargo, String date, Type type, CarrierMovement carrierMovement) throws ParseException {
     HandlingEvent event = new HandlingEvent(cargo, getDate(date), new Date(), type, null, carrierMovement);
     //cargo.handle(event);
     String id = cargo.trackingId() + "_" + type + "_" + date;
-    
+
     logger.debug("Adding event " + id + "(" + event + ")");
     eventDB.put(id, event);
   }
 
   /**
    * Parse an ISO 8601 (YYYY-MM-DD) String to Date
-   * 
-   * @param isoFormat
-   *            String to parse.
+   *
+   * @param isoFormat String to parse.
    * @return Created date instance.
-   * @throws ParseException
-   *             Thrown if parsing fails.
+   * @throws ParseException Thrown if parsing fails.
    */
-  private Date getDate(String isoFormat) throws ParseException {
+  private Date getDate(final String isoFormat) throws ParseException {
     final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
     return dateFormat.parse(isoFormat);
   }
-  
-  public HandlingEvent find(String handlingEventId){
+
+  public HandlingEvent find(final String handlingEventId) {
     return eventDB.get(handlingEventId);
   }
 
-  public void save(HandlingEvent event) {
+  public void save(final HandlingEvent event) {
     // Mimmick saving to database
     /*
     for (Cargo cargo : event.registerdCargos()) {
     */
   }
 
-  public List<HandlingEvent> findEventsForCargo(TrackingId trackingId) {
+  public List<HandlingEvent> findEventsForCargo(final TrackingId trackingId) {
     return new ArrayList<HandlingEvent>(eventDB.values());
   }
 
-  public DeliveryHistory findDeliveryHistory(TrackingId trackingId) {
+  public DeliveryHistory findDeliveryHistory(final TrackingId trackingId) {
     return null;  //To change body of implemented methods use File | Settings | File Templates.
   }
 
   @SuppressWarnings("unchecked")
   public Set<HandlingEvent> findByTrackingId(final TrackingId trackingId) {
-    Set<HandlingEvent> events = new HashSet<HandlingEvent>();
+    final Set<HandlingEvent> events = new HashSet<HandlingEvent>();
     for (HandlingEvent event : eventDB.values()) {
       /*
       for (Cargo cargo : event.registerdCargos()) {
       }
         */
     }
-    
+
     logger.debug("findByTrackingId " + trackingId + " finds " + events);
-    
+
     return events;
   }
 
-  public void setCarrierRepository(CarrierMovementRepository carrierMovementRepository) {
+  public void setCarrierRepository(final CarrierMovementRepository carrierMovementRepository) {
     this.carrierMovementRepository = carrierMovementRepository;
   }
 }

dddsample/src/main/java/se/citerus/dddsample/repository/HibernateRepository.java

 
 /**
  * Functionality common to all Hibernate repositories.
- *
  */
 public abstract class HibernateRepository {
 
-  SessionFactory sessionFactory;
+  private SessionFactory sessionFactory;
 
   @Required
-  public void setSessionFactory(SessionFactory sessionFactory) {
+  public void setSessionFactory(final SessionFactory sessionFactory) {
     this.sessionFactory = sessionFactory;
   }
 

dddsample/src/main/java/se/citerus/dddsample/repository/LocationRepository.java

 
 public interface LocationRepository {
 
+  /**
+   * Finds a location using given unlocode.
+   *
+   * @param unLocode UNLocode.
+   * @return Location.
+   */
   Location find(UnLocode unLocode);
 
+  /**
+   * Finds all locations.
+   *
+   * @return All locations.
+   */
   List<Location> findAll();
 
 }

dddsample/src/main/java/se/citerus/dddsample/repository/LocationRepositoryHibernate.java

 
 import java.util.List;
 
-public class LocationRepositoryHibernate extends HibernateRepository implements LocationRepository {
+public final class LocationRepositoryHibernate extends HibernateRepository implements LocationRepository {
 
-  public Location find(UnLocode unLocode) {
+  public Location find(final UnLocode unLocode) {
     return (Location) getSession().
-          createQuery("from Location where unLocode = ?").
-          setParameter(0, unLocode).
-          uniqueResult();
+      createQuery("from Location where unLocode = ?").
+      setParameter(0, unLocode).
+      uniqueResult();
   }
 
   public List<Location> findAll() {

dddsample/src/main/java/se/citerus/dddsample/service/CargoService.java

 
 /**
  * Cargo service.
- *
  */
 public interface CargoService {
 
   /**
    * Registers a new cargo in the tracking system, not yet routed.
    *
-   * @param origin cargo origin
+   * @param origin      cargo origin
    * @param destination cargo destination
    * @return Cargo tracking id
    */
    * based on this list of legs.
    *
    * @param trackingId cargo tracking id
-   * @param itinerary the new itinerary, from a selection
+   * @param itinerary  the new itinerary, from a selection
    */
   void assignItinerary(TrackingId trackingId, ItineraryCandidateDTO itinerary);
 

dddsample/src/main/java/se/citerus/dddsample/service/CargoServiceImpl.java

 import java.util.ArrayList;
 import java.util.List;
 
-public class CargoServiceImpl implements CargoService {
+public final class CargoServiceImpl implements CargoService {
 
   private CargoRepository cargoRepository;
   private LocationRepository locationRepository;
   private CarrierMovementRepository carrierMovementRepository;
 
-  private static final Log logger = LogFactory.getLog(CargoServiceImpl.class);
+  private final Log logger = LogFactory.getLog(getClass());
 
   @Transactional(readOnly = false)
-  public TrackingId registerNew(UnLocode originUnLocode, UnLocode destinationUnLocode) {
+  public TrackingId registerNew(final UnLocode originUnLocode, final UnLocode destinationUnLocode) {
     Validate.notNull(originUnLocode);
     Validate.notNull(destinationUnLocode);
 
-    TrackingId trackingId = cargoRepository.nextTrackingId();
-    Location origin = locationRepository.find(originUnLocode);
-    Location destination = locationRepository.find(destinationUnLocode);
+    final TrackingId trackingId = cargoRepository.nextTrackingId();
+    final Location origin = locationRepository.find(originUnLocode);
+    final Location destination = locationRepository.find(destinationUnLocode);
 
-    Cargo cargo = new Cargo(trackingId,origin,destination);
+    final Cargo cargo = new Cargo(trackingId, origin, destination);
 
     cargoRepository.save(cargo);
     logger.info("Registered new cargo with tracking id " + trackingId.idString());
 
   @Transactional(readOnly = true)
   public List<UnLocode> shippingLocations() {
-    List<Location> allLocations = locationRepository.findAll();
-    List<UnLocode> unlocodes = new ArrayList<UnLocode>(allLocations.size());
+    final List<Location> allLocations = locationRepository.findAll();
+    final List<UnLocode> unlocodes = new ArrayList<UnLocode>(allLocations.size());
     for (Location location : allLocations) {
       unlocodes.add(location.unLocode());
     }
   }
 
   @Transactional(readOnly = true)
-  public CargoTrackingDTO track(TrackingId trackingId) {
+  public CargoTrackingDTO track(final TrackingId trackingId) {
     Validate.notNull(trackingId);
 
     final Cargo cargo = cargoRepository.find(trackingId);
       return null;
     }
 
-    DeliveryHistory deliveryHistory = cargo.deliveryHistory();
+    final DeliveryHistory deliveryHistory = cargo.deliveryHistory();
 
     // TODO: use DTO assemblers
-    Location currentLocation = deliveryHistory.currentLocation();
-    CarrierMovement currentCarrierMovement = deliveryHistory.currentCarrierMovement();
+    final Location currentLocation = deliveryHistory.currentLocation();
+    final CarrierMovement currentCarrierMovement = deliveryHistory.currentCarrierMovement();
     final CargoTrackingDTO dto = new CargoTrackingDTO(
       cargo.trackingId().idString(),
       cargo.origin().toString(),
 
     final List<HandlingEvent> events = deliveryHistory.eventsOrderedByCompletionTime();
     for (HandlingEvent event : events) {
-      CarrierMovement cm = event.carrierMovement();
-      String carrierIdString = (cm == null) ? "" : cm.carrierMovementId().idString();
+      final CarrierMovement cm = event.carrierMovement();
+      final String carrierIdString = (cm == null) ? "" : cm.carrierMovementId().idString();
       dto.addEvent(new HandlingEventDTO(
         event.location().toString(),
         event.type().toString(),
 
   // TODO: move this to another class?
   @Transactional(readOnly = true)
-  public void notify(TrackingId trackingId) {
+  public void notify(final TrackingId trackingId) {
     Validate.notNull(trackingId);
 
-    Cargo cargo = cargoRepository.find(trackingId);
+    final Cargo cargo = cargoRepository.find(trackingId);
     if (cargo == null) {
       logger.warn("Can't notify listeners for non-existing cargo " + trackingId);
       return;
     // TODO: more elaborate notifications, such as email to affected customer
     if (cargo.isMisdirected()) {
       logger.info("Cargo " + trackingId + " has been misdirected. " +
-                  "Last event was " + cargo.deliveryHistory().lastEvent());
+        "Last event was " + cargo.deliveryHistory().lastEvent());
     }
     if (cargo.isUnloadedAtDestination()) {
       logger.info("Cargo " + trackingId + " has been unloaded " +
-                  "at its final destination " + cargo.finalDestination());
+        "at its final destination " + cargo.finalDestination());
     }
   }
 
   @Transactional(readOnly = true)
   public List<CargoRoutingDTO> loadAllForRouting() {
-    List<Cargo> allCargos = cargoRepository.findAll();
+    final List<Cargo> allCargos = cargoRepository.findAll();
 
     // TODO: use DTO assembler
-    List<CargoRoutingDTO> dtoList = new ArrayList<CargoRoutingDTO>(allCargos.size());
+    final List<CargoRoutingDTO> dtoList = new ArrayList<CargoRoutingDTO>(allCargos.size());
     for (Cargo cargo : allCargos) {
-      CargoRoutingDTO dto = new CargoRoutingDTO(
+      final CargoRoutingDTO dto = new CargoRoutingDTO(
         cargo.trackingId().idString(),
         cargo.origin().toString(),
         cargo.finalDestination().toString()
   }
 
   @Transactional(readOnly = true)
-  public CargoRoutingDTO loadForRouting(TrackingId trackingId) {
+  public CargoRoutingDTO loadForRouting(final TrackingId trackingId) {
     Validate.notNull(trackingId);
-    Cargo cargo = cargoRepository.find(trackingId);
+    final Cargo cargo = cargoRepository.find(trackingId);
     if (cargo == null) {
       return null;
     }
 
     // TODO: use DTO assembler
-    CargoRoutingDTO dto = new CargoRoutingDTO(
+    final CargoRoutingDTO dto = new CargoRoutingDTO(
       cargo.trackingId().idString(),
       cargo.origin().toString(),
       cargo.finalDestination().toString()
   }
 
   @Transactional(readOnly = false)
-  public void assignItinerary(TrackingId trackingId, ItineraryCandidateDTO itinerary) {
+  public void assignItinerary(final TrackingId trackingId, final ItineraryCandidateDTO itinerary) {
     Validate.notNull(trackingId);
     Validate.notNull(itinerary);
 
-    Cargo cargo = cargoRepository.find(trackingId);
+    final Cargo cargo = cargoRepository.find(trackingId);
     if (cargo == null) {
       throw new IllegalArgumentException("Can't assign itinerary to non-existing cargo " + trackingId);
     }
 
-    List<Leg> legs = new ArrayList<Leg>(itinerary.getLegs().size());
+    final List<Leg> legs = new ArrayList<Leg>(itinerary.getLegs().size());
     for (LegDTO legDTO : itinerary.getLegs()) {
-      legs.add(new Leg(
-        carrierMovementRepository.find(
-          new CarrierMovementId(legDTO.getCarrierMovementId())),
-        locationRepository.find(
-          new UnLocode(legDTO.getFrom())),
-        locationRepository.find(
-          new UnLocode(legDTO.getTo())))
-      );
+      final CarrierMovementId carrierMovementId = new CarrierMovementId(legDTO.getCarrierMovementId());
+      final CarrierMovement carrierMovement = carrierMovementRepository.find(carrierMovementId);
+      final Location from = locationRepository.find(new UnLocode(legDTO.getFrom()));
+      final Location to = locationRepository.find(new UnLocode(legDTO.getTo()));
+      legs.add(new Leg(carrierMovement, from, to));
     }
     // TODO: delete orphaned itineraries.
     // Can't cascade delete-orphan for many-to-one using mapping directives.
     cargoRepository.save(cargo);
   }
 
-
-  public void setCargoRepository(CargoRepository cargoRepository) {
+  public void setCargoRepository(final CargoRepository cargoRepository) {
     this.cargoRepository = cargoRepository;
   }
 
-  public void setLocationRepository(LocationRepository locationRepository) {
+  public void setLocationRepository(final LocationRepository locationRepository) {
     this.locationRepository = locationRepository;
   }
 

dddsample/src/main/java/se/citerus/dddsample/service/HandlingEventMessageDelegate.java

 /**
  * Consumes JMS messages and delegates notification of misdirected
  * cargo to the cargo service.
- *
+ * <p/>
  * This point of this is to decouple the cargo service from JMS,
  * and to allow a thread-based messaging implementation to live in
- * parallell. 
+ * parallell.
  */
 public class HandlingEventMessageDelegate implements MessageListener {
 
-  CargoService cargoService;
-  private static final Log logger = LogFactory.getLog(HandlingEventMessageDelegate.class);
+  private CargoService cargoService;
+  private final Log logger = LogFactory.getLog(getClass());
 
-  public void onMessage(Message message) {
+  public void onMessage(final Message message) {
     if (logger.isDebugEnabled()) {
       logger.debug("Received message " + message);
     }

dddsample/src/main/java/se/citerus/dddsample/service/HandlingEventService.java

 
 /**
  * Handling event service.
- *
  */
 public interface HandlingEventService {
 
   /**
-   * @param completionTime when the event was completed, for example finished loading
-   * @param trackingId tracking id
+   * @param completionTime    when the event was completed, for example finished loading
+   * @param trackingId        tracking id
    * @param carrierMovementId carrier movement id, if applicable (may be null)
-   * @param unlocode United Nations Location Code for the location of the event
-   * @param type type of event
-   *
-   * @throws UnknownCarrierMovementIdException if there's not carrier movement with this id
+   * @param unlocode          United Nations Location Code for the location of the event
+   * @param type              type of event
+   * @throws UnknownCarrierMovementIdException
+   *                                    if there's not carrier movement with this id
    * @throws UnknownTrackingIdException if there's no cargo with this tracking id
-   * @throws UnknownLocationException if there's no location with this UN Locode 
+   * @throws UnknownLocationException   if there's no location with this UN Locode
    */
   void register(Date completionTime, TrackingId trackingId, CarrierMovementId carrierMovementId, UnLocode unlocode, HandlingEvent.Type type)
-  throws UnknownCarrierMovementIdException, UnknownTrackingIdException, UnknownLocationException;
+    throws UnknownCarrierMovementIdException, UnknownTrackingIdException, UnknownLocationException;
 
-}
+}

dddsample/src/main/java/se/citerus/dddsample/service/HandlingEventServiceImpl.java

 
 import java.util.Date;
 
-public class HandlingEventServiceImpl implements HandlingEventService {
+public final class HandlingEventServiceImpl implements HandlingEventService {
   private CargoRepository cargoRepository;
   private CarrierMovementRepository carrierMovementRepository;
   private HandlingEventRepository handlingEventRepository;
   private EventService eventService;
 
   @Transactional(readOnly = false)
-  public void register(Date completionTime, TrackingId trackingId, CarrierMovementId carrierMovementId, UnLocode unlocode, HandlingEvent.Type type) throws UnknownCarrierMovementIdException, UnknownTrackingIdException, UnknownLocationException {
+  public void register(final Date completionTime, final TrackingId trackingId, final CarrierMovementId carrierMovementId,
+                       final UnLocode unlocode, final HandlingEvent.Type type)
+    throws UnknownCarrierMovementIdException, UnknownTrackingIdException, UnknownLocationException {
+
     // Carrier movement may be null for certain event types
-    Validate.noNullElements(new Object[] {trackingId, unlocode, type});
+    Validate.noNullElements(new Object[]{trackingId, unlocode, type});
 
     Cargo cargo = cargoRepository.find(trackingId);
     if (cargo == null) throw new UnknownTrackingIdException(trackingId);
 
-    CarrierMovement carrierMovement = findCarrierMovement(carrierMovementId);
-    Location location = findLocation(unlocode);
-    Date registrationTime = new Date();
+    final CarrierMovement carrierMovement = findCarrierMovement(carrierMovementId);
+    final Location location = findLocation(unlocode);
+    final Date registrationTime = new Date();
 
-    HandlingEvent event = new HandlingEvent(cargo, completionTime, registrationTime, type, location, carrierMovement);
+    final HandlingEvent event = new HandlingEvent(cargo, completionTime, registrationTime, type, location, carrierMovement);
 
     /*
       NOTE:
     eventService.fireHandlingEventRegistered(event);
   }
 
-  private CarrierMovement findCarrierMovement(CarrierMovementId carrierMovementId) throws UnknownCarrierMovementIdException {
+  private CarrierMovement findCarrierMovement(final CarrierMovementId carrierMovementId)
+    throws UnknownCarrierMovementIdException {
+
     if (carrierMovementId == null) {
       return null;
     }
-    CarrierMovement carrierMovement = carrierMovementRepository.find(carrierMovementId);
+    final CarrierMovement carrierMovement = carrierMovementRepository.find(carrierMovementId);
     if (carrierMovement == null) {
       throw new UnknownCarrierMovementIdException(carrierMovementId);
     }
     return carrierMovement;
   }
 
-  private Location findLocation(UnLocode unlocode) throws UnknownLocationException {
+  private Location findLocation(final UnLocode unlocode) throws UnknownLocationException {
     if (unlocode == null) {
       return Location.UNKNOWN;
     }
-    
-    Location location = locationRepository.find(unlocode);
+
+    final Location location = locationRepository.find(unlocode);
     if (location == null) {
       throw new UnknownLocationException(unlocode);
     }
-    
+
     return location;
   }
 
-  public void setCargoRepository(CargoRepository cargoRepository) {
+  public void setCargoRepository(final CargoRepository cargoRepository) {
     this.cargoRepository = cargoRepository;
   }
 
-  public void setCarrierMovementRepository(CarrierMovementRepository carrierMovementRepository) {
+  public void setCarrierMovementRepository(final CarrierMovementRepository carrierMovementRepository) {
     this.carrierMovementRepository = carrierMovementRepository;
   }
 
-  public void setHandlingEventRepository(HandlingEventRepository handlingEventRepository) {
+  public void setHandlingEventRepository(final HandlingEventRepository handlingEventRepository) {
     this.handlingEventRepository = handlingEventRepository;
   }
 
-  public void setLocationRepository(LocationRepository locationRepository) {
+  public void setLocationRepository(final LocationRepository locationRepository) {
     this.locationRepository = locationRepository;
   }
 
-  public void setEventService(EventService eventService) {
+  public void setEventService(final EventService eventService) {
     this.eventService = eventService;
   }
 }

dddsample/src/main/java/se/citerus/dddsample/service/JmsEventServiceImpl.java

 /**
  * JMS based implementation.
  */
-public class JmsEventServiceImpl implements EventService {
+public final class JmsEventServiceImpl implements EventService {
   private JmsOperations jmsOperations;
   private Destination destination;
   public static final String TRACKING_ID_KEY = TrackingId.class.getName() + ".KEY";
   public void fireHandlingEventRegistered(final HandlingEvent event) {
     jmsOperations.send(destination, new MessageCreator() {
       // TODO: richer message type
-      public Message createMessage(Session session) throws JMSException {
-        MapMessage message = session.createMapMessage();
+      public Message createMessage(final Session session) throws JMSException {
+        final MapMessage message = session.createMapMessage();
         message.setStringProperty(TRACKING_ID_KEY, event.cargo().trackingId().idString());
         return message;
       }
 
     });
   }
-  
-  public void setJmsOperations(JmsOperations jmsOperations) {
+
+  public void setJmsOperations(final JmsOperations jmsOperations) {
     this.jmsOperations = jmsOperations;
   }
 
-  public void setDestination(Destination destination) {
+  public void setDestination(final Destination destination) {
     this.destination = destination;
   }
 }

dddsample/src/main/java/se/citerus/dddsample/service/RoutingService.java

 import java.util.List;
 
 /**
- *  
+ *
  */
 public interface RoutingService {
 

dddsample/src/main/java/se/citerus/dddsample/service/RoutingServiceImpl.java

 import se.citerus.dddsample.repository.CargoRepository;
 import se.citerus.dddsample.repository.CarrierMovementRepository;
 import se.citerus.dddsample.repository.LocationRepository;
-import se.citerus.dddsample.service.dto.DTOAssembler;
+import se.citerus.dddsample.service.dto.assembler.DTOAssembler;
 import se.citerus.dddsample.service.dto.ItineraryCandidateDTO;
 
 import java.util.ArrayList;
 /**
  * Simple routing service implementation that randomly creates a number
  * of different itineraries.
- *
  */
 public class RoutingServiceImpl implements RoutingService {
 
-  LocationRepository locationRepository;
-  CargoRepository cargoRepository;
-  CarrierMovementRepository carrierMovementRepository;
+  private LocationRepository locationRepository;
+  private CargoRepository cargoRepository;
+  private CarrierMovementRepository carrierMovementRepository;
 
   Random random = new Random();
 
       CarrierMovement cm1 = carrierMovementRepository.find(new CarrierMovementId("CAR_002"));
       legs.add(new Leg(cm1, cargo.origin(), firstLegTo));
 
-      for (int j = 0; j < allLocations.size() - 1 ; j++) {
+      for (int j = 0; j < allLocations.size() - 1; j++) {
         legs.add(new Leg(
-          getRandomCarrierMovement(),
-          allLocations.get(j), allLocations.get(j + 1)));
+            getRandomCarrierMovement(),
+            allLocations.get(j), allLocations.get(j + 1)));
       }
 
       Location lastLegFrom = allLocations.get(allLocations.size() - 1);

dddsample/src/main/java/se/citerus/dddsample/service/ThreadBasedEventServiceImpl.java

  * Thread based implementation.
  */
 public class ThreadBasedEventServiceImpl implements EventService {
+
   private CargoService cargoService;
 
   public void fireHandlingEventRegistered(final HandlingEvent event) {

dddsample/src/main/java/se/citerus/dddsample/service/UnknownCarrierMovementIdException.java

 
 /**
  * Thrown when trying to register an event with an unknown carrier movement id.
- *
  */
 public class UnknownCarrierMovementIdException extends Exception {
-  private CarrierMovementId carrierMovementId;
 
-  public UnknownCarrierMovementIdException(CarrierMovementId carrierMovementId) {
+  private final CarrierMovementId carrierMovementId;
+
+  public UnknownCarrierMovementIdException(final CarrierMovementId carrierMovementId) {
     this.carrierMovementId = carrierMovementId;
   }
 

dddsample/src/main/java/se/citerus/dddsample/service/UnknownLocationException.java

 
 public class UnknownLocationException extends Exception {
 
-  private UnLocode unlocode;
+  private final UnLocode unlocode;
 
-  public UnknownLocationException(UnLocode unlocode) {
+  public UnknownLocationException(final UnLocode unlocode) {
     this.unlocode = unlocode;
   }
 

dddsample/src/main/java/se/citerus/dddsample/service/UnknownTrackingIdException.java

 
 /**
  * Thrown when trying to register an event with an unknown tracking id.
- *
  */
-public class UnknownTrackingIdException extends Exception {
-  private TrackingId trackingId;
+public final class UnknownTrackingIdException extends Exception {
 
-  public UnknownTrackingIdException(TrackingId trackingId) {
+  private final TrackingId trackingId;
+
+  public UnknownTrackingIdException(final TrackingId trackingId) {
     this.trackingId = trackingId;
   }
 

dddsample/src/main/java/se/citerus/dddsample/service/dto/CargoRoutingDTO.java

 
 /**
  * DTO for registering and routing a cargo.
- *
  */
-public class CargoRoutingDTO {
-  String trackingId;
-  String origin;
-  String finalDestination;
-  List<LegDTO> legs;
+public final class CargoRoutingDTO {
 
-  public CargoRoutingDTO(String trackingId, String origin, String finalDestination) {
+  private final String trackingId;
+  private final String origin;
+  private final String finalDestination;
+  private final List<LegDTO> legs;
+
+  public CargoRoutingDTO(final String trackingId, final String origin, final String finalDestination) {
     this.trackingId = trackingId;
     this.origin = origin;
     this.finalDestination = finalDestination;
     return finalDestination;
   }
 
-  public void addLeg(String carrierMovementId, String from, String to) {
+  public void addLeg(final String carrierMovementId, final String from, final String to) {
     legs.add(new LegDTO(carrierMovementId, from, to));
   }
 
+  /**
+   * @return An unmodifiable list DTOs.
+   */
   public List<LegDTO> getLegs() {
     return Collections.unmodifiableList(legs);
   }

dddsample/src/main/java/se/citerus/dddsample/service/dto/CargoTrackingDTO.java

 
 /**
  * DTO for a cargo and its delivery history.
- *
  */
-public class CargoTrackingDTO implements Serializable {
-
-  String trackingId;
-  String origin;
-  String finalDestination;
-  String currentLocationId;
-  List<HandlingEventDTO> events;
-  String carrierMovementId;
-  StatusCode statusCode;
-  boolean misdirected;
-
-  public CargoTrackingDTO(String trackingId, String origin, String finalDestination,
-                             StatusCode statusCode, String currentLocationId, String carrierMovementId,
-                             boolean isMisdirected) {
+public final class CargoTrackingDTO implements Serializable {
+
+  private final String trackingId;
+  private final String origin;
+  private final String finalDestination;
+  private final String currentLocationId;
+  private final List<HandlingEventDTO> events;
+  private final String carrierMovementId;
+  private final StatusCode statusCode;
+  private final boolean misdirected;
+
+  public CargoTrackingDTO(final String trackingId, final String origin, final String finalDestination,
+                          final StatusCode statusCode, final String currentLocationId, final String carrierMovementId,
+                          final boolean isMisdirected) {
     this.trackingId = trackingId;
     this.origin = origin;
     this.finalDestination = finalDestination;
     this.events = new ArrayList<HandlingEventDTO>();
   }
 
-  public void addEvent(HandlingEventDTO handlingEvent) {
+  public void addEvent(final HandlingEventDTO handlingEvent) {
     events.add(handlingEvent);
   }
 
+  /**
+   * @return An unmodifiable list DTOs.
+   */
   public List<HandlingEventDTO> getEvents() {
     return Collections.unmodifiableList(events);
   }

dddsample/src/main/java/se/citerus/dddsample/service/dto/DTOAssembler.java

-package se.citerus.dddsample.service.dto;
-
-import se.citerus.dddsample.domain.Itinerary;
-import se.citerus.dddsample.domain.Leg;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Handles assembly of DTOs from the domain model.
- */
-public class DTOAssembler {
-
-  public static ItineraryCandidateDTO toItineraryCandidateDTO(Itinerary itinerary) {
-    List<LegDTO> legDTOs = new ArrayList<LegDTO>(itinerary.legs().size());
-    for (Leg leg : itinerary.legs()) {
-      legDTOs.add(toLegDTO(leg));
-    }
-    return new ItineraryCandidateDTO(legDTOs);
-  }
-
-  private static LegDTO toLegDTO(Leg leg) {
-    return new LegDTO(
-      leg.carrierMovement().carrierMovementId().idString(),
-      leg.from().unLocode().idString(),
-      leg.to().unLocode().idString()
-    );
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/service/dto/HandlingEventDTO.java

 /**
  * DTO for a handling event.
  */
-public class HandlingEventDTO implements Serializable {
+public final class HandlingEventDTO implements Serializable {
 
   private final String type;
   private final String location;
   private final Date time;
   private boolean expected;
 
-  public HandlingEventDTO(String location, String type, String carrier, Date time, boolean expected) {
+  public HandlingEventDTO(final String location, final String type, final String carrier, final Date time,
+                          final boolean expected) {
     this.location = location;
     this.type = type;
     this.carrier = carrier;

dddsample/src/main/java/se/citerus/dddsample/service/dto/ItineraryCandidateDTO.java

 
 /**
  * DTO for presenting and selecting an itinerary from a collection of candidates.
- * 
  */
-public class ItineraryCandidateDTO {
-  List<LegDTO> legs;
+public final class ItineraryCandidateDTO {
 
-  public ItineraryCandidateDTO(List<LegDTO> legs) {
+  private final List<LegDTO> legs;
+
+  public ItineraryCandidateDTO(final List<LegDTO> legs) {
     this.legs = legs;
   }
 
+  /**
+   * @return An unmodifiable list DTOs.
+   */
   public List<LegDTO> getLegs() {
     return Collections.unmodifiableList(legs);
   }

dddsample/src/main/java/se/citerus/dddsample/service/dto/LegDTO.java

 
 /**
  * DTO for a leg in an itinerary.
- *
  */
-public class LegDTO {
+public final class LegDTO {
 
-  String carrierMovementId;
-  String from;
-  String to;
+  private final String carrierMovementId;
+  private final String from;
+  private final String to;
 
-  public LegDTO(String carrierMovementId, String from, String to) {
+  public LegDTO(final String carrierMovementId, final String from, final String to) {
     this.carrierMovementId = carrierMovementId;
     this.from = from;
     this.to = to;

dddsample/src/main/java/se/citerus/dddsample/service/dto/assembler/DTOAssembler.java

+package se.citerus.dddsample.service.dto.assembler;
+
+import se.citerus.dddsample.domain.Itinerary;
+import se.citerus.dddsample.domain.Leg;
+import se.citerus.dddsample.domain.CarrierMovementId;
+import se.citerus.dddsample.domain.UnLocode;
+import se.citerus.dddsample.service.dto.ItineraryCandidateDTO;
+import se.citerus.dddsample.service.dto.LegDTO;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Handles assembly of DTOs from the domain model.
+ */
+public class DTOAssembler {
+
+  public static ItineraryCandidateDTO toItineraryCandidateDTO(final Itinerary itinerary) {
+    final List<LegDTO> legDTOs = new ArrayList<LegDTO>(itinerary.legs().size());
+    for (Leg leg : itinerary.legs()) {
+      legDTOs.add(toLegDTO(leg));
+    }
+    return new ItineraryCandidateDTO(legDTOs);
+  }
+
+  private static LegDTO toLegDTO(final Leg leg) {
+    final CarrierMovementId id = leg.carrierMovement().carrierMovementId();
+    final UnLocode from = leg.from().unLocode();
+    final UnLocode to = leg.to().unLocode();
+    return new LegDTO(id.idString(), from.idString(), to.idString());
+  }
+}

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

 
 /**
  * Imports about 55 000 locations from an official UN Locode CSV export.
- *
+ * <p/>
  * NOTE: not yet used
- *
  */
 public class LocationsImporter implements ServletContextListener {
   private static final String ZIP_FILE_NAME = "unlocodes.zip";
   private static final String ZIP_ENTRY_NAME = "2006-2 UNLOCODE CodeList.txt";
   private static final int BATCH_SIZE = 1000;
-  private static final Log logger = LogFactory.getLog(LocationsImporter.class);
+  private final Log logger = LogFactory.getLog(getClass());
 
-  protected int importLocations(JdbcTemplate jt) throws IOException {
-    ZipFile zipFile = new ZipFile(new ClassPathResource(ZIP_FILE_NAME).getFile());
-    ZipEntry zipEntry = zipFile.getEntry(ZIP_ENTRY_NAME);
-    InputStream inputStream = zipFile.getInputStream(zipEntry);
-    LineIterator iterator = IOUtils.lineIterator(inputStream, "ISO-8859-1");
+  protected int importLocations(final JdbcTemplate jt) throws IOException {
+    final ZipFile zipFile = new ZipFile(new ClassPathResource(ZIP_FILE_NAME).getFile());
+    final ZipEntry zipEntry = zipFile.getEntry(ZIP_ENTRY_NAME);
+    final InputStream inputStream = zipFile.getInputStream(zipEntry);
+    final LineIterator iterator = IOUtils.lineIterator(inputStream, "ISO-8859-1");
 
     int count = 0;
-    String sql = "INSERT INTO Location (unlocode,name) VALUES (?,?)";
+    final String sql = "INSERT INTO Location (unlocode,name) VALUES (?,?)";
 
     final String[][] batchArgs = new String[BATCH_SIZE][2];
     while (iterator.hasNext()) {
-      String line = iterator.nextLine();
-      String[] args = parseLocation(line);
+      final String line = iterator.nextLine();
+      final String[] args = parseLocation(line);
       if (args != null) {
         int pos = count % BATCH_SIZE;
         batchArgs[pos][0] = args[0];
               ps.setString(1, batchArgs[i][0]);
               ps.setString(2, batchArgs[i][1]);
             }
+
             public int getBatchSize() {
               return BATCH_SIZE;
             }
     return count;
   }
 
-  private String[] parseLocation(String line) {
-    String countryCode = line.substring(3, 5);
-    String locationCode = line.substring(6, 9);
+  private String[] parseLocation(final String line) {
+    final String countryCode = line.substring(3, 5);
+    final String locationCode = line.substring(6, 9);
     if (locationCode.trim().length() == 3) {
-      String name = line.substring(10, 46).trim();
-      return new String[] {countryCode + locationCode, name};
+      final String name = line.substring(10, 46).trim();
+      return new String[]{countryCode + locationCode, name};
     } else {
       return null;
     }
   }
 
-  public void contextInitialized(ServletContextEvent event) {
-    WebApplicationContext context = WebApplicationContextUtils.getRequiredWebApplicationContext(event.getServletContext());
-    PlatformTransactionManager ptm = (PlatformTransactionManager) BeanFactoryUtils.beanOfType(context, PlatformTransactionManager.class);
-    TransactionTemplate tt = new TransactionTemplate(ptm);
-    DataSource dataSource = (DataSource) BeanFactoryUtils.beanOfType(context, DataSource.class);
+  public void contextInitialized(final ServletContextEvent event) {
+    final WebApplicationContext context = WebApplicationContextUtils.getRequiredWebApplicationContext(event.getServletContext());
+    final PlatformTransactionManager ptm = (PlatformTransactionManager) BeanFactoryUtils.beanOfType(context, PlatformTransactionManager.class);
+    final TransactionTemplate tt = new TransactionTemplate(ptm);
+    final DataSource dataSource = (DataSource) BeanFactoryUtils.beanOfType(context, DataSource.class);
     final JdbcTemplate jt = new JdbcTemplate(dataSource);
 
-
-    long t = System.currentTimeMillis();
-    Integer count = (Integer) tt.execute(new TransactionCallback() {
+    final long t = System.currentTimeMillis();
+    final Integer count = (Integer) tt.execute(new TransactionCallback() {
       public Object doInTransaction(TransactionStatus status) {
         try {
           return importLocations(jt);
         }
       }
     });
-    logger.info("Imported " + count + " locations in " + (System.currentTimeMillis() - t)/1000.0 + " seconds.");
+    logger.info("Imported " + count + " locations in " + (System.currentTimeMillis() - t) / 1000.0 + " seconds.");
   }
 
-  public void contextDestroyed(ServletContextEvent event) {}
+  public void contextDestroyed(final ServletContextEvent event) {
+  }
 }

dddsample/src/main/java/se/citerus/dddsample/web/CargoAdminController.java

 
 /**
  * Handles cargo routing and administration.
- *
  */
-public class CargoAdminController extends MultiActionController {
+public final class CargoAdminController extends MultiActionController {
 
   private CargoService cargoService;
   private RoutingService routingService;
 
-  public Map registrationForm(HttpServletRequest request, HttpServletResponse response) throws Exception {
-    Map map = new HashMap();
-    List<UnLocode> unLocodes = cargoService.shippingLocations();
-    List<String> unLocodeStrings = new ArrayList<String>();
+  public Map registrationForm(final HttpServletRequest request, final HttpServletResponse response) throws Exception {
+    final Map<String, Object> map = new HashMap<String, Object>();
+    final List<UnLocode> unLocodes = cargoService.shippingLocations();
+    final List<String> unLocodeStrings = new ArrayList<String>();
+
     for (UnLocode unLocode : unLocodes) {
       unLocodeStrings.add(unLocode.idString());
     }
+
     map.put("unlocodes", unLocodeStrings);
     return map;
   }
 
-  public void register(HttpServletRequest request, HttpServletResponse response, RegistrationCommand command) throws Exception {
-    TrackingId trackingId = cargoService.registerNew(
+  public void register(final HttpServletRequest request, final HttpServletResponse response,
+                       final RegistrationCommand command) throws Exception {
+
+    final TrackingId trackingId = cargoService.registerNew(
       new UnLocode(command.getOriginUnlocode()),
       new UnLocode(command.getDestinationUnlocode())
     );
   }
 
   public Map list(HttpServletRequest request, HttpServletResponse response) {
-    Map map = new HashMap();
+    final Map<String, Object> map = new HashMap<String, Object>();
     map.put("cargoList", cargoService.loadAllForRouting());
     return map;
   }
 
-  public Map show(HttpServletRequest request, HttpServletResponse response) {
-    Map map = new HashMap();
-    String param = request.getParameter("trackingId");
-    TrackingId trackingId = new TrackingId(param);
+  public Map show(final HttpServletRequest request, final HttpServletResponse response) {
+    final Map<String, Object> map = new HashMap<String, Object>();
+    final TrackingId trackingId = new TrackingId(request.getParameter("trackingId"));
     map.put("cargo", cargoService.loadForRouting(trackingId));
     return map;
   }
 
-  public Map selectItinerary(HttpServletRequest request, HttpServletResponse response) {
-    Map map = new HashMap();
-    TrackingId trackingId = new TrackingId(request.getParameter("trackingId"));
-
-    List<ItineraryCandidateDTO> itineraries = routingService.calculatePossibleRoutes(trackingId, null);
-
-    List<RoutingCommand.ItineraryCandidateCommand> itineraryCandidates = new ArrayList<RoutingCommand.ItineraryCandidateCommand>();
+  public Map selectItinerary(final HttpServletRequest request, final HttpServletResponse response) {
+    final Map<String, Object> map = new HashMap<String, Object>();
+    final TrackingId trackingId = new TrackingId(request.getParameter("trackingId"));
+    final List<ItineraryCandidateDTO> itineraries = routingService.calculatePossibleRoutes(trackingId, null);
+    final List<RoutingCommand.ItineraryCandidateCommand> itineraryCandidates =
+      new ArrayList<RoutingCommand.ItineraryCandidateCommand>();
 
     // TODO: eliminate the routing command altogether, use the DTOs in the view
     for (ItineraryCandidateDTO itinerary : itineraries) {
-      RoutingCommand.ItineraryCandidateCommand itineraryCandidateCommand = new RoutingCommand.ItineraryCandidateCommand();
+      final RoutingCommand.ItineraryCandidateCommand itineraryCandidateCommand =
+        new RoutingCommand.ItineraryCandidateCommand();
       itineraryCandidateCommand.setTrackingId(trackingId.idString());
       itineraryCandidates.add(itineraryCandidateCommand);
       for (LegDTO leg : itinerary.getLegs()) {
-        RoutingCommand.LegCommand legCommand = new RoutingCommand.LegCommand();
+        final RoutingCommand.LegCommand legCommand = new RoutingCommand.LegCommand();
         legCommand.setCarrierMovementId(leg.getCarrierMovementId());
         legCommand.setFromUnlocode(leg.getFrom());
         legCommand.setToUnlocode(leg.getTo());
     return map;
   }
 
-  public void assignItinerary(HttpServletRequest request, HttpServletResponse response) throws Exception {
-    TrackingId trackingId = new TrackingId(request.getParameter("trackingId"));
+  public void assignItinerary(final HttpServletRequest request, final HttpServletResponse response) throws Exception {
+    final TrackingId trackingId = new TrackingId(request.getParameter("trackingId"));
 
     // TODO:  gah, stuck on indexoutofbounds (legs[0].fromUnlocode etc) when trying to bind...
     // Revisit and fix this with a proper command object, this is just hideous
-    String[] cmIds = (String[]) request.getParameterMap().get("legs.carrierMovementId");
-    String[] fromUnlocodes = (String[]) request.getParameterMap().get("legs.fromUnlocode");
-    String[] toUnlocodes = (String[]) request.getParameterMap().get("legs.toUnlocode");
+    final String[] cmIds = (String[]) request.getParameterMap().get("legs.carrierMovementId");
+    final String[] fromUnlocodes = (String[]) request.getParameterMap().get("legs.fromUnlocode");
+    final String[] toUnlocodes = (String[]) request.getParameterMap().get("legs.toUnlocode");
 
-    List<LegDTO> legDTOs = new ArrayList<LegDTO>(cmIds.length);
+    final List<LegDTO> legDTOs = new ArrayList<LegDTO>(cmIds.length);
     for (int i = 0; i < cmIds.length; i++) {
       legDTOs.add(new LegDTO(cmIds[i], fromUnlocodes[i], toUnlocodes[i]));
     }
 
-    ItineraryCandidateDTO selectedItinerary = new ItineraryCandidateDTO(legDTOs);
+    final ItineraryCandidateDTO selectedItinerary = new ItineraryCandidateDTO(legDTOs);
     cargoService.assignItinerary(trackingId, selectedItinerary);
 
     response.sendRedirect("list.html");
   }
 
-  public void setCargoService(CargoService cargoService) {
+  public void setCargoService(final CargoService cargoService) {
     this.cargoService = cargoService;
   }
 
-  public void setRoutingService(RoutingService routingService) {
+  public void setRoutingService(final RoutingService routingService) {
     this.routingService = routingService;
   }
 

dddsample/src/main/java/se/citerus/dddsample/web/CargoTrackingController.java

 /**
  * Controller for tracking cargo.
  */
-public class CargoTrackingController extends SimpleFormController {
+public final class CargoTrackingController extends SimpleFormController {
 
   /**
    * Service instance.
   }
 
   @Override
-  protected ModelAndView onSubmit(HttpServletRequest request, HttpServletResponse response, Object command, BindException errors) throws Exception {
+  protected ModelAndView onSubmit(final HttpServletRequest request, final HttpServletResponse response,
+                                  final Object command, final BindException errors) throws Exception {
+
     final TrackCommand trackCommand = (TrackCommand) command;
     final String tidStr = trackCommand.getTrackingId();
     final CargoTrackingDTO cargo = cargoService.track(new TrackingId(tidStr));
     if (cargo != null) {
       model.put("cargo", cargo);
     } else {
-      errors.rejectValue("trackingId", "cargo.unknown_id", new Object[] {trackCommand.getTrackingId()}, "Unknown tracking id");
+      errors.rejectValue("trackingId", "cargo.unknown_id", new Object[]{trackCommand.getTrackingId()},
+        "Unknown tracking id");
     }
     return showForm(request, response, errors, model);
   }
-   
+
 
   /**
    * Sets the cargo service instance.
   public void setCargoService(final CargoService cargoService) {
     this.cargoService = cargoService;
   }
-  
+
 }

dddsample/src/main/java/se/citerus/dddsample/web/command/RegistrationCommand.java

 /**
  *
  */
-public class RegistrationCommand {
+public final class RegistrationCommand {
+
   private String originUnlocode;
   private String destinationUnlocode;
 
     return originUnlocode;
   }
 
-  public void setOriginUnlocode(String originUnlocode) {
+  public void setOriginUnlocode(final String originUnlocode) {
     this.originUnlocode = originUnlocode;
   }
 
     return destinationUnlocode;
   }
 
-  public void setDestinationUnlocode(String destinationUnlocode) {
+  public void setDestinationUnlocode(final String destinationUnlocode) {
     this.destinationUnlocode = destinationUnlocode;
   }
 

dddsample/src/main/java/se/citerus/dddsample/web/command/RoutingCommand.java

 import java.util.ArrayList;
 import java.util.List;
 
-public class RoutingCommand {
-  List<ItineraryCandidateCommand> itineraryCandidates = new ArrayList<ItineraryCandidateCommand>();
+public final class RoutingCommand {
+
+  private List<ItineraryCandidateCommand> itineraryCandidates = new ArrayList<ItineraryCandidateCommand>();
 
   public List<ItineraryCandidateCommand> getItineraryCandidates() {
     return itineraryCandidates;
   }
 
-  public void setItineraryCandidates(List<ItineraryCandidateCommand> itineraryCandidates) {
+  public void setItineraryCandidates(final List<ItineraryCandidateCommand> itineraryCandidates) {
     this.itineraryCandidates = itineraryCandidates;
   }
 
-  public static class ItineraryCandidateCommand {
-    String trackingId;
-    List<LegCommand> legs = new ArrayList<LegCommand>();
+  public static final class ItineraryCandidateCommand {
+    private String trackingId;
+    private List<LegCommand> legs = new ArrayList<LegCommand>();
 
     public String getTrackingId() {
       return trackingId;
     }
 
-    public void setTrackingId(String trackingId) {
+    public void setTrackingId(final String trackingId) {
       this.trackingId = trackingId;
     }
 
       return legs;
     }
 
-    public void setLegs(List<LegCommand> legs) {
+    public void setLegs(final List<LegCommand> legs) {
       this.legs = legs;
     }
   }
 
-  public static class LegCommand {
-    String carrierMovementId;
-    String fromUnlocode;
-    String toUnlocode;
+  public static final class LegCommand {
+    private String carrierMovementId;
+    private String fromUnlocode;
+    private String toUnlocode;
 
     public String getCarrierMovementId() {
       return carrierMovementId;
     }
 
-    public void setCarrierMovementId(String carrierMovementId) {
+    public void setCarrierMovementId(final String carrierMovementId) {
       this.carrierMovementId = carrierMovementId;
     }
 
       return fromUnlocode;
     }
 
-    public void setFromUnlocode(String fromUnlocode) {
+    public void setFromUnlocode(final String fromUnlocode) {
       this.fromUnlocode = fromUnlocode;
     }
 
       return toUnlocode;
     }
 
-    public void setToUnlocode(String toUnlocode) {
+    public void setToUnlocode(final String toUnlocode) {
       this.toUnlocode = toUnlocode;
     }
   }

dddsample/src/main/java/se/citerus/dddsample/web/command/TrackCommand.java

 import org.apache.commons.lang.builder.ToStringBuilder;
 import static org.apache.commons.lang.builder.ToStringStyle.MULTI_LINE_STYLE;
 
-public class TrackCommand {
+public final class TrackCommand {
 
   /**
    * The tracking id.

dddsample/src/main/java/se/citerus/dddsample/web/command/TrackCommandValidator.java

 /**
  * Validator for {@link se.citerus.dddsample.web.command.TrackCommand}s.
  */
-public class TrackCommandValidator implements Validator {
+public final class TrackCommandValidator implements Validator {
 
-  public boolean supports(Class clazz) {
+  public boolean supports(final Class clazz) {
     return TrackCommand.class.isAssignableFrom(clazz);
   }
 
-  public void validate(Object object, Errors errors) {
+  public void validate(final Object object, final Errors errors) {
     ValidationUtils.rejectIfEmptyOrWhitespace(errors, "trackingId", "error.required", "Required");
   }
 

dddsample/src/main/java/se/citerus/dddsample/ws/HandlingEventServiceEndpoint.java

 
 /**
  * Web service endpoint for handling event registration.
- *
  */
 @WebService
 public interface HandlingEventServiceEndpoint {
   /**
    * Register an cargo handling event.
    *
-   * @param completionTime time when event occured, for example a the loading of cargo was completed
-   * @param trackingId tracking id of the cargo
+   * @param completionTime    time when event occured, for example a the loading of cargo was completed
+   * @param trackingId        tracking id of the cargo
    * @param carrierMovementId carrier movement id, if applicable
-   * @param unlocode United Nations Location Code for the location where the event occured
-   * @param eventType type of event
+   * @param unlocode          United Nations Location Code for the location where the event occured
+   * @param eventType         type of event
    */
   void register(String completionTime, String trackingId, String carrierMovementId, String unlocode, String eventType);
 

dddsample/src/main/java/se/citerus/dddsample/ws/HandlingEventServiceEndpointImpl.java

 public class HandlingEventServiceEndpointImpl implements HandlingEventServiceEndpoint {
 
   private HandlingEventService handlingEventService;
-  private static final Log logger = LogFactory.getLog(HandlingEventServiceEndpointImpl.class);
+  private final Log logger = LogFactory.getLog(getClass());
   protected static final String ISO_8601_FORMAT = "yyyy-mm-dd HH:MM:SS.SSS";
 
-  public void register(String completionTime, String trackingId, String carrierMovementId,
-                       String unlocode, String eventType) {
+  public void register(final String completionTime, final String trackingId, final String carrierMovementId,
+                       final String unlocode, final String eventType) {
     try {
       Date date = parseIso8601Date(completionTime);
       TrackingId tid = new TrackingId(trackingId);
     // TODO: possibly handle "Duplicate event" exceptions due to unique constraint violations
   }
 
-  private HandlingEvent.Type parseEventType(String eventType) throws InvalidEventTypeException {
+  private HandlingEvent.Type parseEventType(final String eventType) throws InvalidEventTypeException {
     try {
       return HandlingEvent.Type.valueOf(eventType);
-    } catch(IllegalArgumentException e) {
+    } catch (IllegalArgumentException e) {
       throw new InvalidEventTypeException(eventType);
     }
   }
     // TODO: actually place in a retry queue
   }
 
-  private Date parseIso8601Date(String completionTime) throws ParseException {
+  private Date parseIso8601Date(final String completionTime) throws ParseException {
     return new SimpleDateFormat(ISO_8601_FORMAT).parse(completionTime);
   }
 
-  public void setHandlingEventService(HandlingEventService handlingEventService) {
+  public void setHandlingEventService(final HandlingEventService handlingEventService) {
     this.handlingEventService = handlingEventService;
   }
 }

dddsample/src/test/java/se/citerus/dddsample/domain/SampleLocations.java

 
 /**
  * A few locations for easy testing.
- *
  */
 public class SampleLocations {
 
   public static final Location HANGZOU = new Location(new UnLocode("CNHGH"), "Hangzhou");
   public static final Location NEWYORK = new Location(new UnLocode("USNYC"), "New York");
 
-  public static final List<Location> all = new ArrayList<Location>();
+  public static final List<Location> ALL = new ArrayList<Location>();
 
   static {
     for (Field field : SampleLocations.class.getDeclaredFields()) {
       if (field.getType().equals(Location.class)) {
         try {
-          all.add((Location) field.get(null));
+          ALL.add((Location) field.get(null));
         } catch (IllegalAccessException e) {
           throw new RuntimeException(e);
         }
   }
 
   public static List<Location> getAll() {
-    return all;
+    return ALL;
   }
-  
+
 }

dddsample/src/test/java/se/citerus/dddsample/service/RoutingServiceTest.java

 
 public class RoutingServiceTest extends TestCase {
 
-  RoutingServiceImpl routingService;
-  LocationRepository locationRepository;
-  CargoRepository cargoRepository;
-  CarrierMovementRepository carrierMovementRepository;
+  private RoutingServiceImpl routingService;
+  private LocationRepository locationRepository;
+  private CargoRepository cargoRepository;
+  private CarrierMovementRepository carrierMovementRepository;
 
   protected void setUp() throws Exception {
     routingService = new RoutingServiceImpl();

dddsample/src/test/java/se/citerus/dddsample/ws/HandlinEventServiceEndpointTest.java

 
 public class HandlinEventServiceEndpointTest extends TestCase {
 
-  HandlingEventServiceEndpointImpl endpoint;
-  HandlingEventService handlingEventService;
-  SimpleDateFormat sdf;
+  private HandlingEventServiceEndpointImpl endpoint;
+  private HandlingEventService handlingEventService;
+  private SimpleDateFormat sdf;
 
   protected void setUp() throws Exception {
     endpoint = new HandlingEventServiceEndpointImpl();
   }
 
   public void testRegisterUnknownCarrierMovementId() throws Exception {
-      Date date = new Date(100);
+    Date date = new Date(100);
 
-      TrackingId trackingId = new TrackingId("XYZ");
-      CarrierMovementId carrierMovementId = new CarrierMovementId("NOTFOUND");
+    TrackingId trackingId = new TrackingId("XYZ");
+    CarrierMovementId carrierMovementId = new CarrierMovementId("NOTFOUND");
 
-      handlingEventService.register(date, trackingId, carrierMovementId, new UnLocode("AUMEL"), HandlingEvent.Type.UNLOAD);
-      expectLastCall().andThrow(new UnknownCarrierMovementIdException(carrierMovementId));
-      replay(handlingEventService);
+    handlingEventService.register(date, trackingId, carrierMovementId, new UnLocode("AUMEL"), HandlingEvent.Type.UNLOAD);
+    expectLastCall().andThrow(new UnknownCarrierMovementIdException(carrierMovementId));
+    replay(handlingEventService);
 
-      // Tested call
-      endpoint.register(sdf.format(date), "XYZ", "NOTFOUND", "AUMEL", "UNLOAD");
+    // Tested call
+    endpoint.register(sdf.format(date), "XYZ", "NOTFOUND", "AUMEL", "UNLOAD");
   }
 
   public void testRegisterInvalidEventType() throws Exception {
-      Date date = new Date(100);
-      
-      replay(handlingEventService);
+    Date date = new Date(100);
+
+    replay(handlingEventService);
 
-      // Tested call
-      // Note: currently, every error is silently swallowed.
-      endpoint.register(sdf.format(date), "XYZ", "CAR_333", "AUMEL", "NO_SUCH_EVENT_TYPE");
+    // Tested call
+    // Note: currently, every error is silently swallowed.
+    endpoint.register(sdf.format(date), "XYZ", "CAR_333", "AUMEL", "NO_SUCH_EVENT_TYPE");
   }
 
-    public void testRegisterInvalidDateFormat() throws Exception {
-        Date date = new Date(100);
+  public void testRegisterInvalidDateFormat() throws Exception {
+    Date date = new Date(100);
 
-        replay(handlingEventService);
+    replay(handlingEventService);
 
-        // Tested call
-        // Note: currently, every error is silently swallowed.
-        endpoint.register("1 2 3 4", "XYZ", "CAR_333", "AUMEL", "LOAD");
-    }
+    // Tested call
+    // Note: currently, every error is silently swallowed.
+    endpoint.register("1 2 3 4", "XYZ", "CAR_333", "AUMEL", "LOAD");
+  }
 
 
   protected void tearDown() throws Exception {