Generated Java classes from WSDL for the handling report web service, under com.aggregator. Eliminated related handwritten Java code.

dddsample/pom.xml

@@ -116,7 +116,7 @@
         </configuration>
       </plugin>
 
-      <!-- Generates WSDL from Java -->
+      <!-- Generates WSDL from Java
       <plugin>
         <groupId>org.apache.cxf</groupId>
         <artifactId>cxf-java2ws-plugin</artifactId>
@@ -142,6 +142,7 @@
           </execution>
         </executions>
       </plugin>
+      -->
 
       <plugin>
         <artifactId>maven-jar-plugin</artifactId>
@@ -156,7 +157,7 @@
             <configuration>
               <classifier>ws-client</classifier>
               <includes>
-                <include>**/se/citerus/dddsample/interfaces/handling/ws/*.class</include>
+                <include>**/com/aggregator/*.class</include>
               </includes>
               <archive>
                 <addMavenDescriptor>false</addMavenDescriptor>

dddsample/src/main/java/se/citerus/dddsample/interfaces/handling/HandlingReportParser.java

@@ -1,11 +1,11 @@
 package se.citerus.dddsample.interfaces.handling;
 
+import com.aggregator.HandlingReport;
 import org.apache.commons.lang.StringUtils;
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
 import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.domain.model.location.UnLocode;
-import se.citerus.dddsample.interfaces.handling.ws.HandlingReport;
 
 import javax.xml.datatype.XMLGregorianCalendar;
 import java.text.ParseException;

dddsample/src/main/java/se/citerus/dddsample/interfaces/handling/file/UploadDirectoryScanner.java

@@ -11,7 +11,6 @@ import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.domain.model.location.UnLocode;
 import static se.citerus.dddsample.interfaces.handling.HandlingReportParser.*;
-import se.citerus.dddsample.interfaces.handling.ws.HandlingReportErrors;
 
 import java.io.File;
 import java.io.IOException;
@@ -75,7 +74,7 @@ public class UploadDirectoryScanner extends TimerTask implements InitializingBea
     );
   }
 
-  private void parseLine(final String line) throws HandlingReportErrors {
+  private void parseLine(final String line) throws Exception {
     final String[] columns = line.split("\t");
     if (columns.length == 5) {
       queueAttempt(columns[0], columns[1], columns[2], columns[3], columns[4]);
@@ -86,7 +85,7 @@ public class UploadDirectoryScanner extends TimerTask implements InitializingBea
     }
   }
 
-  private void queueAttempt(String completionTimeStr, String trackingIdStr, String voyageNumberStr, String unLocodeStr, String eventTypeStr) throws HandlingReportErrors {
+  private void queueAttempt(String completionTimeStr, String trackingIdStr, String voyageNumberStr, String unLocodeStr, String eventTypeStr) throws Exception {
     final List<String> errors = new ArrayList<String>();
 
     final Date date = parseDate(completionTimeStr, errors);
@@ -99,7 +98,7 @@ public class UploadDirectoryScanner extends TimerTask implements InitializingBea
       final HandlingEventRegistrationAttempt attempt = new HandlingEventRegistrationAttempt(new Date(), date, trackingId, voyageNumber, eventType, unLocode);
       applicationEvents.receivedHandlingEventRegistrationAttempt(attempt);
     } else {
-      throw new HandlingReportErrors(errors);
+      throw new Exception(errors.toString());
     }
   }
 

dddsample/src/main/java/se/citerus/dddsample/interfaces/handling/ws/HandlingReport.java

@@ -1,90 +0,0 @@
-package se.citerus.dddsample.interfaces.handling.ws;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.datatype.XMLGregorianCalendar;
-
-/**
- * Data type for registering handling events
- * using the web service api. Focus here is interoperability
- * and maintaining a stable api, and possibly things like
- * backwards compatibility with a system that's being replaced,
- * or adhering to an industry standard.
- *
- * We do not want this to constrain our modeling in any way.
- * 
- */
-public class HandlingReport {
-
-  private String[] trackingIds;
-  private String unLocode;
-  private String voyageNumber;
-  private XMLGregorianCalendar completionTime;
-  private String type;
-
-  /**
-   * @return tracking ids of cargos that have been handled (the same way)
-   */
-  @XmlElement(required = true)
-  public String[] getTrackingIds() {
-    return trackingIds;
-  }
-
-  public void setTrackingIds(String[] trackingIds) {
-    this.trackingIds = trackingIds;
-  }
-
-  /**
-   * @return United Nations Location Code for the location where the event occured
-   */
-  @XmlElement(required = true)
-  public String getUnLocode() {
-    return unLocode;
-  }
-
-  public void setUnLocode(String unLocode) {
-    this.unLocode = unLocode;
-  }
-
-  /**
-   * Not all events are associated with a voyage (customs handling etc).
-   * 
-   * @return voyage number, if applicable
-   */
-
-  @XmlElement(required = false)
-  public String getVoyageNumber() {
-    return voyageNumber;
-  }
-
-  public void setVoyageNumber(String voyageNumber) {
-    this.voyageNumber = voyageNumber;
-  }
-
-  /**
-   * @return time when event occured, for example a the loading of cargo was completed
-   */
-
-  @XmlSchemaType(name="dateTime")
-  @XmlElement(required = true)
-  public XMLGregorianCalendar getCompletionTime() {
-    return completionTime;
-  }
-
-  public void setCompletionTime(XMLGregorianCalendar completionTime) {
-    this.completionTime = completionTime;
-  }
-
-  /**
-   * @return type of event
-   */
-
-  @XmlElement(required = true)
-  public String getType() {
-    return type;
-  }
-
-  public void setType(String type) {
-    this.type = type;
-  }
-}

dddsample/src/main/java/se/citerus/dddsample/interfaces/handling/ws/HandlingReportErrors.java

@@ -1,38 +0,0 @@
-package se.citerus.dddsample.interfaces.handling.ws;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import java.util.ArrayList;
-import java.util.List;
-
-@XmlRootElement
-public class HandlingReportErrors extends Exception {
-
-  @XmlElement
-  List<String> errors;
-
-  public HandlingReportErrors() {
-  }
-
-  public HandlingReportErrors(List<String> errors) {
-    setErrors(errors);
-  }
-
-  public List<String> getErrors() {
-    return errors;
-  }
-
-  public void setErrors(List<String> errors) {
-    if (errors == null) {
-      errors = new ArrayList<String>();
-    }
-    this.errors = errors;
-  }
-
-  @Override
-  @XmlElement(required = true)
-  public String getMessage() {
-    return "Report errors: " + errors;
-  }
-  
-}

dddsample/src/main/java/se/citerus/dddsample/interfaces/handling/ws/HandlingReportService.java

@@ -1,21 +0,0 @@
-package se.citerus.dddsample.interfaces.handling.ws;
-
-import javax.jws.WebParam;
-import javax.jws.WebService;
-
-/**
- * Web service endpoint for handling report submissions.
- *
- */
-@WebService
-public interface HandlingReportService {
-
-  /**
-   * Submits a report of handled cargos.
-   *
-   * @param handlingReport handling report
-   * @throws HandlingReportErrors if there are formatting errors in the handling report
-   */
-  void submitReport(@WebParam HandlingReport handlingReport) throws HandlingReportErrors;
-
-}

dddsample/src/main/java/se/citerus/dddsample/interfaces/handling/ws/impl/HandlingReportServiceImpl.java → dddsample/src/main/java/se/citerus/dddsample/interfaces/handling/ws/HandlingReportServiceImpl.java

@@ -1,5 +1,9 @@
-package se.citerus.dddsample.interfaces.handling.ws.impl;
+package se.citerus.dddsample.interfaces.handling.ws;
 
+import com.aggregator.HandlingReport;
+import com.aggregator.HandlingReportErrors;
+import com.aggregator.HandlingReportErrors_Exception;
+import com.aggregator.HandlingReportService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import se.citerus.dddsample.application.ApplicationEvents;
@@ -9,10 +13,8 @@ import se.citerus.dddsample.domain.model.carrier.VoyageNumber;
 import se.citerus.dddsample.domain.model.handling.HandlingEvent;
 import se.citerus.dddsample.domain.model.location.UnLocode;
 import static se.citerus.dddsample.interfaces.handling.HandlingReportParser.*;
-import se.citerus.dddsample.interfaces.handling.ws.HandlingReport;
-import se.citerus.dddsample.interfaces.handling.ws.HandlingReportErrors;
-import se.citerus.dddsample.interfaces.handling.ws.HandlingReportService;
 
+import javax.jws.WebParam;
 import javax.jws.WebService;
 import java.util.ArrayList;
 import java.util.Date;
@@ -24,14 +26,14 @@ import java.util.List;
  * with the informtion to the handling event registration system for proper registration.
  *  
  */
-@WebService(endpointInterface = "se.citerus.dddsample.interfaces.handling.ws.HandlingReportService")
+@WebService(endpointInterface = "com.aggregator.HandlingReportService")
 public class HandlingReportServiceImpl implements HandlingReportService {
 
   private ApplicationEvents applicationEvents;
   private final static Log logger = LogFactory.getLog(HandlingReportServiceImpl.class);
 
   @Override
-  public void submitReport(HandlingReport handlingReport) throws HandlingReportErrors {
+  public void submitReport(@WebParam(name = "arg0", targetNamespace = "") HandlingReport handlingReport) throws HandlingReportErrors_Exception {
     final List<String> errors = new ArrayList<String>();
 
     final Date completionTime = parseCompletionTime(handlingReport, errors);
@@ -51,9 +53,11 @@ public class HandlingReportServiceImpl implements HandlingReportService {
         applicationEvents.receivedHandlingEventRegistrationAttempt(attempt);
       } else {
         logger.error("Parse error in handling report: " + errors);
-        throw new HandlingReportErrors(errors);
+        final HandlingReportErrors faultInfo = new HandlingReportErrors();
+        throw new HandlingReportErrors_Exception(errors.toString(), faultInfo);
       }
     }
+
   }
 
   public void setApplicationEvents(ApplicationEvents applicationEvents) {

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

@@ -17,7 +17,7 @@
 
   <jaxws:endpoint id="jax-ws.http" implementor="#handlingReportService" address="/RegisterEvent"/>
 
-  <bean id="handlingReportService" class="se.citerus.dddsample.interfaces.handling.ws.impl.HandlingReportServiceImpl">
+  <bean id="handlingReportService" class="se.citerus.dddsample.interfaces.handling.ws.HandlingReportServiceImpl">
     <property name="applicationEvents" ref="applicationEvents"/>
   </bean>
 

dddsample/src/test/java/se/citerus/dddsample/infrastructure/messaging/stub/SynchronousApplicationEventsStub.java

@@ -11,7 +11,7 @@ public class SynchronousApplicationEventsStub implements ApplicationEvents {
 
   CargoInspectionService cargoInspectionService;
 
-  public SynchronousApplicationEventsStub(CargoInspectionService cargoInspectionService) {
+  public void setCargoInspectionService(CargoInspectionService cargoInspectionService) {
     this.cargoInspectionService = cargoInspectionService;
   }
 

dddsample/src/test/java/se/citerus/dddsample/scenario/CargoLifecycleScenarioTest.java

@@ -297,7 +297,7 @@ public class CargoLifecycleScenarioTest extends TestCase {
     };
 
 
-    applicationEvents = new SynchronousApplicationEventsStub(cargoInspectionService);
+    applicationEvents = new SynchronousApplicationEventsStub();
 
     // Stub
     // TODO move functionality to in-mem impl
@@ -329,6 +329,9 @@ public class CargoLifecycleScenarioTest extends TestCase {
     handlingEventFactory = new HandlingEventFactory(cargoRepository, voyageRepository, locationRepository);
     handlingEventService = new HandlingEventServiceImpl(handlingEventRepository, applicationEvents, handlingEventFactory);
     bookingService = new BookingServiceImpl(cargoRepository, locationRepository, routingService);
+
+    // Stub
+    ((SynchronousApplicationEventsStub) applicationEvents).setCargoInspectionService(cargoInspectionService);
   }
 
 }