Unused files

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

@@ -1,30 +0,0 @@
-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 java.rmi.Remote;
-import java.rmi.RemoteException;
-import java.util.List;
-
-/**
- * This facade shields the domain layer - model, services, repositories -
- * from concerns about such things as the user interface and remoting.
- * It is an application service.
- */
-public interface BookingServiceFacade extends Remote {
-
-  String registerNewCargo(String origin, String destination) throws RemoteException;
-
-  CargoRoutingDTO loadCargoForRouting(String trackingId) throws RemoteException;
-
-  void assignCargoToRoute(String trackingId, ItineraryCandidateDTO itinerary) throws RemoteException;
-
-  List<ItineraryCandidateDTO> requestPossibleRoutesForCargo(String trackingId) throws RemoteException;
-
-  List<LocationDTO> listShippingLocations() throws RemoteException;
-
-  List<CargoRoutingDTO> listAllCargos() throws RemoteException;
-
-}

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

@@ -1,59 +0,0 @@
-package se.citerus.dddsample.application.remoting.dto;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * DTO for registering and routing a cargo.
- */
-public final class CargoRoutingDTO implements Serializable {
-
-  private final String trackingId;
-  private final String origin;
-  private final String finalDestination;
-  private final List<LegDTO> legs;
-
-  /**
-   * Constructor.
-   *
-   * @param trackingId
-   * @param origin
-   * @param finalDestination
-   */
-  public CargoRoutingDTO(final String trackingId, final String origin, final String finalDestination) {
-    this.trackingId = trackingId;
-    this.origin = origin;
-    this.finalDestination = finalDestination;
-    this.legs = new ArrayList<LegDTO>();
-  }
-
-  public String getTrackingId() {
-    return trackingId;
-  }
-
-  public String getOrigin() {
-    return origin;
-  }
-
-  public String getFinalDestination() {
-    return finalDestination;
-  }
-
-  public void addLeg(final String carrierMovementId, final String from, final String to) {
-    legs.add(new LegDTO(carrierMovementId, from, to));
-  }
-
-  /**
-   * @return An unmodifiable list DTOs.
-   */
-  public List<LegDTO> getLegs() {
-    return Collections.unmodifiableList(legs);
-  }
-
-  public boolean isRouted() {
-    return !legs.isEmpty();
-  }
-
-}

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

@@ -1,29 +0,0 @@
-package se.citerus.dddsample.application.remoting.dto;
-
-import java.io.Serializable;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * DTO for presenting and selecting an itinerary from a collection of candidates.
- */
-public final class ItineraryCandidateDTO implements Serializable {
-
-  private final List<LegDTO> legs;
-
-  /**
-   * Constructor.
-   *
-   * @param legs The legs for this itinerary.
-   */
-  public ItineraryCandidateDTO(final List<LegDTO> legs) {
-    this.legs = legs;
-  }
-
-  /**
-   * @return An unmodifiable list DTOs.
-   */
-  public List<LegDTO> getLegs() {
-    return Collections.unmodifiableList(legs);
-  }
-}

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

@@ -1,39 +0,0 @@
-package se.citerus.dddsample.application.remoting.dto;
-
-import java.io.Serializable;
-
-/**
- * DTO for a leg in an itinerary.
- */
-public final class LegDTO implements Serializable {
-
-  private final String voyageNumber;
-  private final String from;
-  private final String to;
-
-  /**
-   * Constructor.
-   *
-   * @param voyageNumber
-   * @param from
-   * @param to
-   */
-  public LegDTO(final String voyageNumber, final String from, final String to) {
-    this.voyageNumber = voyageNumber;
-    this.from = from;
-    this.to = to;
-  }
-
-  public String getVoyageNumber() {
-    return voyageNumber;
-  }
-
-  public String getFrom() {
-    return from;
-  }
-
-  public String getTo() {
-    return to;
-  }
-
-}

dddsample/src/test/java/se/citerus/dddsample/CargoHandlingScenarioTest.java

@@ -1,191 +0,0 @@
-package se.citerus.dddsample;
-
-import junit.framework.TestCase;
-import se.citerus.dddsample.application.HandlingEventService;
-import se.citerus.dddsample.application.TrackingService;
-import se.citerus.dddsample.application.impl.HandlingEventServiceImpl;
-import se.citerus.dddsample.application.impl.TrackingServiceImpl;
-import se.citerus.dddsample.domain.model.cargo.*;
-import static se.citerus.dddsample.domain.model.carrier.SampleVoyages.*;
-import se.citerus.dddsample.domain.model.carrier.Voyage;
-import se.citerus.dddsample.domain.model.carrier.VoyageRepository;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import se.citerus.dddsample.domain.model.handling.HandlingEventFactory;
-import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
-import se.citerus.dddsample.domain.model.location.Location;
-import se.citerus.dddsample.domain.model.location.LocationRepository;
-import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
-import se.citerus.dddsample.domain.service.DomainEventNotifier;
-import se.citerus.dddsample.domain.service.RoutingService;
-import se.citerus.dddsample.infrastructure.persistence.inmemory.LocationRepositoryInMem;
-import se.citerus.dddsample.infrastructure.persistence.inmemory.VoyageRepositoryInMem;
-
-import java.util.*;
-
-/**
- * Cargo scenarios.
- */
-public class CargoHandlingScenarioTest extends TestCase {
-
-  HandlingEventFactory handlingEventFactory;
-
-  DomainEventNotifier domainEventNotifier;
-
-  HandlingEventService handlingEventService;
-  TrackingService trackingService;
-  RoutingService routingService;
-
-  HandlingEventRepository handlingEventRepository;
-  CargoRepository cargoRepository;
-  LocationRepository locationRepository;
-  VoyageRepository voyageRepository;
-
-  Cargo cargo;
-
-
-  public void testCargoFromHongkongToStockholm() throws Exception {
-
-    // Cargo from Hongkong to Stockholm (skipping the booking procedure here)
-    TrackingId trackingId = generateTrackingId();
-    Location origin = HONGKONG;
-    Location destination = STOCKHOLM;
-    cargo = new Cargo(trackingId, origin, destination);
-
-
-    assertEquals(RoutingStatus.NOT_ROUTED, cargo.routingStatus());
-
-    // Route cargo
-    RouteSpecification routeSpecification = new RouteSpecification(cargo.origin(), cargo.destination(), inTwoWeeks());
-    List<Itinerary> itineraries = routingService.fetchRoutesForSpecification(routeSpecification);
-    Itinerary itinerary = selectPreferedItinerary(itineraries);
-    cargo.assignToRoute(itinerary);
-
-    // Handling begins: cargo is received in Hongkong
-    HandlingEvent received = handlingEventFactory.createHandlingEvent(
-      dateReceived(), trackingId, null, HONGKONG.unLocode(), HandlingEvent.Type.RECEIVE);
-
-    handlingEventService.register(received);
-
-
-    // Loaded onto carrier movement CM003 in Hongkong
-    HandlingEvent loadedInHongkong = handlingEventFactory.createHandlingEvent(
-      dateLoadingCompleted(), trackingId, CM003.voyageNumber(), HONGKONG.unLocode(), HandlingEvent.Type.LOAD);
-
-    handlingEventService.register(loadedInHongkong);
-
-    // Check current state - should be ok
-    assertEquals(CM003, cargo.delivery().currentVoyage());
-    assertEquals(HONGKONG, cargo.delivery().lastKnownLocation());
-    assertEquals(TransportStatus.ONBOARD_CARRIER, cargo.delivery().transportStatus());
-    assertFalse(cargo.isMisdirected());
-
-
-    // Cargo is now (incorrectly) unloaded in Tokyo
-    HandlingEvent unloadedInTokyo = handlingEventFactory.createHandlingEvent(
-      dateUnloadingCompleted(), trackingId, CM003.voyageNumber(), TOKYO.unLocode(), HandlingEvent.Type.UNLOAD);
-    handlingEventService.register(unloadedInTokyo);
-
-    // Check current state - cargo is misdirected!
-    assertEquals(Voyage.NONE, cargo.delivery().currentVoyage());
-    assertEquals(TOKYO, cargo.delivery().lastKnownLocation());
-    assertEquals(TransportStatus.IN_PORT, cargo.delivery().transportStatus());
-    assertTrue(cargo.isMisdirected());
-
-    // Then: Reroute!
-  }
-
-  
-
-  /*
-   * Utility stubs below.
-   */
-
-  private Date dateReceived() {
-    return new Date(100);
-  }
-
-  private Date dateLoadingCompleted() {
-    return new Date(200);
-  }
-
-  private Date dateUnloadingCompleted() {
-    return new Date(300);
-  }
-
-  private TrackingId generateTrackingId() {
-    return new TrackingId("TI1");
-  }
-
-  private Date inTwoWeeks() {
-    return new Date(new Date().getTime() + 1000*60*60*24*14);
-  }
-
-  private Itinerary selectPreferedItinerary(List<Itinerary> itineraries) {
-    return itineraries.get(0);
-  }
-
-  protected void setUp() throws Exception {
-
-    // Stub
-    routingService = new RoutingService() {
-      public List<Itinerary> fetchRoutesForSpecification(RouteSpecification routeSpecification) {
-        return Arrays.asList(
-          new Itinerary(Arrays.asList(
-                new Leg(CM003, HONGKONG, NEWYORK, new Date(), new Date()),
-                new Leg(CM004, NEWYORK, CHICAGO, new Date(), new Date()),
-                new Leg(CM005, CHICAGO, STOCKHOLM, new Date(), new Date())
-          ))
-        );
-      }
-    };
-
-    // Synchronous stub
-    domainEventNotifier = new DomainEventNotifier() {
-      public void cargoWasHandled(HandlingEvent event) {
-        trackingService.onCargoHandled(event.cargo().trackingId());
-      }
-      public void cargoWasMisdirected(Cargo cargo) {}
-      public void cargoHasArrived(Cargo cargo) {}
-    };
-
-    // Stub
-    cargoRepository = new CargoRepository() {
-      public Cargo find(TrackingId trackingId) {
-        return cargo;
-      }
-
-      public List<Cargo> findAll() {
-        return null;
-      }
-
-      public void save(Cargo cargo) {
-      }
-
-      public TrackingId nextTrackingId() {
-        return null;
-      }
-    };
-
-    // Stub
-    handlingEventRepository = new HandlingEventRepository() {
-      public void save(HandlingEvent event) {
-        Set<HandlingEvent> events = new HashSet<HandlingEvent>(cargo.delivery().history());
-        events.add(event);
-        CargoTestHelper.setDeliveryHistory(cargo, events);
-      }
-
-      public List<HandlingEvent> findEventsForCargo(TrackingId trackingId) {
-        return null;
-      }
-    };
-
-    // In-memory implementations
-    locationRepository = new LocationRepositoryInMem();
-    voyageRepository = new VoyageRepositoryInMem();
-
-    // Domain services and factories that are implemented in the domain layer - not stubbed
-    trackingService = new TrackingServiceImpl(domainEventNotifier, cargoRepository);
-    handlingEventFactory = new HandlingEventFactory(cargoRepository, this.voyageRepository, this.locationRepository);
-    handlingEventService = new HandlingEventServiceImpl(handlingEventRepository, domainEventNotifier);
-  }
-}

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

@@ -1,68 +0,0 @@
-package se.citerus.dddsample.application;
-
-import junit.framework.TestCase;
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.cargo.CargoTestHelper;
-import se.citerus.dddsample.domain.model.cargo.Delivery;
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-import static se.citerus.dddsample.domain.model.carrier.SampleVoyages.CM001;
-import static se.citerus.dddsample.domain.model.carrier.SampleVoyages.CM002;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import static se.citerus.dddsample.domain.model.handling.HandlingEvent.Type.LOAD;
-import static se.citerus.dddsample.domain.model.handling.HandlingEvent.Type.UNLOAD;
-import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
-
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
-public class TrackingScenarioTest extends TestCase {
-
-  public void testTrackingScenarioStage1() throws Exception {
-
-    Cargo cargo = populateCargo();
-
-    Delivery delivery = cargo.delivery();
-
-    List<HandlingEvent> handlingEvents = delivery.history();
-
-    assertEquals(4, handlingEvents.size());
-    final HandlingEvent event = delivery.lastEvent();
-
-    assertEquals(UNLOAD, event.type());
-
-//    assertFalse(cargo.atFinalDestiation());
-//    assertEquals("CNHKG", cargo.currentLocation().unlocode());
-
-  }
-
-  private Cargo populateCargo() throws Exception {
-    final Cargo cargo = new Cargo(new TrackingId("XYZ"), STOCKHOLM, MELBOURNE);
-
-    final List<HandlingEvent> handlingEventList = Arrays.asList(
-      new HandlingEvent(cargo, getDate("2007-12-01"), new Date(), LOAD, STOCKHOLM, CM001),
-      new HandlingEvent(cargo, getDate("2007-12-02"), new Date(), UNLOAD, HAMBURG, CM001),
-      new HandlingEvent(cargo, getDate("2007-12-03"), new Date(), LOAD, HAMBURG, CM002),
-      new HandlingEvent(cargo, getDate("2007-12-05"), new Date(), UNLOAD, HONGKONG, CM002)
-    );
-    CargoTestHelper.setDeliveryHistory(cargo, handlingEventList);
-
-    return cargo;
-  }
-
-  /**
-   * Parse an ISO 8601 (YYYY-MM-DD) String to Date
-   *
-   * @param isoFormat String to parse.
-   * @return Created date instance.
-   * @throws ParseException Thrown if parsing fails.
-   */
-  private Date getDate(String isoFormat) throws ParseException {
-    final DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-    return dateFormat.parse(isoFormat);
-  }
-
-}

dddsample/src/test/java/se/citerus/dddsample/ui/CargoAdminControllerTest.java

@@ -1,29 +0,0 @@
-package se.citerus.dddsample.ui;
-
-import junit.framework.TestCase;
-import org.easymock.EasyMock;
-import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.mock.web.MockHttpServletResponse;
-import se.citerus.dddsample.application.remoting.BookingServiceFacade;
-
-public class CargoAdminControllerTest extends TestCase {
-
-  CargoAdminController controller;
-  BookingServiceFacade bookingServiceFacade;
-  MockHttpServletRequest request;
-  MockHttpServletResponse response;
-
-  public CargoAdminControllerTest() {
-    controller = new CargoAdminController();
-    bookingServiceFacade = EasyMock.createMock(BookingServiceFacade.class);
-    controller.setBookingServiceFacade(bookingServiceFacade);
-  }
-
-  public void testAssignItinerary() throws Exception {
-    request = new MockHttpServletRequest("GET","assignItinerary.html");
-    response = new MockHttpServletResponse();
-
-    controller.handleRequest(request, response);
-  }
-
-}

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

@@ -1,93 +0,0 @@
-package se.citerus.dddsample.ui;
-
-import junit.framework.TestCase;
-import org.easymock.EasyMock;
-import org.springframework.context.support.StaticApplicationContext;
-import org.springframework.mock.web.MockHttpServletRequest;
-import org.springframework.mock.web.MockHttpServletResponse;
-import org.springframework.mock.web.MockHttpSession;
-import org.springframework.mock.web.MockServletContext;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.Errors;
-import org.springframework.validation.FieldError;
-import org.springframework.web.servlet.ModelAndView;
-import se.citerus.dddsample.domain.model.cargo.CargoRepository;
-import se.citerus.dddsample.infrastructure.persistence.inmemory.CargoRepositoryInMem;
-import se.citerus.dddsample.infrastructure.persistence.inmemory.HandlingEventRepositoryInMem;
-import se.citerus.dddsample.ui.command.TrackCommand;
-
-public class CargoTrackingControllerTest extends TestCase {
-  CargoTrackingController controller;
-  MockHttpServletRequest request;
-  MockHttpServletResponse response;
-  MockHttpSession session;
-  MockServletContext servletContext;
-  private CargoRepositoryInMem cargoRepository;
-
-  protected void setUp() throws Exception {
-    servletContext = new MockServletContext("test");
-    request = new MockHttpServletRequest(servletContext);
-    response = new MockHttpServletResponse();
-    session = new MockHttpSession(servletContext);
-    request.setSession(session);
-
-    controller = new CargoTrackingController();
-    StaticApplicationContext applicationContext = new StaticApplicationContext();
-    controller.setApplicationContext(applicationContext);
-    controller.setFormView("test-form");
-    controller.setSuccessView("test-success");
-    controller.setCommandName("test-command-name");
-    cargoRepository = new CargoRepositoryInMem();
-    cargoRepository.setHandlingEventRepository(new HandlingEventRepositoryInMem());
-    cargoRepository.init();
-  }
-
-  public void testHandleGet() throws Exception {
-    controller.setCargoRepository(new CargoRepositoryInMem());
-    request.setMethod("GET");
-
-    ModelAndView mav = controller.handleRequest(request, response);
-
-    assertEquals("test-form", mav.getViewName());
-    assertEquals(2, mav.getModel().size());
-    assertTrue(mav.getModel().get("test-command-name") instanceof TrackCommand);
-  }
-
-  public void testHandlePost() throws Exception {
-    controller.setCargoRepository(cargoRepository);
-    request.addParameter("trackingId", "ABC");
-    request.setMethod("POST");
-
-    ModelAndView mav = controller.handleRequest(request, response);
-
-    assertEquals("test-form", mav.getViewName());
-    // Errors, command are two standard map attributes, the third should be the cargo object
-    assertEquals(3, mav.getModel().size());
-    CargoTrackingViewAdapter cargo = (CargoTrackingViewAdapter) mav.getModel().get("cargo");
-    assertEquals("ABC", cargo.getTrackingId());
-  }
-
-  public void testUnknownCargo() throws Exception {
-    CargoRepository cargoRepository = EasyMock.createNiceMock(CargoRepository.class);
-    EasyMock.replay(cargoRepository);
-    controller.setCargoRepository(cargoRepository);
-    
-    request.setMethod("POST");
-    request.setParameter("trackingId", "unknown-id");
-
-    ModelAndView mav = controller.handleRequest(request, response);
-
-    assertEquals("test-form", mav.getViewName());
-    assertEquals(2, mav.getModel().size());
-
-    TrackCommand command = (TrackCommand) mav.getModel().get(controller.getCommandName());
-    assertEquals("unknown-id", command.getTrackingId());
-
-    Errors errors = (Errors) mav.getModel().get(BindingResult.MODEL_KEY_PREFIX + controller.getCommandName());
-    FieldError fe = errors.getFieldError("trackingId");
-    assertEquals("cargo.unknown_id", fe.getCode());
-    assertEquals(1, fe.getArguments().length);
-    assertEquals(command.getTrackingId(), fe.getArguments()[0]);
-  }
-
-}

dddsample/src/test/java/se/citerus/dddsample/ui/CargoTrackingViewAdapterTest.java

@@ -1,63 +0,0 @@
-package se.citerus.dddsample.ui;
-
-import junit.framework.TestCase;
-import org.springframework.context.support.StaticApplicationContext;
-import se.citerus.dddsample.domain.model.cargo.Cargo;
-import se.citerus.dddsample.domain.model.cargo.CargoTestHelper;
-import se.citerus.dddsample.domain.model.cargo.TrackingId;
-import static se.citerus.dddsample.domain.model.carrier.SampleVoyages.CM001;
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
-import static se.citerus.dddsample.domain.model.location.SampleLocations.HANGZOU;
-import static se.citerus.dddsample.domain.model.location.SampleLocations.HELSINKI;
-
-import java.util.*;
-
-public class CargoTrackingViewAdapterTest extends TestCase {
-
-  public void testCreate() {
-    Cargo cargo = new Cargo(new TrackingId("XYZ"), HANGZOU, HELSINKI);
-
-    List<HandlingEvent> events = new ArrayList<HandlingEvent>();
-    events.add(new HandlingEvent(cargo, new Date(1), new Date(2), HandlingEvent.Type.RECEIVE, HANGZOU));
-
-    events.add(new HandlingEvent(cargo, new Date(3), new Date(4), HandlingEvent.Type.LOAD, HANGZOU, CM001));
-    events.add(new HandlingEvent(cargo, new Date(5), new Date(6), HandlingEvent.Type.UNLOAD, HELSINKI, CM001));
-
-    CargoTestHelper.setDeliveryHistory(cargo, events);
-
-    StaticApplicationContext applicationContext = new StaticApplicationContext();
-    applicationContext.addMessage("cargo.status.IN_PORT", Locale.GERMAN, "In port {0}");
-    applicationContext.refresh();
-
-    CargoTrackingViewAdapter adapter = new CargoTrackingViewAdapter(cargo, applicationContext, Locale.GERMAN);
-
-    assertEquals("XYZ", adapter.getTrackingId());
-    assertEquals("CNHGH (Hangzhou)", adapter.getOrigin());
-    assertEquals("FIHEL (Helsinki)", adapter.getDestination());
-    assertEquals("In port FIHEL (Helsinki)", adapter.getStatusText());
-
-    Iterator<CargoTrackingViewAdapter.HandlingEventViewAdapter> it = adapter.getEvents().iterator();
-
-    CargoTrackingViewAdapter.HandlingEventViewAdapter event = it.next();
-    assertEquals("RECEIVE", event.getType());
-    assertEquals("CNHGH", event.getLocation());
-    assertEquals("1970-01-01 01:00", event.getTime());
-    assertEquals("", event.getVoyageNumber());
-    assertTrue(event.isExpected());
-
-    event = it.next();
-    assertEquals("LOAD", event.getType());
-    assertEquals("CNHGH", event.getLocation());
-    assertEquals("1970-01-01 01:00", event.getTime());
-    assertEquals("CM001", event.getVoyageNumber());
-    assertTrue(event.isExpected());
-
-    event = it.next();
-    assertEquals("UNLOAD", event.getType());
-    assertEquals("FIHEL", event.getLocation());
-    assertEquals("1970-01-01 01:00", event.getTime());
-    assertEquals("CM001", event.getVoyageNumber());
-    assertTrue(event.isExpected());
-  }
-
-}