Package "remote" renamed "remoting" for consistency.

The implementation of our routing service - which consists mainly of model translation and delegation - is moved to the application part, from the domain service layer. The routing service interface is part of our domain but the implementation is not, similar to repositories and their implementations.

dddsample/src/main/java/se/citerus/dddsample/application/remote/BookingServiceFacade.java → dddsample/src/main/java/se/citerus/dddsample/application/remoting/BookingServiceFacade.java

@@ -1,8 +1,8 @@
-package se.citerus.dddsample.application.remote;
+package se.citerus.dddsample.application.remoting;
 
-import se.citerus.dddsample.application.remote.dto.CargoRoutingDTO;
-import se.citerus.dddsample.application.remote.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.application.remote.dto.LocationDTO;
+import se.citerus.dddsample.application.remoting.dto.CargoRoutingDTO;
+import se.citerus.dddsample.application.remoting.dto.ItineraryCandidateDTO;
+import se.citerus.dddsample.application.remoting.dto.LocationDTO;
 
 import java.rmi.Remote;
 import java.rmi.RemoteException;

dddsample/src/main/java/se/citerus/dddsample/application/remote/BookingServiceFacadeImpl.java → dddsample/src/main/java/se/citerus/dddsample/application/remoting/BookingServiceFacadeImpl.java

@@ -1,11 +1,11 @@
-package se.citerus.dddsample.application.remote;
-
-import se.citerus.dddsample.application.remote.dto.CargoRoutingDTO;
-import se.citerus.dddsample.application.remote.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.application.remote.dto.LocationDTO;
-import se.citerus.dddsample.application.remote.dto.assembler.CargoRoutingDTOAssembler;
-import se.citerus.dddsample.application.remote.dto.assembler.ItineraryCandidateDTOAssembler;
-import se.citerus.dddsample.application.remote.dto.assembler.LocationDTOAssembler;
+package se.citerus.dddsample.application.remoting;
+
+import se.citerus.dddsample.application.remoting.dto.CargoRoutingDTO;
+import se.citerus.dddsample.application.remoting.dto.ItineraryCandidateDTO;
+import se.citerus.dddsample.application.remoting.dto.LocationDTO;
+import se.citerus.dddsample.application.remoting.dto.assembler.CargoRoutingDTOAssembler;
+import se.citerus.dddsample.application.remoting.dto.assembler.ItineraryCandidateDTOAssembler;
+import se.citerus.dddsample.application.remoting.dto.assembler.LocationDTOAssembler;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.CargoRepository;
 import se.citerus.dddsample.domain.model.cargo.Itinerary;

dddsample/src/main/java/se/citerus/dddsample/application/remote/dto/CargoRoutingDTO.java → dddsample/src/main/java/se/citerus/dddsample/application/remoting/dto/CargoRoutingDTO.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.remote.dto;
+package se.citerus.dddsample.application.remoting.dto;
 
 import java.io.Serializable;
 import java.util.ArrayList;

dddsample/src/main/java/se/citerus/dddsample/application/remote/dto/CargoTrackingDTO.java → dddsample/src/main/java/se/citerus/dddsample/application/remoting/dto/CargoTrackingDTO.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.remote.dto;
+package se.citerus.dddsample.application.remoting.dto;
 
 import se.citerus.dddsample.domain.model.cargo.StatusCode;
 

dddsample/src/main/java/se/citerus/dddsample/application/remote/dto/HandlingEventDTO.java → dddsample/src/main/java/se/citerus/dddsample/application/remoting/dto/HandlingEventDTO.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.remote.dto;
+package se.citerus.dddsample.application.remoting.dto;
 
 import java.io.Serializable;
 import java.util.Date;

dddsample/src/main/java/se/citerus/dddsample/application/remote/dto/ItineraryCandidateDTO.java → dddsample/src/main/java/se/citerus/dddsample/application/remoting/dto/ItineraryCandidateDTO.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.remote.dto;
+package se.citerus.dddsample.application.remoting.dto;
 
 import java.io.Serializable;
 import java.util.Collections;

dddsample/src/main/java/se/citerus/dddsample/application/remote/dto/LegDTO.java → dddsample/src/main/java/se/citerus/dddsample/application/remoting/dto/LegDTO.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.remote.dto;
+package se.citerus.dddsample.application.remoting.dto;
 
 import java.io.Serializable;
 

dddsample/src/main/java/se/citerus/dddsample/application/remote/dto/LocationDTO.java → dddsample/src/main/java/se/citerus/dddsample/application/remoting/dto/LocationDTO.java

@@ -1,4 +1,4 @@
-package se.citerus.dddsample.application.remote.dto;
+package se.citerus.dddsample.application.remoting.dto;
 
 import java.io.Serializable;
 

dddsample/src/main/java/se/citerus/dddsample/application/remote/dto/assembler/CargoRoutingDTOAssembler.java → dddsample/src/main/java/se/citerus/dddsample/application/remoting/dto/assembler/CargoRoutingDTOAssembler.java

@@ -1,6 +1,6 @@
-package se.citerus.dddsample.application.remote.dto.assembler;
+package se.citerus.dddsample.application.remoting.dto.assembler;
 
-import se.citerus.dddsample.application.remote.dto.CargoRoutingDTO;
+import se.citerus.dddsample.application.remoting.dto.CargoRoutingDTO;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.Leg;
 

dddsample/src/main/java/se/citerus/dddsample/application/remote/dto/assembler/CargoTrackingDTOAssembler.java → dddsample/src/main/java/se/citerus/dddsample/application/remoting/dto/assembler/CargoTrackingDTOAssembler.java

@@ -1,6 +1,6 @@
-package se.citerus.dddsample.application.remote.dto.assembler;
+package se.citerus.dddsample.application.remoting.dto.assembler;
 
-import se.citerus.dddsample.application.remote.dto.CargoTrackingDTO;
+import se.citerus.dddsample.application.remoting.dto.CargoTrackingDTO;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.DeliveryHistory;
 import se.citerus.dddsample.domain.model.carrier.CarrierMovement;

dddsample/src/main/java/se/citerus/dddsample/application/remote/dto/assembler/ItineraryCandidateDTOAssembler.java → dddsample/src/main/java/se/citerus/dddsample/application/remoting/dto/assembler/ItineraryCandidateDTOAssembler.java

@@ -1,7 +1,7 @@
-package se.citerus.dddsample.application.remote.dto.assembler;
+package se.citerus.dddsample.application.remoting.dto.assembler;
 
-import se.citerus.dddsample.application.remote.dto.ItineraryCandidateDTO;
-import se.citerus.dddsample.application.remote.dto.LegDTO;
+import se.citerus.dddsample.application.remoting.dto.ItineraryCandidateDTO;
+import se.citerus.dddsample.application.remoting.dto.LegDTO;
 import se.citerus.dddsample.domain.model.cargo.Itinerary;
 import se.citerus.dddsample.domain.model.cargo.Leg;
 import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
@@ -20,7 +20,7 @@ import java.util.List;
 public class ItineraryCandidateDTOAssembler {
   
   public ItineraryCandidateDTO toDTO(final Itinerary itinerary) {
-    final List<LegDTO> legDTOs = new ArrayList<se.citerus.dddsample.application.remote.dto.LegDTO>(itinerary.legs().size());
+    final List<LegDTO> legDTOs = new ArrayList<se.citerus.dddsample.application.remoting.dto.LegDTO>(itinerary.legs().size());
     for (Leg leg : itinerary.legs()) {
       legDTOs.add(toLegDTO(leg));
     }

dddsample/src/main/java/se/citerus/dddsample/application/remote/dto/assembler/LocationDTOAssembler.java → dddsample/src/main/java/se/citerus/dddsample/application/remoting/dto/assembler/LocationDTOAssembler.java

@@ -1,6 +1,6 @@
-package se.citerus.dddsample.application.remote.dto.assembler;
+package se.citerus.dddsample.application.remoting.dto.assembler;
 
-import se.citerus.dddsample.application.remote.dto.LocationDTO;
+import se.citerus.dddsample.application.remoting.dto.LocationDTO;
 import se.citerus.dddsample.domain.model.location.Location;
 
 import java.util.ArrayList;

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

@@ -0,0 +1,77 @@
+package se.citerus.dddsample.application.routing;
+
+import org.springframework.transaction.annotation.Transactional;
+import se.citerus.dddsample.domain.model.cargo.Itinerary;
+import se.citerus.dddsample.domain.model.cargo.Leg;
+import se.citerus.dddsample.domain.model.cargo.RouteSpecification;
+import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
+import se.citerus.dddsample.domain.model.carrier.CarrierMovementRepository;
+import se.citerus.dddsample.domain.model.location.Location;
+import se.citerus.dddsample.domain.model.location.LocationRepository;
+import se.citerus.dddsample.domain.model.location.UnLocode;
+import se.citerus.dddsample.domain.service.RoutingService;
+import se.citerus.routingteam.GraphTraversalService;
+import se.citerus.routingteam.TransitEdge;
+import se.citerus.routingteam.TransitPath;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Our end of the routing service.
+ *
+ */
+public class ExternalRoutingService implements RoutingService {
+
+  private GraphTraversalService graphTraversalService;
+  private LocationRepository locationRepository;
+  private CarrierMovementRepository carrierMovementRepository;
+
+  @Transactional(readOnly = true)
+  public List<Itinerary> fetchRoutesForSpecification(RouteSpecification routeSpecification) {
+    final Location origin = routeSpecification.origin();
+    final Location destination = routeSpecification.destination();
+
+    final List<TransitPath> transitPaths = graphTraversalService.performHeavyCalculations(
+      origin.unLocode().idString(),
+      destination.unLocode().idString()
+    );
+    
+    final List<Itinerary> itineraries = new ArrayList<Itinerary>(transitPaths.size());
+
+    for (TransitPath transitPath : transitPaths) {
+      final Itinerary itinerary = toItinerary(transitPath);
+      itineraries.add(itinerary);
+    }
+
+    return itineraries;
+  }
+
+  private Itinerary toItinerary(TransitPath transitPath) {
+    List<Leg> legs = new ArrayList(transitPath.getTransitEdges().size());
+    for (TransitEdge edge : transitPath.getTransitEdges()) {
+      legs.add(toLeg(edge));
+    }
+    return new Itinerary(legs);
+  }
+
+  private Leg toLeg(TransitEdge edge) {
+    return new Leg(
+      carrierMovementRepository.find(new CarrierMovementId(edge.getCarrierMovementId())),
+      locationRepository.find(new UnLocode(edge.getFromUnLocode())),
+      locationRepository.find(new UnLocode(edge.getToUnLocode()))
+    );
+  }
+
+  public void setGraphTraversalService(GraphTraversalService graphTraversalService) {
+    this.graphTraversalService = graphTraversalService;
+  }
+
+  public void setLocationRepository(LocationRepository locationRepository) {
+    this.locationRepository = locationRepository;
+  }
+
+  public void setCarrierMovementRepository(CarrierMovementRepository carrierMovementRepository) {
+    this.carrierMovementRepository = carrierMovementRepository;
+  }
+}

dddsample/src/main/resources/context-remote.xml

@@ -46,7 +46,7 @@
       </list>
     </property>
     <property name="target">
-      <bean class="se.citerus.dddsample.application.remote.BookingServiceFacadeImpl">
+      <bean class="se.citerus.dddsample.application.remoting.BookingServiceFacadeImpl">
         <property name="bookingService" ref="bookingService"/>
         <property name="cargoRepository" ref="cargoRepository"/>
         <property name="locationRepository" ref="locationRepository"/>
@@ -73,7 +73,7 @@
 
   <!-- RMI exposure -->
   <bean id="rmiBookingServiceFacade" class="org.springframework.remoting.rmi.RmiServiceExporter">
-    <property name="serviceInterface" value="se.citerus.dddsample.application.remote.BookingServiceFacade"/>
+    <property name="serviceInterface" value="se.citerus.dddsample.application.remoting.BookingServiceFacade"/>
     <property name="service" ref="bookingServiceFacade"/>
     <property name="serviceName" value="BookingService"/>
   </bean>

dddsample/src/main/resources/context-service.xml

@@ -27,7 +27,7 @@
     <property name="eventService" ref="eventService"/>
   </bean>
 
-  <bean id="routingService" class="se.citerus.dddsample.domain.service.RoutingServiceImpl">
+  <bean id="routingService" class="se.citerus.dddsample.application.routing.ExternalRoutingService">
     <property name="locationRepository" ref="locationRepository"/>
     <property name="carrierMovementRepository" ref="carrierMovementRepository"/>
     <property name="graphTraversalService" ref="graphTraversalService"/>

dddsample/src/test/java/se/citerus/dddsample/domain/service/RoutingServiceTest.java

@@ -3,6 +3,7 @@ package se.citerus.dddsample.domain.service;
 import junit.framework.TestCase;
 import static org.easymock.EasyMock.*;
 import se.citerus.dddsample.application.persistence.LocationRepositoryInMem;
+import se.citerus.dddsample.application.routing.ExternalRoutingService;
 import se.citerus.dddsample.domain.model.cargo.*;
 import se.citerus.dddsample.domain.model.carrier.CarrierMovement;
 import se.citerus.dddsample.domain.model.carrier.CarrierMovementId;
@@ -20,11 +21,11 @@ import java.util.List;
 
 public class RoutingServiceTest extends TestCase {
 
-  private RoutingServiceImpl routingService;
+  private ExternalRoutingService routingService;
   private CarrierMovementRepository carrierMovementRepository;
 
   protected void setUp() throws Exception {
-    routingService = new RoutingServiceImpl();
+    routingService = new ExternalRoutingService();
     LocationRepository locationRepository = new LocationRepositoryInMem();
     routingService.setLocationRepository(locationRepository);