Fixe a few minor details discovered by PMD

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/application/event/SystemEvents.java

@@ -2,7 +2,6 @@ package se.citerus.dddsample.tracking.core.application.event;
 
 import se.citerus.dddsample.tracking.core.domain.model.cargo.Cargo;
 import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent;
-import se.citerus.dddsample.tracking.core.domain.model.voyage.Voyage;
 
 /**
  * This interface provides a way to let other parts

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

@@ -109,28 +109,28 @@ public class RouteSpecification extends ValueObjectSupport<RouteSpecification> {
   
   private final class NotNullSpecification extends FieldlessSpecification {
     @Override
-    public final boolean isSatisfiedBy(final Itinerary itinerary) {
+    public boolean isSatisfiedBy(final Itinerary itinerary) {
       return itinerary != null;
     }
   }
 
   private final class SameOriginSpecification extends FieldlessSpecification {
     @Override
-    public final boolean isSatisfiedBy(final Itinerary itinerary) {
+    public boolean isSatisfiedBy(final Itinerary itinerary) {
       return origin.sameAs(itinerary.initialLoadLocation());
     }
   }
 
   private final class SameDestinationSpecification extends FieldlessSpecification {
     @Override
-    public final boolean isSatisfiedBy(final Itinerary itinerary) {
+    public boolean isSatisfiedBy(final Itinerary itinerary) {
       return destination.sameAs(itinerary.finalUnloadLocation());
     }
   }
 
   private final class MeetsDeadlineSpecification extends FieldlessSpecification {
     @Override
-    public final boolean isSatisfiedBy(final Itinerary itinerary) {
+    public boolean isSatisfiedBy(final Itinerary itinerary) {
       return arrivalDeadline.after(itinerary.finalUnloadTime());
     }
   }

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

@@ -77,8 +77,8 @@ public final class HandlingEvent implements DomainEvent<HandlingEvent> {
     }
 
     @Override
-    public boolean sameValueAs(Type other) {
-      return other != null && this.equals(other);
+    public boolean sameValueAs(final Type other) {
+      return this.equals(other);
     }
 
   }
@@ -92,14 +92,13 @@ public final class HandlingEvent implements DomainEvent<HandlingEvent> {
    * @param voyage           the voyage
    * @param operatorCode     operator code for port operator
    */
-  // TODO make package local
-  public HandlingEvent(final Cargo cargo,
-                       final Date completionTime,
-                       final Date registrationTime,
-                       final Type type,
-                       final Location location,
-                       final Voyage voyage,
-                       final OperatorCode operatorCode) {
+  HandlingEvent(final Cargo cargo,
+                final Date completionTime,
+                final Date registrationTime,
+                final Type type,
+                final Location location,
+                final Voyage voyage,
+                final OperatorCode operatorCode) {
     Validate.notNull(cargo, "Cargo is required");
     Validate.notNull(completionTime, "Completion time is required");
     Validate.notNull(registrationTime, "Registration time is required");
@@ -166,6 +165,10 @@ public final class HandlingEvent implements DomainEvent<HandlingEvent> {
     return activity.voyage() != null ? activity.voyage() : Voyage.NONE;
   }
 
+  public OperatorCode operatorCode() {
+    return operatorCode;
+  }
+
   public Date completionTime() {
     return new Date(this.completionTime.getTime());
   }