Encapsulated fields in pattern support classes to avoid name clashes (using "_primaryKey" instead of "id"). Fixed hbm files to reflect change.

Removed unused DomanObjectUtils class.

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/model/handling/HandlingEvent.java

 import se.citerus.dddsample.tracking.core.domain.model.location.Location;
 import se.citerus.dddsample.tracking.core.domain.model.shared.HandlingActivity;
 import se.citerus.dddsample.tracking.core.domain.model.voyage.Voyage;
-import se.citerus.dddsample.tracking.core.domain.patterns.DomainObjectUtils;
 import se.citerus.dddsample.tracking.core.domain.patterns.domainevent.DomainEvent;
 import se.citerus.dddsample.tracking.core.domain.patterns.valueobject.ValueObject;
 
   }
 
   public Voyage voyage() {
-    return DomainObjectUtils.nullSafe(activity.voyage(), Voyage.NONE);
+    return activity.voyage() != null ? activity.voyage() : Voyage.NONE;
   }
 
   public Date completionTime() {

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/model/voyage/Voyage.java

   private Schedule schedule;
 
   // Null object pattern
-  public static final Voyage NONE = new Voyage(
-    new VoyageNumber(""), Schedule.EMPTY
-  );
+  public static final Voyage NONE = new Voyage(new VoyageNumber(""), Schedule.EMPTY);
 
   public Voyage(final VoyageNumber voyageNumber, final Schedule schedule) {
     Validate.notNull(voyageNumber, "Voyage number is required");

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/patterns/DomainObjectUtils.java

-package se.citerus.dddsample.tracking.core.domain.patterns;
-
-/**
- * Utility code for domain classes.
- */
-public class DomainObjectUtils {
-
-  /**
-   * @param actual actual value
-   * @param safe   a null-safe value
-   * @param <T>    type
-   * @return actual value, if it's not null, or safe value if the actual value is null.
-   */
-  public static <T> T nullSafe(T actual, T safe) {
-    return actual == null ? safe : actual;
-  }
-
-  // TODO wrappers for some of the commons-lang code:
-  //
-  // EqualsBuilder that uses sameIdentity/sameValue,
-  // better validation (varargs etc) 
-
-  /**
-   * Prevent instantiation.
-   */
-  private DomainObjectUtils() {
-  }
-
-}

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/patterns/entity/EntitySupport.java

  */
 public abstract class EntitySupport<T extends Entity, ID> implements Entity<T, ID> {
 
+  @SuppressWarnings("UnusedDeclaration")
+  private final Long _primaryKey = null;
+  
   @Override
   public final boolean sameAs(final T other) {
     return other != null && this.identity().equals(other.identity());
     return sameAs((T) o);
   }
 
-  @SuppressWarnings("UnusedDeclaration")
-  // Surrogate primary key
-  private Long id;
-
 }

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/patterns/valueobject/ValueObjectSupport.java

 public abstract class ValueObjectSupport<T extends ValueObject> implements ValueObject<T> {
 
   @SuppressWarnings("UnusedDeclaration")
-  private final Long id = null;
-  private transient int cachedHashCode = 0;
-  private final static String[] EXCLUDED_FIELDS = {"id", "cachedHashCode"};
+  private final Long _primaryKey = null;
+  private transient int _cachedHashCode = 0;
+  private final static String[] EXCLUDED_FIELDS = {"_primaryKey", "_cachedHashCode"};
 
   /**
    * @param other The other value object.
   @Override
   public final int hashCode() {
     // Using a local variable to ensure that we only do a single read
-    // of the cachedHashCode field, to avoid race conditions.
+    // of the _cachedHashCode field, to avoid race conditions.
     // It doesn't matter if several threads compute the hash code and overwrite
     // each other, but it's important that we never return 0, which could happen
-    // with multiple reads of the cachedHashCode field.
+    // with multiple reads of the _cachedHashCode field.
     //
     // See java.lang.String.hashCode()
-    int h = cachedHashCode;
+    int h = _cachedHashCode;
     if (h == 0) {
       // Lazy initialization of hash code.
       // Value objects are immutable, so the hash code never changes.
       h = HashCodeBuilder.reflectionHashCode(this, false);
-      cachedHashCode = h;
+      _cachedHashCode = h;
     }
 
     return h;

dddsample/tracking/core/src/main/resources/se/citerus/dddsample/tracking/core/infrastructure/persistence/hibernate/Cargo.hbm.xml

 <hibernate-mapping default-access="field">
   <class name="se.citerus.dddsample.tracking.core.domain.model.cargo.Cargo" table="Cargo">
 
-    <id name="id" column="id">
+    <id name="_primaryKey" column="id">
       <generator class="org.hibernate.id.IdentityGenerator"/>
     </id>
 

dddsample/tracking/core/src/main/resources/se/citerus/dddsample/tracking/core/infrastructure/persistence/hibernate/CarrierMovement.hbm.xml

 <hibernate-mapping default-access="field">
   <class name="se.citerus.dddsample.tracking.core.domain.model.voyage.CarrierMovement" table="CarrierMovement" mutable="false">
 
-    <id name="id" column="id">
+    <id name="_primaryKey" column="id">
       <generator class="org.hibernate.id.IdentityGenerator"/>
     </id>
 

dddsample/tracking/core/src/main/resources/se/citerus/dddsample/tracking/core/infrastructure/persistence/hibernate/Leg.hbm.xml

 
 <hibernate-mapping default-access="field">
   <class name="se.citerus.dddsample.tracking.core.domain.model.cargo.Leg" table="Leg" mutable="false">
-    <id name="id" column="id">
+    <id name="_primaryKey" column="id">
       <generator class="org.hibernate.id.IdentityGenerator"/>
     </id>
 

dddsample/tracking/core/src/main/resources/se/citerus/dddsample/tracking/core/infrastructure/persistence/hibernate/Location.hbm.xml

 
 <hibernate-mapping default-access="field">
   <class name="se.citerus.dddsample.tracking.core.domain.model.location.Location" table="Location">
-    <id name="id" column="id">
+    <id name="_primaryKey" column="id">
       <generator class="org.hibernate.id.IdentityGenerator"/>
     </id>
     <component name="unLocode" unique="true" update="false">

dddsample/tracking/core/src/main/resources/se/citerus/dddsample/tracking/core/infrastructure/persistence/hibernate/Voyage.hbm.xml

 <hibernate-mapping default-access="field">
   <class name="se.citerus.dddsample.tracking.core.domain.model.voyage.Voyage" table="Voyage">
 
-    <id name="id" column="id">
+    <id name="_primaryKey" column="id">
       <generator class="org.hibernate.id.IdentityGenerator"/>
     </id>