Put pessimistic locking on hold for now.

dddsample/src/main/java/se/citerus/dddsample/application/CargoLockingServiceInMem.java

@@ -1,51 +0,0 @@
-/**
- * Purpose
- * @author peter
- * @created 2009-sep-07
- * $Id$
- */
-package se.citerus.dddsample.application;
-
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
-
-public class CargoLockingServiceInMem implements CargoLockingService {
-
-  private final Map<TrackingId, Lock> locks = new HashMap<TrackingId, Lock>();
-
-  @Override
-  public void assertLocked(final TrackingId trackingId) {
-    final Lock lock = getLockFor(trackingId);
-    if (!lock.tryLock()) {
-      throw new RuntimeException("Lock not held");
-    }
-  }
-
-  @Override
-  public void unlock(final TrackingId trackingId) {
-    final Lock lock = getLockFor(trackingId);
-    lock.unlock();
-  }
-
-  @Override
-  public void lock(final TrackingId trackingId) {
-    final Lock lock = getLockFor(trackingId);
-    if (!lock.tryLock()) {
-      throw new RuntimeException("Could not lock");
-    }
-  }
-
-  private Lock getLockFor(final TrackingId trackingId) {
-    Lock lock = locks.get(trackingId);
-    if (lock == null) {
-      lock = new ReentrantLock();
-      locks.put(trackingId, lock);
-    }
-    return lock;
-  }
-
-}

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

@@ -4,8 +4,6 @@ import org.apache.commons.lang.Validate;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.transaction.annotation.Transactional;
-import se.citerus.dddsample.application.CargoLockingService;
-import se.citerus.dddsample.application.CargoLockingServiceInMem;
 import se.citerus.dddsample.domain.model.cargo.*;
 import se.citerus.dddsample.domain.model.location.Location;
 import se.citerus.dddsample.domain.model.location.LocationRepository;
@@ -22,7 +20,6 @@ public final class BookingServiceImpl implements BookingService {
   private final CargoFactory cargoFactory;
   private final CargoRepository cargoRepository;
   private final LocationRepository locationRepository;
-  private final CargoLockingService cargoLockingService;
   private final Log logger = LogFactory.getLog(getClass());
 
   public BookingServiceImpl(final RoutingService routingService,
@@ -33,7 +30,6 @@ public final class BookingServiceImpl implements BookingService {
     this.cargoFactory = cargoFactory;
     this.cargoRepository = cargoRepository;
     this.locationRepository = locationRepository;
-    this.cargoLockingService = new CargoLockingServiceInMem();
   }
 
   @Override
@@ -63,23 +59,17 @@ public final class BookingServiceImpl implements BookingService {
   @Override
   @Transactional
   public void assignCargoToRoute(final Itinerary itinerary, final TrackingId trackingId) {
-    cargoLockingService.assertLocked(trackingId);
-
     final Cargo cargo = cargoRepository.find(trackingId);
     Validate.notNull(cargo, "Can't assign itinerary to non-existing cargo " + trackingId);
     cargo.assignToRoute(itinerary);
     cargoRepository.store(cargo);
 
     logger.info("Assigned cargo " + trackingId + " to new route");
-
-    cargoLockingService.unlock(trackingId);
   }
 
   @Override
   @Transactional
   public void changeDestination(final TrackingId trackingId, final UnLocode unLocode) {
-    cargoLockingService.assertLocked(trackingId);
-
     final Cargo cargo = cargoRepository.find(trackingId);
     Validate.notNull(cargo, "Can't change destination of non-existing cargo " + trackingId);
     final Location newDestination = locationRepository.find(unLocode);
@@ -89,18 +79,12 @@ public final class BookingServiceImpl implements BookingService {
 
     cargoRepository.store(cargo);
     logger.info("Changed destination for cargo " + trackingId + " to " + routeSpecification.destination());
-
-    cargoLockingService.unlock(trackingId);
   }
 
   @Override
   @Transactional(readOnly = true)
   public Cargo loadCargoForRouting(final TrackingId trackingId) {
-    final Cargo cargo = cargoRepository.find(trackingId);
-    if (cargo != null) {
-      cargoLockingService.lock(trackingId);
-    }
-    return cargo;
+    return cargoRepository.find(trackingId);
   }
 
 }