Modified domain objects. Removed 'get' and 'set' prefix from getters&setters

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

@@ -36,7 +36,7 @@ public class Cargo {
     this.history = new DeliveryHistory();
   }
 
-  public DeliveryHistory getDeliveryHistory() {
+  public DeliveryHistory deliveryHistory() {
     return history;
   }
 
@@ -45,10 +45,10 @@ public class Cargo {
   }
 
   public boolean atFinalDestiation() {
-    return getCurrentLocation().equals(finalDestination);
+    return currentLocation().equals(finalDestination);
   }
 
-  public Location getCurrentLocation() {
+  public Location currentLocation() {
     HandlingEvent lastEvent = history.lastEvent();
     
     // If we have no last event, we have not even received the package. Return unknown location
@@ -56,13 +56,13 @@ public class Cargo {
       return Location.UNKNOWN;
     }
    
-    Location location = lastEvent.getLocation();
+    Location location = lastEvent.location();
     
     // If the last handling event has no idea of where the cargo is due to lack of CarrierMovement (like for CLAIM or RECEIVE events)
     // location must be calculated based on event type and origin or final destination
     // TODO: Maybe we need to refactor HandlingEvent.
     if (location == Location.UNKNOWN){
-      location = (lastEvent.getType() == HandlingEvent.Type.CLAIM) ? finalDestination : origin;
+      location = (lastEvent.type() == HandlingEvent.Type.CLAIM) ? finalDestination : origin;
     }
       
     return location;

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

@@ -18,7 +18,7 @@ public class CarrierId implements Serializable {
     this.id = id;
   }
 
-  public String getId() {
+  public String id() {
     return id;
   }
 

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

@@ -54,7 +54,7 @@ public class DeliveryHistory {
 
   private static class HandlingEventByTimeComparator implements Comparator<HandlingEvent> {
     public int compare(HandlingEvent o1, HandlingEvent o2) {
-      return o1.getTimeOccurred().compareTo(o2.getTimeOccurred());
+      return o1.timeOccurred().compareTo(o2.timeOccurred());
     }
   }
 }

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

@@ -63,26 +63,26 @@ public class HandlingEvent {
    */
   public boolean sameAs(HandlingEvent other) {
     return new EqualsBuilder().
-            append(this.getTimeOccurred(), other.getTimeOccurred()).
-            append(this.getLocation(), other.getLocation()).
-            append(this.getType(), other.getType()).
-            append(this.getCarrierMovement(), other.getCarrierMovement())
+            append(this.timeOccurred(), other.timeOccurred()).
+            append(this.location(), other.location()).
+            append(this.type(), other.type()).
+            append(this.carrierMovement(), other.carrierMovement())
             .isEquals();
   }
 
-  public Type getType() {
+  public Type type() {
     return type;
   }
 
-  public CarrierMovement getCarrierMovement() {
+  public CarrierMovement carrierMovement() {
     return carrierMovement;
   }
 
-  public Date getTimeOccurred() {
+  public Date timeOccurred() {
     return timeOccurred;
   }
 
-  public Date getTimeRegistered() {
+  public Date timeRegistered() {
     return timeRegistered;
   }
 
@@ -98,7 +98,7 @@ public class HandlingEvent {
    * 
    * @return The Location
    */
-  public Location getLocation() {
+  public Location location() {
     Location location = Location.UNKNOWN;
     
     //My gosh! A switch statement....
@@ -129,7 +129,7 @@ public class HandlingEvent {
     this.cargos.addAll(cargosToRegister);
   }
   
-  public Set<Cargo> getRegisterdCargos(){
+  public Set<Cargo> registerdCargos(){
     return cargos;
   }
 

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

@@ -22,7 +22,7 @@ public class TrackingId implements Serializable {
     this.id = id;
   }
 
-  public String getId() {
+  public String id() {
     return id;
   }
 

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

@@ -29,11 +29,11 @@ public class CargoRepositoryInMem implements CargoRepository {
   }
 
   public Cargo find(TrackingId trackingId) {
-    if (trackingId.getId().equalsIgnoreCase("DAE")){
+    if (trackingId.id().equalsIgnoreCase("DAE")){
       throw new DataRetrievalFailureException("Network failure. Please try again");
     }
     
-    return cargoDb.get(trackingId.getId());
+    return cargoDb.get(trackingId.id());
   }
   
   public void save(Cargo cargo) {

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

@@ -111,7 +111,7 @@ public class HandlingEventRepositoryInMem implements HandlingEventRepository{
 
   public void save(HandlingEvent event) {
     // Mimmick saving to database
-    for (Cargo cargo : event.getRegisterdCargos()) {
+    for (Cargo cargo : event.registerdCargos()) {
       cargo.handle(event);
     }
   }
@@ -120,7 +120,7 @@ public class HandlingEventRepositoryInMem implements HandlingEventRepository{
   public Set<HandlingEvent> findByTrackingId(final TrackingId trackingId) {
     Set<HandlingEvent> events = new HashSet<HandlingEvent>();
     for (HandlingEvent event : eventDB.values()) {
-      for (Cargo cargo : event.getRegisterdCargos()) {
+      for (Cargo cargo : event.registerdCargos()) {
         if (cargo.trackingId().equals(trackingId)) {
           events.add(event);
           break;

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

@@ -19,21 +19,21 @@ public class CargoServiceImpl implements CargoService {
       return null;
     }
     final CargoWithHistoryDTO dto = new CargoWithHistoryDTO(
-            cargo.trackingId().getId(),
+            cargo.trackingId().id(),
             cargo.origin().unlocode(),
             cargo.finalDestination().unlocode(),
-            cargo.getCurrentLocation().unlocode()
+            cargo.currentLocation().unlocode()
     );
-    final List<HandlingEvent> events = cargo.getDeliveryHistory().eventsOrderedByTime();
+    final List<HandlingEvent> events = cargo.deliveryHistory().eventsOrderedByTime();
     for (HandlingEvent event : events) {
-      CarrierMovement cm = event.getCarrierMovement();
+      CarrierMovement cm = event.carrierMovement();
       String carrierIdString =
-              (cm == null) ? Location.UNKNOWN.unlocode() : cm.carrierId().getId();
+              (cm == null) ? Location.UNKNOWN.unlocode() : cm.carrierId().id();
       dto.addEvent(new HandlingEventDTO(
-              event.getLocation().unlocode(),
-              event.getType().toString(),
+              event.location().unlocode(),
+              event.type().toString(),
               carrierIdString,
-              event.getTimeOccurred()
+              event.timeOccurred()
       ));
     }
     return dto;

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

@@ -14,31 +14,31 @@ public class CargoTest extends TestCase {
     Location origin = new Location("SESTO");
     Cargo cargo = new Cargo(new TrackingId("XYZ"), origin, destination);
 
-    assertEquals(Location.UNKNOWN, cargo.getCurrentLocation());
+    assertEquals(Location.UNKNOWN, cargo.currentLocation());
   }
   
   public void testCurrentLocationReceived() throws Exception {
     Cargo cargo = populateCargoReceivedStockholm();
 
-    assertEquals(new Location("SESTO"), cargo.getCurrentLocation());
+    assertEquals(new Location("SESTO"), cargo.currentLocation());
   }
 
   public void testCurrentLocationClaimed() throws Exception {
     Cargo cargo = populateCargoClaimedMelbourne();
 
-    assertEquals(new Location("AUMEL"), cargo.getCurrentLocation());
+    assertEquals(new Location("AUMEL"), cargo.currentLocation());
   }
   
   public void testCurrentLocationUnloaded() throws Exception {
     Cargo cargo = populateCargoOffHongKong();
 
-    assertEquals(new Location("CNHGK"), cargo.getCurrentLocation());
+    assertEquals(new Location("CNHGK"), cargo.currentLocation());
   }
 
   public void testCurrentLocationloaded() throws Exception {
     Cargo cargo = populateCargoOnHamburg();
 
-    assertEquals(new Location("DEHAM"), cargo.getCurrentLocation());
+    assertEquals(new Location("DEHAM"), cargo.currentLocation());
   }
 
   public void testAtFinalLocation() throws Exception {

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

@@ -14,7 +14,7 @@ public class HandlingEventTest extends TestCase {
     
     HandlingEvent ev = new HandlingEvent(new Date(), new Date(), HandlingEvent.Type.LOAD, cm);
     
-    assertEquals(locationAAA, ev.getLocation());
+    assertEquals(locationAAA, ev.location());
   }
   
   public void testCurrentLocationUnloadEvent() throws Exception {
@@ -25,18 +25,18 @@ public class HandlingEventTest extends TestCase {
     
     HandlingEvent ev = new HandlingEvent(new Date(), new Date(), HandlingEvent.Type.UNLOAD, cm);
     
-    assertEquals(locationBBB, ev.getLocation());
+    assertEquals(locationBBB, ev.location());
   }
   
   public void testCurrentLocationReceivedEvent() throws Exception {
     HandlingEvent ev = new HandlingEvent(new Date(), new Date(), HandlingEvent.Type.RECEIVE, null);
 
-    assertEquals(Location.UNKNOWN, ev.getLocation());
+    assertEquals(Location.UNKNOWN, ev.location());
   }
   public void testCurrentLocationClaimedEvent() throws Exception {
     HandlingEvent ev = new HandlingEvent(new Date(), new Date(), HandlingEvent.Type.CLAIM, null);
 
-    assertEquals(Location.UNKNOWN, ev.getLocation());
+    assertEquals(Location.UNKNOWN, ev.location());
   }
   
   public void testParseType() throws Exception {

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

@@ -14,16 +14,16 @@ public class TrackingScenarioTest extends TestCase {
 
     Cargo cargo = populateCargo();
 
-    DeliveryHistory deliveryHistory = cargo.getDeliveryHistory();
+    DeliveryHistory deliveryHistory = cargo.deliveryHistory();
 
     List<HandlingEvent> handlingEvents = deliveryHistory.eventsOrderedByTime();
 
     assertEquals(4, handlingEvents.size());
     final HandlingEvent event = deliveryHistory.lastEvent();
 
-    assertSame(HandlingEvent.Type.UNLOAD, event.getType());
+    assertSame(HandlingEvent.Type.UNLOAD, event.type());
     assertFalse(cargo.atFinalDestiation());
-    assertEquals("CNHKG", cargo.getCurrentLocation().unlocode());
+    assertEquals("CNHKG", cargo.currentLocation().unlocode());
 
   }
 

dddsample/src/test/java/se/citerus/dddsample/repository/CargoRepositoryTest.java

@@ -39,7 +39,7 @@ public class CargoRepositoryTest extends AbstractTransactionalDataSourceSpringCo
     assertEquals(trackingId, cargo.trackingId());
     assertEquals(origin, cargo.origin());
     assertEquals(finalDestination, cargo.finalDestination());
-    assertEquals(Location.UNKNOWN, cargo.getCurrentLocation());
+    assertEquals(Location.UNKNOWN, cargo.currentLocation());
   }
 
 }

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

@@ -68,7 +68,7 @@ public class CargoServiceTest extends AbstractDependencyInjectionSpringContextTe
       public Cargo answerWithinTransaction() throws Throwable {
         Cargo cargo = new Cargo(new TrackingId("XYZ"), new Location("ORIG"), new Location("DEST"));
         CarrierMovement cm = new CarrierMovement(new CarrierId("CAR_001"), new Location("FROM"), new Location("TO"));
-        cargo.getDeliveryHistory().addEvent(
+        cargo.deliveryHistory().addEvent(
                 new HandlingEvent(new Date(10L), new Date(20L), HandlingEvent.Type.CLAIM, cm)
         );
         return cargo;

dddsample/src/test/java/se/citerus/dddsample/web/CargoTrackingControllerTest.java

@@ -45,20 +45,20 @@ public class CargoTrackingControllerTest extends TestCase {
       public CargoWithHistoryDTO find(String trackingId) {
         Cargo cargo = new Cargo(new TrackingId(trackingId), new Location("AAA"), new Location("BBB"));
         HandlingEvent event = new HandlingEvent(new Date(10L), new Date(20L), HandlingEvent.Type.RECEIVE);
-        cargo.getDeliveryHistory().addEvent(event);
+        cargo.deliveryHistory().addEvent(event);
 
         // TODO: use DTO assemblers
         CargoWithHistoryDTO cargoDTO = new CargoWithHistoryDTO(
-                cargo.trackingId().getId(),
+                cargo.trackingId().id(),
                 cargo.origin().unlocode(),
                 cargo.finalDestination().unlocode(),
-                cargo.getCurrentLocation().unlocode()
+                cargo.currentLocation().unlocode()
         );
         cargoDTO.addEvent(new HandlingEventDTO(
-          event.getLocation().unlocode(),
-          event.getType().toString(),
+          event.location().unlocode(),
+          event.type().toString(),
           null, // TODO: event hierarchy will remove this kind of code
-          event.getTimeOccurred()));
+          event.timeOccurred()));
         return cargoDTO;
       }
     };