Pārlūkot izejas kodu

Fixe a few minor details discovered by PMD

peter_backlund 17 gadus atpakaļ
vecāks
revīzija
fb3dbf633e

+ 0
- 1
dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/application/event/SystemEvents.java Parādīt failu

2
 
2
 
3
 import se.citerus.dddsample.tracking.core.domain.model.cargo.Cargo;
3
 import se.citerus.dddsample.tracking.core.domain.model.cargo.Cargo;
4
 import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent;
4
 import se.citerus.dddsample.tracking.core.domain.model.handling.HandlingEvent;
5
-import se.citerus.dddsample.tracking.core.domain.model.voyage.Voyage;
6
 
5
 
7
 /**
6
 /**
8
  * This interface provides a way to let other parts
7
  * This interface provides a way to let other parts

+ 4
- 4
dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/model/cargo/RouteSpecification.java Parādīt failu

109
   
109
   
110
   private final class NotNullSpecification extends FieldlessSpecification {
110
   private final class NotNullSpecification extends FieldlessSpecification {
111
     @Override
111
     @Override
112
-    public final boolean isSatisfiedBy(final Itinerary itinerary) {
112
+    public boolean isSatisfiedBy(final Itinerary itinerary) {
113
       return itinerary != null;
113
       return itinerary != null;
114
     }
114
     }
115
   }
115
   }
116
 
116
 
117
   private final class SameOriginSpecification extends FieldlessSpecification {
117
   private final class SameOriginSpecification extends FieldlessSpecification {
118
     @Override
118
     @Override
119
-    public final boolean isSatisfiedBy(final Itinerary itinerary) {
119
+    public boolean isSatisfiedBy(final Itinerary itinerary) {
120
       return origin.sameAs(itinerary.initialLoadLocation());
120
       return origin.sameAs(itinerary.initialLoadLocation());
121
     }
121
     }
122
   }
122
   }
123
 
123
 
124
   private final class SameDestinationSpecification extends FieldlessSpecification {
124
   private final class SameDestinationSpecification extends FieldlessSpecification {
125
     @Override
125
     @Override
126
-    public final boolean isSatisfiedBy(final Itinerary itinerary) {
126
+    public boolean isSatisfiedBy(final Itinerary itinerary) {
127
       return destination.sameAs(itinerary.finalUnloadLocation());
127
       return destination.sameAs(itinerary.finalUnloadLocation());
128
     }
128
     }
129
   }
129
   }
130
 
130
 
131
   private final class MeetsDeadlineSpecification extends FieldlessSpecification {
131
   private final class MeetsDeadlineSpecification extends FieldlessSpecification {
132
     @Override
132
     @Override
133
-    public final boolean isSatisfiedBy(final Itinerary itinerary) {
133
+    public boolean isSatisfiedBy(final Itinerary itinerary) {
134
       return arrivalDeadline.after(itinerary.finalUnloadTime());
134
       return arrivalDeadline.after(itinerary.finalUnloadTime());
135
     }
135
     }
136
   }
136
   }

+ 13
- 10
dddsample/tracking/core/src/main/java/se/citerus/dddsample/tracking/core/domain/model/handling/HandlingEvent.java Parādīt failu

77
     }
77
     }
78
 
78
 
79
     @Override
79
     @Override
80
-    public boolean sameValueAs(Type other) {
81
-      return other != null && this.equals(other);
80
+    public boolean sameValueAs(final Type other) {
81
+      return this.equals(other);
82
     }
82
     }
83
 
83
 
84
   }
84
   }
92
    * @param voyage           the voyage
92
    * @param voyage           the voyage
93
    * @param operatorCode     operator code for port operator
93
    * @param operatorCode     operator code for port operator
94
    */
94
    */
95
-  // TODO make package local
96
-  public HandlingEvent(final Cargo cargo,
97
-                       final Date completionTime,
98
-                       final Date registrationTime,
99
-                       final Type type,
100
-                       final Location location,
101
-                       final Voyage voyage,
102
-                       final OperatorCode operatorCode) {
95
+  HandlingEvent(final Cargo cargo,
96
+                final Date completionTime,
97
+                final Date registrationTime,
98
+                final Type type,
99
+                final Location location,
100
+                final Voyage voyage,
101
+                final OperatorCode operatorCode) {
103
     Validate.notNull(cargo, "Cargo is required");
102
     Validate.notNull(cargo, "Cargo is required");
104
     Validate.notNull(completionTime, "Completion time is required");
103
     Validate.notNull(completionTime, "Completion time is required");
105
     Validate.notNull(registrationTime, "Registration time is required");
104
     Validate.notNull(registrationTime, "Registration time is required");
166
     return activity.voyage() != null ? activity.voyage() : Voyage.NONE;
165
     return activity.voyage() != null ? activity.voyage() : Voyage.NONE;
167
   }
166
   }
168
 
167
 
168
+  public OperatorCode operatorCode() {
169
+    return operatorCode;
170
+  }
171
+
169
   public Date completionTime() {
172
   public Date completionTime() {
170
     return new Date(this.completionTime.getTime());
173
     return new Date(this.completionTime.getTime());
171
   }
174
   }