Explorar el Código

Moved MVC parts from dddsample.application.web to dddsample.ui, in line with the book's definition of the UI layer.

peter_backlund hace 18 años
padre
commit
f160f00e1c

dddsample/src/main/java/se/citerus/dddsample/application/web/CargoAdminController.java → dddsample/src/main/java/se/citerus/dddsample/ui/CargoAdminController.java Ver fichero

1
-package se.citerus.dddsample.application.web;
1
+package se.citerus.dddsample.ui;
2
 
2
 
3
 import org.springframework.web.servlet.mvc.multiaction.MultiActionController;
3
 import org.springframework.web.servlet.mvc.multiaction.MultiActionController;
4
 import se.citerus.dddsample.application.remoting.BookingServiceFacade;
4
 import se.citerus.dddsample.application.remoting.BookingServiceFacade;
6
 import se.citerus.dddsample.application.remoting.dto.ItineraryCandidateDTO;
6
 import se.citerus.dddsample.application.remoting.dto.ItineraryCandidateDTO;
7
 import se.citerus.dddsample.application.remoting.dto.LegDTO;
7
 import se.citerus.dddsample.application.remoting.dto.LegDTO;
8
 import se.citerus.dddsample.application.remoting.dto.LocationDTO;
8
 import se.citerus.dddsample.application.remoting.dto.LocationDTO;
9
-import se.citerus.dddsample.application.web.command.RegistrationCommand;
10
-import se.citerus.dddsample.application.web.command.RouteAssignmentCommand;
9
+import se.citerus.dddsample.ui.command.RegistrationCommand;
10
+import se.citerus.dddsample.ui.command.RouteAssignmentCommand;
11
 
11
 
12
 import javax.servlet.http.HttpServletRequest;
12
 import javax.servlet.http.HttpServletRequest;
13
 import javax.servlet.http.HttpServletResponse;
13
 import javax.servlet.http.HttpServletResponse;
26
  * there is never any one perfect solution for all situations, so we've chosen to demonstrate
26
  * there is never any one perfect solution for all situations, so we've chosen to demonstrate
27
  * two polarized ways to build user interfaces.   
27
  * two polarized ways to build user interfaces.   
28
  *
28
  *
29
- * @see se.citerus.dddsample.application.web.CargoTrackingController
29
+ * @see CargoTrackingController
30
  */
30
  */
31
 public final class CargoAdminController extends MultiActionController {
31
 public final class CargoAdminController extends MultiActionController {
32
 
32
 

dddsample/src/main/java/se/citerus/dddsample/application/web/CargoTrackingController.java → dddsample/src/main/java/se/citerus/dddsample/ui/CargoTrackingController.java Ver fichero

1
-package se.citerus.dddsample.application.web;
1
+package se.citerus.dddsample.ui;
2
 
2
 
3
 import org.springframework.context.MessageSource;
3
 import org.springframework.context.MessageSource;
4
 import org.springframework.validation.BindException;
4
 import org.springframework.validation.BindException;
5
 import org.springframework.web.servlet.ModelAndView;
5
 import org.springframework.web.servlet.ModelAndView;
6
 import org.springframework.web.servlet.mvc.SimpleFormController;
6
 import org.springframework.web.servlet.mvc.SimpleFormController;
7
 import org.springframework.web.servlet.support.RequestContextUtils;
7
 import org.springframework.web.servlet.support.RequestContextUtils;
8
-import se.citerus.dddsample.application.web.command.TrackCommand;
9
 import se.citerus.dddsample.domain.model.cargo.Cargo;
8
 import se.citerus.dddsample.domain.model.cargo.Cargo;
10
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
9
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
11
 import se.citerus.dddsample.domain.service.TrackingService;
10
 import se.citerus.dddsample.domain.service.TrackingService;
11
+import se.citerus.dddsample.ui.command.TrackCommand;
12
 
12
 
13
 import javax.servlet.http.HttpServletRequest;
13
 import javax.servlet.http.HttpServletRequest;
14
 import javax.servlet.http.HttpServletResponse;
14
 import javax.servlet.http.HttpServletResponse;
28
  * <p/>
28
  * <p/>
29
  *
29
  *
30
  * @eee se.citerus.dddsample.application.web.CargoTrackingViewAdapter
30
  * @eee se.citerus.dddsample.application.web.CargoTrackingViewAdapter
31
- * @see se.citerus.dddsample.application.web.CargoAdminController
31
+ * @see CargoAdminController
32
  *
32
  *
33
  */
33
  */
34
 public final class CargoTrackingController extends SimpleFormController {
34
 public final class CargoTrackingController extends SimpleFormController {

dddsample/src/main/java/se/citerus/dddsample/application/web/CargoTrackingViewAdapter.java → dddsample/src/main/java/se/citerus/dddsample/ui/CargoTrackingViewAdapter.java Ver fichero

1
-package se.citerus.dddsample.application.web;
1
+package se.citerus.dddsample.ui;
2
 
2
 
3
 import org.springframework.context.MessageSource;
3
 import org.springframework.context.MessageSource;
4
 import se.citerus.dddsample.domain.model.cargo.Cargo;
4
 import se.citerus.dddsample.domain.model.cargo.Cargo;

dddsample/src/main/java/se/citerus/dddsample/application/web/command/RegistrationCommand.java → dddsample/src/main/java/se/citerus/dddsample/ui/command/RegistrationCommand.java Ver fichero

1
-package se.citerus.dddsample.application.web.command;
1
+package se.citerus.dddsample.ui.command;
2
 
2
 
3
 /**
3
 /**
4
  *
4
  *

dddsample/src/main/java/se/citerus/dddsample/application/web/command/RouteAssignmentCommand.java → dddsample/src/main/java/se/citerus/dddsample/ui/command/RouteAssignmentCommand.java Ver fichero

1
-package se.citerus.dddsample.application.web.command;
1
+package se.citerus.dddsample.ui.command;
2
 
2
 
3
 import org.apache.commons.collections.Factory;
3
 import org.apache.commons.collections.Factory;
4
 import org.apache.commons.collections.ListUtils;
4
 import org.apache.commons.collections.ListUtils;

dddsample/src/main/java/se/citerus/dddsample/application/web/command/TrackCommand.java → dddsample/src/main/java/se/citerus/dddsample/ui/command/TrackCommand.java Ver fichero

1
-package se.citerus.dddsample.application.web.command;
1
+package se.citerus.dddsample.ui.command;
2
 
2
 
3
 import org.apache.commons.lang.builder.ToStringBuilder;
3
 import org.apache.commons.lang.builder.ToStringBuilder;
4
 import static org.apache.commons.lang.builder.ToStringStyle.MULTI_LINE_STYLE;
4
 import static org.apache.commons.lang.builder.ToStringStyle.MULTI_LINE_STYLE;

dddsample/src/main/java/se/citerus/dddsample/application/web/command/TrackCommandValidator.java → dddsample/src/main/java/se/citerus/dddsample/ui/command/TrackCommandValidator.java Ver fichero

1
-package se.citerus.dddsample.application.web.command;
1
+package se.citerus.dddsample.ui.command;
2
 
2
 
3
 import org.springframework.validation.Errors;
3
 import org.springframework.validation.Errors;
4
 import org.springframework.validation.ValidationUtils;
4
 import org.springframework.validation.ValidationUtils;

dddsample/src/main/java/se/citerus/dddsample/application/web/command/package.html → dddsample/src/main/java/se/citerus/dddsample/ui/command/package.html Ver fichero


dddsample/src/main/java/se/citerus/dddsample/application/web/package.html → dddsample/src/main/java/se/citerus/dddsample/ui/package.html Ver fichero


+ 3
- 3
dddsample/src/main/webapp/WEB-INF/dispatch-servlet.xml Ver fichero

11
     </property>
11
     </property>
12
   </bean>
12
   </bean>
13
 
13
 
14
-  <bean name="/cargo/track.html" class="se.citerus.dddsample.application.web.CargoTrackingController">
14
+  <bean name="/cargo/track.html" class="se.citerus.dddsample.ui.CargoTrackingController">
15
     <property name="sessionForm" value="true"/>
15
     <property name="sessionForm" value="true"/>
16
     <property name="commandName" value="trackCommand"/>
16
     <property name="commandName" value="trackCommand"/>
17
     <property name="formView" value="cargo/track"/>
17
     <property name="formView" value="cargo/track"/>
20
     <property name="validator" ref="trackCommandValidator"/>
20
     <property name="validator" ref="trackCommandValidator"/>
21
   </bean>
21
   </bean>
22
 
22
 
23
-  <bean id="trackCommandValidator" class="se.citerus.dddsample.application.web.command.TrackCommandValidator"/>
23
+  <bean id="trackCommandValidator" class="se.citerus.dddsample.ui.command.TrackCommandValidator"/>
24
 
24
 
25
-  <bean name="/admin/*" class="se.citerus.dddsample.application.web.CargoAdminController">
25
+  <bean name="/admin/*" class="se.citerus.dddsample.ui.CargoAdminController">
26
     <property name="bookingServiceFacade" ref="bookingServiceFacade"/>
26
     <property name="bookingServiceFacade" ref="bookingServiceFacade"/>
27
   </bean>
27
   </bean>
28
 
28
 

dddsample/src/test/java/se/citerus/dddsample/application/web/CargoAdminControllerTest.java → dddsample/src/test/java/se/citerus/dddsample/ui/CargoAdminControllerTest.java Ver fichero

1
-package se.citerus.dddsample.application.web;
1
+package se.citerus.dddsample.ui;
2
 
2
 
3
 import junit.framework.TestCase;
3
 import junit.framework.TestCase;
4
 import org.easymock.EasyMock;
4
 import org.easymock.EasyMock;

dddsample/src/test/java/se/citerus/dddsample/application/web/CargoTrackingControllerTest.java → dddsample/src/test/java/se/citerus/dddsample/ui/CargoTrackingControllerTest.java Ver fichero

1
-package se.citerus.dddsample.application.web;
1
+package se.citerus.dddsample.ui;
2
 
2
 
3
 import junit.framework.TestCase;
3
 import junit.framework.TestCase;
4
 import org.springframework.context.support.StaticApplicationContext;
4
 import org.springframework.context.support.StaticApplicationContext;
10
 import org.springframework.validation.Errors;
10
 import org.springframework.validation.Errors;
11
 import org.springframework.validation.FieldError;
11
 import org.springframework.validation.FieldError;
12
 import org.springframework.web.servlet.ModelAndView;
12
 import org.springframework.web.servlet.ModelAndView;
13
-import se.citerus.dddsample.application.web.command.TrackCommand;
14
 import se.citerus.dddsample.domain.model.cargo.Cargo;
13
 import se.citerus.dddsample.domain.model.cargo.Cargo;
15
 import se.citerus.dddsample.domain.model.cargo.CargoTestHelper;
14
 import se.citerus.dddsample.domain.model.cargo.CargoTestHelper;
16
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
15
 import se.citerus.dddsample.domain.model.cargo.TrackingId;
18
 import static se.citerus.dddsample.domain.model.location.SampleLocations.HONGKONG;
17
 import static se.citerus.dddsample.domain.model.location.SampleLocations.HONGKONG;
19
 import static se.citerus.dddsample.domain.model.location.SampleLocations.TOKYO;
18
 import static se.citerus.dddsample.domain.model.location.SampleLocations.TOKYO;
20
 import se.citerus.dddsample.domain.service.TrackingService;
19
 import se.citerus.dddsample.domain.service.TrackingService;
20
+import se.citerus.dddsample.ui.command.TrackCommand;
21
 
21
 
22
 import java.util.Arrays;
22
 import java.util.Arrays;
23
 import java.util.Date;
23
 import java.util.Date;

dddsample/src/test/java/se/citerus/dddsample/application/web/CargoTrackingViewAdapterTest.java → dddsample/src/test/java/se/citerus/dddsample/ui/CargoTrackingViewAdapterTest.java Ver fichero

1
-package se.citerus.dddsample.application.web;
1
+package se.citerus.dddsample.ui;
2
 
2
 
3
 import junit.framework.TestCase;
3
 import junit.framework.TestCase;
4
 import org.springframework.context.support.StaticApplicationContext;
4
 import org.springframework.context.support.StaticApplicationContext;

dddsample/src/test/java/se/citerus/dddsample/application/web/command/ItinerarySelectionCommandTest.java → dddsample/src/test/java/se/citerus/dddsample/ui/command/ItinerarySelectionCommandTest.java Ver fichero

1
-package se.citerus.dddsample.application.web.command;
1
+package se.citerus.dddsample.ui.command;
2
 
2
 
3
 import junit.framework.TestCase;
3
 import junit.framework.TestCase;
4
 import org.springframework.mock.web.MockHttpServletRequest;
4
 import org.springframework.mock.web.MockHttpServletRequest;

dddsample/src/test/java/se/citerus/dddsample/application/web/command/TrackCommandValidatorTest.java → dddsample/src/test/java/se/citerus/dddsample/ui/command/TrackCommandValidatorTest.java Ver fichero

1
-package se.citerus.dddsample.application.web.command;
1
+package se.citerus.dddsample.ui.command;
2
 
2
 
3
 import junit.framework.TestCase;
3
 import junit.framework.TestCase;
4
 import org.springframework.validation.BeanPropertyBindingResult;
4
 import org.springframework.validation.BeanPropertyBindingResult;