Marten Deinum 8 anni fa
parent
commit
5033c2b236
No account linked to committer's email

+ 9
- 0
pom.xml Vedi File

@@ -166,15 +166,21 @@
166 166
         <plugins>
167 167
             <!-- Javadoc -->
168 168
             <plugin>
169
+                <groupId>org.apache.maven.plugins</groupId>
169 170
                 <artifactId>maven-javadoc-plugin</artifactId>
171
+                <version>3.0.0</version>
170 172
             </plugin>
171 173
             <!-- Source code cross reference -->
172 174
             <plugin>
175
+                <groupId>org.apache.maven.plugins</groupId>
173 176
                 <artifactId>maven-jxr-plugin</artifactId>
177
+                <version>2.5</version>
174 178
             </plugin>
175 179
             <!-- Test report -->
176 180
             <plugin>
181
+                <groupId>org.apache.maven.plugins</groupId>
177 182
                 <artifactId>maven-surefire-report-plugin</artifactId>
183
+                <version>2.20.1</version>
178 184
             </plugin>
179 185
             <!-- Test coverage -->
180 186
             <plugin>
@@ -183,11 +189,14 @@
183 189
             </plugin>
184 190
             <!-- CheckStyle report -->
185 191
             <plugin>
192
+                <groupId>org.apache.maven.plugins</groupId>
186 193
                 <artifactId>maven-checkstyle-plugin</artifactId>
194
+                <version>2.17</version>
187 195
                 <configuration>
188 196
                     <configLocation>src/main/config/checkstyle.xml</configLocation>
189 197
                     <!-- Java source code generated from WSDL -->
190 198
                     <excludes>**/com/aggregator/**/*</excludes>
199
+                    <includeTestSourceDirectory>true</includeTestSourceDirectory>
191 200
                 </configuration>
192 201
             </plugin>
193 202
         </plugins>

+ 20
- 16
src/main/config/checkstyle.xml Vedi File

@@ -18,8 +18,8 @@
18 18
  -->
19 19
 
20 20
 <!DOCTYPE module PUBLIC
21
-    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
22
-    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
21
+        "-//Puppy Crawl//DTD Check Configuration 1.3//EN"
22
+        "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd">
23 23
 
24 24
 <!--
25 25
 
@@ -52,7 +52,9 @@
52 52
 
53 53
     <!-- Checks that a package.html file exists for each package.     -->
54 54
     <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
55
-    <module name="PackageHtml"/>
55
+    <module name="JavadocPackage">
56
+        <property name="allowLegacy" value="true" />
57
+    </module>
56 58
 
57 59
     <!-- Checks whether files end with a new line.                        -->
58 60
     <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
@@ -62,6 +64,15 @@
62 64
     <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
63 65
     <module name="Translation"/>
64 66
 
67
+    <!-- Checks for Size Violations.                    -->
68
+    <!-- See http://checkstyle.sf.net/config_sizes.html -->
69
+    <module name="FileLength"/>
70
+    <module name="FileTabCharacter"/>
71
+
72
+    <module name="RegexpSingleline">
73
+        <property name="format" value="\s+$"/>
74
+        <property name="message" value="Line has trailing spaces."/>
75
+    </module>
65 76
 
66 77
     <module name="TreeWalker">
67 78
 
@@ -112,15 +123,14 @@
112 123
         <!-- Checks for imports                              -->
113 124
         <!-- See http://checkstyle.sf.net/config_import.html -->
114 125
         <module name="AvoidStarImport"/>
115
-        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
126
+        <module name="IllegalImport">
127
+            <property name="illegalPkgs" value="sun.*, org.apache.commons.logging"/>
128
+        </module>
129
+
116 130
         <module name="RedundantImport"/>
117 131
         <module name="UnusedImports"/>
118 132
 
119 133
 
120
-        <!-- Checks for Size Violations.                    -->
121
-        <!-- See http://checkstyle.sf.net/config_sizes.html -->
122
-        <module name="FileLength"/>
123
-
124 134
         <module name="LineLength">
125 135
          <property name="max" value="120"/>
126 136
         </module>
@@ -146,7 +156,7 @@
146 156
         
147 157
         <module name="WhitespaceAfter">
148 158
           <!-- Default tokens and additional GENERIC_END -->
149
-          <property name="tokens" value="COMMA, SEMI, TYPECAST, GENERIC_END"/>
159
+          <property name="tokens" value="COMMA, SEMI, TYPECAST"/>
150 160
         </module>
151 161
         
152 162
         <module name="WhitespaceAround">
@@ -165,7 +175,6 @@
165 175
         <module name="OperatorWrap"/>
166 176
         <module name="ParenPad"/>
167 177
         <module name="TypecastParenPad"/>
168
-        <module name="TabCharacter"/>
169 178
 
170 179
 
171 180
         <!-- Modifier Checks                                    -->
@@ -185,14 +194,12 @@
185 194
 
186 195
         <!-- Checks for common coding problems               -->
187 196
         <!-- See http://checkstyle.sf.net/config_coding.html -->
188
-        <module name="DoubleCheckedLocking"/>    <!-- MY FAVOURITE -->
189 197
         <module name="EmptyStatement"/>
190 198
         <module name="EqualsHashCode"/>
191 199
         <module name="IllegalInstantiation"/>
192 200
         <module name="InnerAssignment"/>
193 201
         <module name="MagicNumber"/>
194 202
         <module name="MissingSwitchDefault"/>
195
-        <module name="RedundantThrows"/>
196 203
         <module name="SimplifyBooleanExpression"/>
197 204
         <module name="SimplifyBooleanReturn"/>
198 205
 
@@ -209,10 +216,7 @@
209 216
         <!-- See http://checkstyle.sf.net/config_misc.html -->
210 217
         <module name="ArrayTypeStyle"/>
211 218
         <module name="FinalParameters"/>
212
-        <module name="GenericIllegalRegexp">
213
-            <property name="format" value="\s+$"/>
214
-            <property name="message" value="Line has trailing spaces."/>
215
-        </module>
219
+
216 220
         <module name="TodoComment"/>
217 221
         <module name="UpperEll"/>
218 222
 

+ 1
- 2
src/main/java/com/pathfinder/api/GraphTraversalService.java Vedi File

@@ -1,7 +1,6 @@
1 1
 package com.pathfinder.api;
2 2
 
3 3
 import java.rmi.Remote;
4
-import java.rmi.RemoteException;
5 4
 import java.util.List;
6 5
 import java.util.Properties;
7 6
 
@@ -17,7 +16,7 @@ public interface GraphTraversalService extends Remote {
17 16
    * @param destination destination point
18 17
    * @param limitations restrictions on the path selection, as key-value according to some API specification
19 18
    * @return A list of transit paths
20
-   * @throws RemoteException RMI problem
19
+   * @throws java.rmi.RemoteException RMI problem
21 20
    */
22 21
   List<TransitPath> findShortestPath(String origin,
23 22
                                      String destination,

+ 2
- 2
src/main/java/se/citerus/dddsample/domain/model/cargo/Cargo.java Vedi File

@@ -1,7 +1,7 @@
1 1
 package se.citerus.dddsample.domain.model.cargo;
2 2
 
3 3
 import org.apache.commons.lang.Validate;
4
-import se.citerus.dddsample.domain.model.handling.HandlingEvent;
4
+
5 5
 import se.citerus.dddsample.domain.model.handling.HandlingHistory;
6 6
 import se.citerus.dddsample.domain.model.location.Location;
7 7
 import se.citerus.dddsample.domain.shared.DomainObjectUtils;
@@ -140,7 +140,7 @@ public class Cargo implements Entity<Cargo> {
140 140
    * {@link RouteSpecification} and {@link Itinerary} are both inside the Cargo
141 141
    * aggregate, so changes to them cause the status to be updated <b>synchronously</b>,
142 142
    * but changes to the delivery history (when a cargo is handled) cause the status update
143
-   * to happen <b>asynchronously</b> since {@link HandlingEvent} is in a different aggregate.
143
+   * to happen <b>asynchronously</b> since {@link se.citerus.dddsample.domain.model.handling.HandlingEvent} is in a different aggregate.
144 144
    *
145 145
    * @param handlingHistory handling history
146 146
    */

+ 0
- 2
src/main/java/se/citerus/dddsample/domain/model/cargo/CargoRepository.java Vedi File

@@ -1,7 +1,5 @@
1 1
 package se.citerus.dddsample.domain.model.cargo;
2 2
 
3
-import org.springframework.transaction.annotation.Transactional;
4
-
5 3
 import java.util.List;
6 4
 
7 5
 public interface CargoRepository {

+ 4
- 5
src/main/java/se/citerus/dddsample/interfaces/booking/facade/BookingServiceFacade.java Vedi File

@@ -1,14 +1,13 @@
1 1
 package se.citerus.dddsample.interfaces.booking.facade;
2 2
 
3
-import se.citerus.dddsample.interfaces.booking.facade.dto.CargoRoutingDTO;
4
-import se.citerus.dddsample.interfaces.booking.facade.dto.LocationDTO;
5
-import se.citerus.dddsample.interfaces.booking.facade.dto.RouteCandidateDTO;
6
-
7
-import java.rmi.Remote;
8 3
 import java.rmi.RemoteException;
9 4
 import java.util.Date;
10 5
 import java.util.List;
11 6
 
7
+import se.citerus.dddsample.interfaces.booking.facade.dto.CargoRoutingDTO;
8
+import se.citerus.dddsample.interfaces.booking.facade.dto.LocationDTO;
9
+import se.citerus.dddsample.interfaces.booking.facade.dto.RouteCandidateDTO;
10
+
12 11
 /**
13 12
  * This facade shields the domain layer - model, services, repositories -
14 13
  * from concerns about such things as the user interface.