Changed idString() methods to stringValue()

dddsample/src/main/java/se/citerus/dddsample/application/impl/BookingServiceImpl.java

@@ -40,7 +40,7 @@ public final class BookingServiceImpl implements BookingService {
                                  final Date arrivalDeadline) {
     final Cargo cargo = cargoFactory.newCargo(originUnLocode, destinationUnLocode, arrivalDeadline);
     cargoRepository.store(cargo);
-    logger.info("Booked new cargo with tracking id " + cargo.trackingId().idString());
+    logger.info("Booked new cargo with tracking id " + cargo.trackingId().stringValue());
 
     return cargo.trackingId();
   }

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

@@ -24,7 +24,7 @@ public final class TrackingId implements ValueObject<TrackingId> {
   /**
    * @return String representation of this tracking id.
    */
-  public String idString() {
+  public String stringValue() {
     return id;
   }
 

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

@@ -21,6 +21,6 @@ public final class UnknownCargoException extends CannotCreateHandlingEventExcept
    */            
   @Override
   public String getMessage() {
-    return "No cargo with tracking id " + trackingId.idString() + " exists in the system";
+    return "No cargo with tracking id " + trackingId.stringValue() + " exists in the system";
   }
 }

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

@@ -12,6 +12,6 @@ public class UnknownLocationException extends CannotCreateHandlingEventException
 
   @Override
   public String getMessage() {
-    return "No location with UN locode " + unlocode.idString() + " exists in the system";
+    return "No location with UN locode " + unlocode.stringValue() + " exists in the system";
   }
 }

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

@@ -15,6 +15,6 @@ public class UnknownVoyageException extends CannotCreateHandlingEventException {
 
   @Override
   public String getMessage() {
-    return "No voyage with number " + voyageNumber.idString() + " exists in the system";
+    return "No voyage with number " + voyageNumber.stringValue() + " exists in the system";
   }
 }

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

@@ -35,7 +35,7 @@ public final class UnLocode implements ValueObject<UnLocode> {
   /**
    * @return country code and location code concatenated, always upper case.
    */
-  public String idString() {
+  public String stringValue() {
     return unlocode;
   }
 
@@ -61,7 +61,7 @@ public final class UnLocode implements ValueObject<UnLocode> {
 
   @Override
   public String toString() {
-    return idString();
+    return stringValue();
   }
 
   UnLocode() {

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

@@ -43,12 +43,12 @@ public class VoyageNumber implements ValueObject<VoyageNumber> {
     return number;
   }
 
-  public String idString() {
+  public String stringValue() {
     return number;
   }
 
   VoyageNumber() {
     // Needed by Hibernate
   }
-  
+
 }

dddsample/src/main/java/se/citerus/dddsample/infrastructure/routing/ExternalRoutingService.java

@@ -47,8 +47,8 @@ public class ExternalRoutingService implements RoutingService {
     final List<TransitPath> transitPaths;
     try {
       transitPaths = graphTraversalService.findShortestPath(
-      origin.unLocode().idString(),
-      destination.unLocode().idString(),
+      origin.unLocode().stringValue(),
+      destination.unLocode().stringValue(),
       limitations
     );
     } catch (RemoteException e) {

dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/facade/internal/BookingServiceFacadeImpl.java

@@ -52,7 +52,7 @@ public class BookingServiceFacadeImpl implements BookingServiceFacade {
       new UnLocode(destination),
       arrivalDeadline
     );
-    return trackingId.idString();
+    return trackingId.stringValue();
   }
 
   @Override

dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/facade/internal/assembler/CargoRoutingDTOAssembler.java

@@ -17,16 +17,16 @@ public class CargoRoutingDTOAssembler {
    */
   public CargoRoutingDTO toDTO(final Cargo cargo) {
     final CargoRoutingDTO dto = new CargoRoutingDTO(
-      cargo.trackingId().idString(),
-      cargo.routeSpecification().origin().unLocode().idString(),
-      cargo.routeSpecification().destination().unLocode().idString(),
+      cargo.trackingId().stringValue(),
+      cargo.routeSpecification().origin().unLocode().stringValue(),
+      cargo.routeSpecification().destination().unLocode().stringValue(),
       cargo.routeSpecification().arrivalDeadline(),
       cargo.delivery().routingStatus().sameValueAs(RoutingStatus.MISROUTED));
     for (Leg leg : cargo.itinerary().legs()) {
       dto.addLeg(
-        leg.voyage().voyageNumber().idString(),
-        leg.loadLocation().unLocode().idString(),
-        leg.unloadLocation().unLocode().idString(),
+        leg.voyage().voyageNumber().stringValue(),
+        leg.loadLocation().unLocode().stringValue(),
+        leg.unloadLocation().unLocode().stringValue(),
         leg.loadTime(),
         leg.unloadTime());
     }

dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/facade/internal/assembler/ItineraryCandidateDTOAssembler.java

@@ -39,7 +39,7 @@ public class ItineraryCandidateDTOAssembler {
     final VoyageNumber voyageNumber = leg.voyage().voyageNumber();
     final UnLocode from = leg.loadLocation().unLocode();
     final UnLocode to = leg.unloadLocation().unLocode();
-    return new LegDTO(voyageNumber.idString(), from.idString(), to.idString(), leg.loadTime(), leg.unloadTime());
+    return new LegDTO(voyageNumber.stringValue(), from.stringValue(), to.stringValue(), leg.loadTime(), leg.unloadTime());
   }
 
   /**

dddsample/src/main/java/se/citerus/dddsample/interfaces/booking/facade/internal/assembler/LocationDTOAssembler.java

@@ -9,7 +9,7 @@ import java.util.List;
 public class LocationDTOAssembler {
 
   public LocationDTO toDTO(Location location) {
-    return new LocationDTO(location.unLocode().idString(), location.name());
+    return new LocationDTO(location.unLocode().stringValue(), location.name());
   }
 
   public List<LocationDTO> toDTOList(List<Location> allLocations) {

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

@@ -69,7 +69,7 @@ public final class CargoTrackingViewAdapter {
         args = new Object[]{getDisplayText(delivery.lastKnownLocation())};
         break;
       case ONBOARD_CARRIER:
-        args = new Object[]{delivery.currentVoyage().voyageNumber().idString()};
+        args = new Object[]{delivery.currentVoyage().voyageNumber().stringValue()};
         break;
       case CLAIMED:
       case NOT_RECEIVED:
@@ -100,7 +100,7 @@ public final class CargoTrackingViewAdapter {
    * @return Cargo tracking id.
    */
   public String getTrackingId() {
-    return cargo.trackingId().idString();
+    return cargo.trackingId().stringValue();
   }
 
   public String getEta() {
@@ -188,7 +188,7 @@ public final class CargoTrackingViewAdapter {
      */
     public String getVoyageNumber() {
       final Voyage voyage = handlingEvent.voyage();
-      return voyage.voyageNumber().idString();
+      return voyage.voyageNumber().stringValue();
     }
 
     /**
@@ -205,7 +205,7 @@ public final class CargoTrackingViewAdapter {
         case LOAD:
         case UNLOAD:
           args = new Object[]{
-            handlingEvent.voyage().voyageNumber().idString(),
+            handlingEvent.voyage().voyageNumber().stringValue(),
             handlingEvent.location().name(),
             handlingEvent.completionTime()
           };

dddsample/src/test/java/se/citerus/dddsample/domain/model/location/UnLocodeTest.java

@@ -18,8 +18,8 @@ public class UnLocodeTest extends TestCase {
     assertInvalid(null);
   }
 
-  public void testIdString() throws Exception {
-    assertEquals("ABCDE", new UnLocode("AbcDe").idString());
+  public void testStringValue() throws Exception {
+    assertEquals("ABCDE", new UnLocode("AbcDe").stringValue());
   }
 
   public void testEquals() throws Exception {

dddsample/src/test/java/se/citerus/dddsample/domain/model/voyage/VoyageNumberTest.java

@@ -24,9 +24,5 @@ public class VoyageNumberTest extends TestCase {
         //TODO: Test goes here...
     }
 
-    public void testIdString() throws Exception {
-        //TODO: Test goes here...
-    }
-
 
 }

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

@@ -121,7 +121,7 @@ public class CargoRepositoryTest extends AbstractRepositoryTest {
     flush();
 
     Map<String, Object> map = sjt.queryForMap(
-      "select * from Cargo where tracking_id = ?", trackingId.idString());
+      "select * from Cargo where tracking_id = ?", trackingId.stringValue());
 
     assertEquals("AAA", map.get("TRACKING_ID"));
 

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

@@ -15,7 +15,7 @@ public class CarrierMovementRepositoryTest extends AbstractRepositoryTest {
   public void testFind() throws Exception {
     Voyage voyage = voyageRepository.find(new VoyageNumber("0101"));
     assertNotNull(voyage);
-    assertEquals("0101", voyage.voyageNumber().idString());
+    assertEquals("0101", voyage.voyageNumber().stringValue());
     /* TODO adapt
     assertEquals(STOCKHOLM, carrierMovement.departureLocation());
     assertEquals(HELSINKI, carrierMovement.arrivalLocation());

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

@@ -32,11 +32,11 @@ public class CargoRepositoryInMem implements CargoRepository {
   }
 
   public Cargo find(final TrackingId trackingId) {
-    return cargoDb.get(trackingId.idString());
+    return cargoDb.get(trackingId.stringValue());
   }
 
   public void store(final Cargo cargo) {
-    cargoDb.put(cargo.trackingId().idString(), cargo);
+    cargoDb.put(cargo.trackingId().stringValue(), cargo);
   }
 
   public TrackingId nextTrackingId() {
@@ -53,19 +53,19 @@ public class CargoRepositoryInMem implements CargoRepository {
   public void init() throws Exception {
     final TrackingId xyz = new TrackingId("XYZ");
     final Cargo cargoXYZ = createCargoWithDeliveryHistory(xyz, STOCKHOLM, MELBOURNE);
-    cargoDb.put(xyz.idString(), cargoXYZ);
+    cargoDb.put(xyz.stringValue(), cargoXYZ);
 
     final TrackingId zyx = new TrackingId("ZYX");
     final Cargo cargoZYX = createCargoWithDeliveryHistory(zyx, MELBOURNE, STOCKHOLM);
-    cargoDb.put(zyx.idString(), cargoZYX);
+    cargoDb.put(zyx.stringValue(), cargoZYX);
 
     final TrackingId abc = new TrackingId("ABC");
     final Cargo cargoABC = createCargoWithDeliveryHistory(abc, STOCKHOLM, HELSINKI);
-    cargoDb.put(abc.idString(), cargoABC);
+    cargoDb.put(abc.stringValue(), cargoABC);
 
     final TrackingId cba = new TrackingId("CBA");
     final Cargo cargoCBA = createCargoWithDeliveryHistory(cba, HELSINKI, STOCKHOLM);
-    cargoDb.put(cba.idString(), cargoCBA);
+    cargoDb.put(cba.stringValue(), cargoCBA);
   }
 
   public void setHandlingEventRepository(final HandlingEventRepository handlingEventRepository) {

dddsample/src/test/java/se/citerus/dddsample/infrastructure/routing/ExternalRoutingServiceTest.java

@@ -33,7 +33,7 @@ public class ExternalRoutingServiceTest extends TestCase {
 
     GraphTraversalService graphTraversalService = new GraphTraversalServiceImpl(new GraphDAO() {
       public List<String> listLocations() {
-        return Arrays.asList(TOKYO.unLocode().idString(), STOCKHOLM.unLocode().idString(), GOTHENBURG.unLocode().idString());
+        return Arrays.asList(TOKYO.unLocode().stringValue(), STOCKHOLM.unLocode().stringValue(), GOTHENBURG.unLocode().stringValue());
       }
 
       public void storeCarrierMovementId(String cmId, String from, String to) {