Moved tracking id generator to domain service package.

Moved EventSequenceNumber to handling aggregate.

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

@@ -7,7 +7,7 @@ import se.citerus.dddsample.tracking.core.domain.model.cargo.Cargo;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.CargoRepository;
 import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEventRepository;
-import se.citerus.dddsample.tracking.core.domain.model.shared.EventSequenceNumber;
+import se.citerus.dddsample.tracking.core.domain.model.handling.EventSequenceNumber;
 import se.citerus.dddsample.tracking.core.domain.model.shared.HandlingActivity;
 
 public class CargoUpdater {

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

@@ -9,6 +9,7 @@ package se.citerus.dddsample.tracking.core.domain.model.cargo;
 import se.citerus.dddsample.tracking.core.domain.model.location.Location;
 import se.citerus.dddsample.tracking.core.domain.model.location.LocationRepository;
 import se.citerus.dddsample.tracking.core.domain.model.location.UnLocode;
+import se.citerus.dddsample.tracking.core.domain.service.TrackingIdGenerator;
 
 import java.util.Date;
 

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

@@ -1,10 +0,0 @@
-package se.citerus.dddsample.tracking.core.domain.model.cargo;
-
-/**
- * Generates tracking ids for cargos. This is a domain service.
- */
-public interface TrackingIdGenerator {
-
-  TrackingId nextTrackingId();
-
-}

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

@@ -5,7 +5,7 @@ import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.Cargo;
 import se.citerus.dddsample.tracking.core.domain.model.location.Location;
-import se.citerus.dddsample.tracking.core.domain.model.shared.EventSequenceNumber;
+import se.citerus.dddsample.tracking.core.domain.model.handling.EventSequenceNumber;
 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.shared.DomainEvent;

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

@@ -1,7 +1,7 @@
 package se.citerus.dddsample.tracking.core.domain.model.handling;
 
 import se.citerus.dddsample.tracking.core.domain.model.cargo.Cargo;
-import se.citerus.dddsample.tracking.core.domain.model.shared.EventSequenceNumber;
+import se.citerus.dddsample.tracking.core.domain.model.handling.EventSequenceNumber;
 
 /**
  * Handling event repository.

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/model/shared/EventSequenceNumber.java

@@ -1,51 +0,0 @@
-package se.citerus.dddsample.tracking.core.domain.model.shared;
-
-import se.citerus.dddsample.tracking.core.domain.shared.ValueObject;
-
-import java.util.concurrent.atomic.AtomicLong;
-
-public class EventSequenceNumber implements ValueObject<EventSequenceNumber> {
-
-  private long value;
-  private static final AtomicLong SEQUENCE = new AtomicLong(System.currentTimeMillis());
-
-  private EventSequenceNumber(final long value) {
-    this.value = value;
-  }
-
-  public static EventSequenceNumber next() {
-    return new EventSequenceNumber(SEQUENCE.getAndIncrement());
-  }
-
-  public long longValue() {
-    return value;
-  }
-
-  @Override
-  public boolean sameValueAs(final EventSequenceNumber other) {
-    return false;
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (this == o) return true;
-    if (o == null || getClass() != o.getClass()) return false;
-
-    return sameValueAs((EventSequenceNumber) o);
-  }
-
-  @Override
-  public int hashCode() {
-    return Long.valueOf(value).hashCode();
-  }
-
-  @Override
-  public String toString() {
-    return String.valueOf(value);
-  }
-
-  EventSequenceNumber() {
-    // Needed by Hibernate
-  }
-
-}

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/infrastructure/persistence/hibernate/DatabaseTrackingIdGenerator.java

@@ -8,7 +8,7 @@ package se.citerus.dddsample.tracking.core.infrastructure.persistence.hibernate;
 
 import org.hibernate.SessionFactory;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingIdGenerator;
+import se.citerus.dddsample.tracking.core.domain.service.TrackingIdGenerator;
 
 public class DatabaseTrackingIdGenerator implements TrackingIdGenerator {
 

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/infrastructure/persistence/hibernate/HandlingEventRepositoryHibernate.java

@@ -5,7 +5,7 @@ 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.handling.HandlingEventRepository;
 import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingHistory;
-import se.citerus.dddsample.tracking.core.domain.model.shared.EventSequenceNumber;
+import se.citerus.dddsample.tracking.core.domain.model.handling.EventSequenceNumber;
 
 import java.util.List;
 

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/infrastructure/persistence/inmemory/HandlingEventRepositoryInMem.java

@@ -5,7 +5,7 @@ import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingId;
 import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEventRepository;
 import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingHistory;
-import se.citerus.dddsample.tracking.core.domain.model.shared.EventSequenceNumber;
+import se.citerus.dddsample.tracking.core.domain.model.handling.EventSequenceNumber;
 
 import java.util.*;
 

dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/infrastructure/persistence/inmemory/TrackingIdGeneratorInMem.java

@@ -7,7 +7,7 @@
 package se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory;
 
 import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingIdGenerator;
+import se.citerus.dddsample.tracking.core.domain.service.TrackingIdGenerator;
 
 import java.util.concurrent.atomic.AtomicLong;
 

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/application/booking/BookingServiceTest.java

@@ -8,6 +8,7 @@ import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLoc
 import static se.citerus.dddsample.tracking.core.domain.model.location.SampleLocations.STOCKHOLM;
 import se.citerus.dddsample.tracking.core.domain.model.location.UnLocode;
 import se.citerus.dddsample.tracking.core.domain.service.RoutingService;
+import se.citerus.dddsample.tracking.core.domain.service.TrackingIdGenerator;
 
 import java.util.Date;
 

dddsample/tracking/core/src/test/java/se/citerus/dddsample/tracking/core/infrastructure/TrackingIdGeneratorTest.java

@@ -3,7 +3,7 @@ package se.citerus.dddsample.tracking.core.infrastructure;
 import junit.framework.Assert;
 import junit.framework.TestCase;
 import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingId;
-import se.citerus.dddsample.tracking.core.domain.model.cargo.TrackingIdGenerator;
+import se.citerus.dddsample.tracking.core.domain.service.TrackingIdGenerator;
 import se.citerus.dddsample.tracking.core.infrastructure.persistence.inmemory.TrackingIdGeneratorInMem;
 
 public class TrackingIdGeneratorTest extends TestCase {