Changed application context configuration from XML to Java-based and removed RMI dependency between booking and routing context.

src/main/java/com/pathfinder/api/GraphTraversalService.java

@@ -1,7 +1,5 @@
 package com.pathfinder.api;
 
-import java.rmi.Remote;
-import java.rmi.RemoteException;
 import java.util.List;
 import java.util.Properties;
 
@@ -10,17 +8,16 @@ import java.util.Properties;
  * and used by us (booking and tracking team).
  *
  */
-public interface GraphTraversalService extends Remote {
+public interface GraphTraversalService {
 
   /**
    * @param originUnLocode origin UN Locode
    * @param destinationUnLocode destination UN Locode
    * @param limitations restrictions on the path selection, as key-value according to some API specification
-   * @return A list of transit paths
-   * @throws RemoteException RMI problem
+   * @return A list of transit pathss
    */
   List<TransitPath> findShortestPath(String originUnLocode,
                                      String destinationUnLocode,
-                                     Properties limitations) throws RemoteException;
+                                     Properties limitations);
 
 }

src/main/java/com/pathfinder/config/PathfinderApplicationContext.java

@@ -0,0 +1,20 @@
+package com.pathfinder.config;
+
+import com.pathfinder.api.GraphTraversalService;
+import com.pathfinder.internal.GraphDAO;
+import com.pathfinder.internal.GraphTraversalServiceImpl;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class PathfinderApplicationContext {
+
+    private GraphDAO graphDAO() {
+        return new GraphDAO();
+    }
+
+    @Bean
+    public GraphTraversalService graphTraversalService() {
+        return new GraphTraversalServiceImpl(graphDAO());
+    }
+}

src/main/java/se/citerus/dddsample/Application.java

@@ -1,57 +1,28 @@
 package se.citerus.dddsample;
 
-import org.hibernate.SessionFactory;
+import com.pathfinder.config.PathfinderApplicationContext;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.ImportResource;
-import org.springframework.transaction.PlatformTransactionManager;
+import org.springframework.context.annotation.Import;
 import se.citerus.dddsample.application.util.SampleDataGenerator;
-import se.citerus.dddsample.domain.model.cargo.CargoRepository;
-import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
-import se.citerus.dddsample.domain.model.location.LocationRepository;
-import se.citerus.dddsample.domain.model.voyage.VoyageRepository;
+import se.citerus.dddsample.config.DDDSampleApplicationContext;
 
 import javax.annotation.PostConstruct;
 
 @Configuration
-@ImportResource({
-        "classpath:/com/pathfinder/internal/applicationContext.xml",
-        "classpath:context-infrastructure.xml",
-        "classpath:context-application.xml",
-        "classpath:context-domain.xml",
-        "classpath:context-interfaces.xml"})
+@Import({DDDSampleApplicationContext.class,
+        PathfinderApplicationContext.class})
 @EnableAutoConfiguration
 public class Application {
 
     @Autowired
-    PlatformTransactionManager platformTransactionManager;
-
-    @Autowired
-    SessionFactory sessionFactory;
-
-    @Autowired
-    CargoRepository cargoRepository;
-
-    @Autowired
-    VoyageRepository voyageRepository;
-
-    @Autowired
-    LocationRepository locationRepository;
-
-    @Autowired
-    HandlingEventRepository handlingEventRepository;
-
-    @Bean
-    public SampleDataGenerator sampleDataGenerator() {
-        return new SampleDataGenerator(platformTransactionManager, sessionFactory, cargoRepository, voyageRepository, locationRepository, handlingEventRepository);
-    }
+    SampleDataGenerator sampleDataGenerator;
 
     @PostConstruct
     public void init() {
-        sampleDataGenerator().generate();
+        sampleDataGenerator.generate();
     }
 
     public static void main(String[] args) throws Exception {

src/main/java/se/citerus/dddsample/config/DDDSampleApplicationContext.java

@@ -0,0 +1,96 @@
+package se.citerus.dddsample.config;
+
+import com.pathfinder.api.GraphTraversalService;
+import org.hibernate.SessionFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.ImportResource;
+import org.springframework.transaction.PlatformTransactionManager;
+import se.citerus.dddsample.application.ApplicationEvents;
+import se.citerus.dddsample.application.BookingService;
+import se.citerus.dddsample.application.CargoInspectionService;
+import se.citerus.dddsample.application.HandlingEventService;
+import se.citerus.dddsample.application.impl.BookingServiceImpl;
+import se.citerus.dddsample.application.impl.CargoInspectionServiceImpl;
+import se.citerus.dddsample.application.impl.HandlingEventServiceImpl;
+import se.citerus.dddsample.application.util.SampleDataGenerator;
+import se.citerus.dddsample.domain.model.cargo.CargoRepository;
+import se.citerus.dddsample.domain.model.handling.HandlingEventFactory;
+import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
+import se.citerus.dddsample.domain.model.location.LocationRepository;
+import se.citerus.dddsample.domain.model.voyage.VoyageRepository;
+import se.citerus.dddsample.domain.service.RoutingService;
+import se.citerus.dddsample.infrastructure.routing.ExternalRoutingService;
+
+@Configuration
+@ImportResource({
+        "classpath:context-interfaces.xml",
+        "classpath:context-infrastructure-messaging.xml",
+        "classpath:context-infrastructure-persistence.xml"})
+public class DDDSampleApplicationContext {
+
+    @Autowired
+    CargoRepository cargoRepository;
+
+    @Autowired
+    LocationRepository locationRepository;
+
+    @Autowired
+    VoyageRepository voyageRepository;
+
+    @Autowired
+    RoutingService routingService;
+
+    @Autowired
+    HandlingEventRepository handlingEventRepository;
+
+    @Autowired
+    HandlingEventFactory handlingEventFactory;
+
+    @Autowired
+    ApplicationEvents applicationEvents;
+
+    @Autowired
+    GraphTraversalService graphTraversalService;
+
+    @Autowired
+    PlatformTransactionManager platformTransactionManager;
+
+    @Autowired
+    SessionFactory sessionFactory;
+
+    @Bean
+    public BookingService bookingService() {
+        return new BookingServiceImpl(cargoRepository, locationRepository, routingService);
+    }
+
+    @Bean
+    public CargoInspectionService cargoInspectionService() {
+        return new CargoInspectionServiceImpl(applicationEvents, cargoRepository, handlingEventRepository);
+    }
+
+    @Bean
+    public HandlingEventService handlingEventService() {
+        return new HandlingEventServiceImpl(handlingEventRepository, applicationEvents, handlingEventFactory);
+    }
+
+    @Bean
+    public HandlingEventFactory handlingEventFactory() {
+        return new HandlingEventFactory(cargoRepository, voyageRepository, locationRepository);
+    }
+
+    @Bean
+    public RoutingService routingService() {
+        ExternalRoutingService routingService = new ExternalRoutingService();
+        routingService.setGraphTraversalService(graphTraversalService);
+        routingService.setLocationRepository(locationRepository);
+        routingService.setVoyageRepository(voyageRepository);
+        return routingService;
+    }
+
+    @Bean
+    public SampleDataGenerator sampleDataGenerator() {
+        return new SampleDataGenerator(platformTransactionManager, sessionFactory, cargoRepository, voyageRepository, locationRepository, handlingEventRepository);
+    }
+}

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

@@ -15,9 +15,7 @@ import se.citerus.dddsample.domain.model.voyage.VoyageNumber;
 import se.citerus.dddsample.domain.model.voyage.VoyageRepository;
 import se.citerus.dddsample.domain.service.RoutingService;
 
-import java.rmi.RemoteException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
 
@@ -45,16 +43,11 @@ public class ExternalRoutingService implements RoutingService {
     limitations.setProperty("DEADLINE", routeSpecification.arrivalDeadline().toString());
 
     final List<TransitPath> transitPaths;
-    try {
       transitPaths = graphTraversalService.findShortestPath(
       origin.unLocode().idString(),
       destination.unLocode().idString(),
       limitations
     );
-    } catch (RemoteException e) {
-      log.error(e, e);
-      return Collections.EMPTY_LIST;
-    }
 
     /*
      The returned result is then translated back into our domain model.

src/main/resources/com/pathfinder/internal/applicationContext.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-  <bean id="internalGraphTraversalService" class="com.pathfinder.internal.GraphTraversalServiceImpl">
-    <constructor-arg ref="graphDAO"/>
-  </bean>
-
-  <bean id="graphDAO" class="com.pathfinder.internal.GraphDAO"/>
-
-  <bean id="registry" class="org.springframework.remoting.rmi.RmiRegistryFactoryBean">
-    <property name="port" value="1199"/>
-  </bean>
-
-  <bean id="rmiGraphTraversalService" class="org.springframework.remoting.rmi.RmiServiceExporter">
-    <property name="serviceInterface" value="com.pathfinder.api.GraphTraversalService"/>
-    <property name="service" ref="internalGraphTraversalService"/>
-    <property name="serviceName" value="PathFinder"/>
-    <property name="registry" ref="registry"/>
-  </bean>
-
-</beans>

src/main/resources/context-application.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-  <bean id="bookingService" class="se.citerus.dddsample.application.impl.BookingServiceImpl">
-    <constructor-arg ref="cargoRepository"/>
-    <constructor-arg ref="locationRepository"/>
-    <constructor-arg ref="routingService"/>
-  </bean>
-
-  <bean id="cargoInspectionService" class="se.citerus.dddsample.application.impl.CargoInspectionServiceImpl">
-    <constructor-arg ref="cargoRepository"/>
-    <constructor-arg ref="applicationEvents"/>
-    <constructor-arg ref="handlingEventRepository"/>
-  </bean>
-
-  <bean id="handlingEventService" class="se.citerus.dddsample.application.impl.HandlingEventServiceImpl">
-    <constructor-arg ref="handlingEventRepository"/>
-    <constructor-arg ref="handlingEventFactory"/>
-    <constructor-arg ref="applicationEvents"/>
-  </bean>
-
-</beans>

src/main/resources/context-domain.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-  <bean id="handlingEventFactory" class="se.citerus.dddsample.domain.model.handling.HandlingEventFactory">
-    <constructor-arg ref="cargoRepository"/>
-    <constructor-arg ref="voyageRepository"/>
-    <constructor-arg ref="locationRepository"/>
-  </bean>
-
-</beans>

src/main/resources/context-infrastructure.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-  <import resource="context-infrastructure-persistence.xml"/>
-  <import resource="context-infrastructure-messaging.xml"/>
-
-  <!-- External graph traversal routing service  -->
-
-  <bean id="routingService" class="se.citerus.dddsample.infrastructure.routing.ExternalRoutingService">
-    <property name="graphTraversalService" ref="internalGraphTraversalService"/>
-    <property name="locationRepository" ref="locationRepository"/>
-    <property name="voyageRepository" ref="voyageRepository"/>
-  </bean>
-
-  <bean id="graphTraversalService" class="org.springframework.remoting.rmi.RmiProxyFactoryBean">
-    <property name="serviceUrl" value="rmi://localhost:1199/PathFinder"/>
-    <property name="serviceInterface" value="com.pathfinder.api.GraphTraversalService"/>
-  </bean>
-
-</beans>

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

@@ -1,7 +1,7 @@
 package se.citerus.dddsample.infrastructure.persistence.hibernate;
 
-import org.hibernate.SessionFactory;
 import org.hibernate.Session;
+import org.hibernate.SessionFactory;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -38,7 +38,7 @@ import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
 import static se.citerus.dddsample.domain.model.voyage.SampleVoyages.CM004;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(value = {"/context-infrastructure-persistence.xml", "/context-domain.xml"})
+@ContextConfiguration(value = {"/context-infrastructure-persistence.xml"})
 @TransactionConfiguration(transactionManager = "transactionManager")
 @Transactional
 public class CargoRepositoryTest {

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

@@ -23,7 +23,7 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(value = {"/context-infrastructure-persistence.xml", "/context-domain.xml"})
+@ContextConfiguration(value = {"/context-infrastructure-persistence.xml"})
 @TransactionConfiguration(transactionManager = "transactionManager")
 @Transactional
 public class CarrierMovementRepositoryTest {

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

@@ -1,7 +1,7 @@
 package se.citerus.dddsample.infrastructure.persistence.hibernate;
 
-import org.hibernate.SessionFactory;
 import org.hibernate.Session;
+import org.hibernate.SessionFactory;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -32,7 +32,7 @@ import java.util.Map;
 import static org.junit.Assert.assertEquals;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(value = {"/context-infrastructure-persistence.xml", "/context-domain.xml"})
+@ContextConfiguration(value = {"/context-infrastructure-persistence.xml"})
 @TransactionConfiguration(transactionManager = "transactionManager")
 @Transactional
 public class HandlingEventRepositoryTest {

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

@@ -22,7 +22,7 @@ import java.util.List;
 import static org.junit.Assert.*;
 
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(value = {"/context-infrastructure-persistence.xml", "/context-domain.xml"})
+@ContextConfiguration(value = {"/context-infrastructure-persistence.xml"})
 @TransactionConfiguration(transactionManager = "transactionManager")
 @Transactional
 public class LocationRepositoryTest {