Refactored code to remove warnings

src/main/java/se/citerus/dddsample/domain/model/handling/HandlingHistory.java

@@ -19,15 +19,15 @@ public class HandlingHistory implements ValueObject<HandlingHistory> {
   public HandlingHistory(Collection<HandlingEvent> handlingEvents) {
     Validate.notNull(handlingEvents, "Handling events are required");
 
-    this.handlingEvents = new ArrayList<HandlingEvent>(handlingEvents);
+    this.handlingEvents = new ArrayList<>(handlingEvents);
   }
 
   /**
    * @return A distinct list (no duplicate registrations) of handling events, ordered by completion time.
    */
   public List<HandlingEvent> distinctEventsByCompletionTime() {
-    final List<HandlingEvent> ordered = new ArrayList<HandlingEvent>(
-      new HashSet<HandlingEvent>(handlingEvents)
+    final List<HandlingEvent> ordered = new ArrayList<>(
+            new HashSet<>(handlingEvents)
     );
     sort(ordered, BY_COMPLETION_TIME_COMPARATOR);
     return Collections.unmodifiableList(ordered);
@@ -65,10 +65,6 @@ public class HandlingHistory implements ValueObject<HandlingHistory> {
   }
 
   private static final Comparator<HandlingEvent> BY_COMPLETION_TIME_COMPARATOR =
-    new Comparator<HandlingEvent>() {
-      public int compare(final HandlingEvent he1, final HandlingEvent he2) {
-        return he1.completionTime().compareTo(he2.completionTime());
-      }
-    };
+          (he1, he2) -> he1.completionTime().compareTo(he2.completionTime());
 
 }

src/main/java/se/citerus/dddsample/domain/model/voyage/SampleVoyages.java

@@ -20,8 +20,8 @@ public class SampleVoyages {
   public static final Voyage CM005 = createVoyage("CM005", CHICAGO, HAMBURG);
   public static final Voyage CM006 = createVoyage("CM006", HAMBURG, HANGZOU);
   private static Voyage createVoyage(String id, Location from, Location to) {
-    return new Voyage(new VoyageNumber(id), new Schedule(Arrays.asList(
-      new CarrierMovement(from, to, new Date(), new Date())
+    return new Voyage(new VoyageNumber(id), new Schedule(Collections.singletonList(
+            new CarrierMovement(from, to, new Date(), new Date())
     )));
   }
 
@@ -108,7 +108,7 @@ public class SampleVoyages {
       addMovement(HONGKONG, toDate("2008-11-24", "07:00"), toDate("2008-11-28", "13:37")).
       build();
 
-  public static final Map<VoyageNumber, Voyage> ALL = new HashMap();
+  public static final Map<VoyageNumber, Voyage> ALL = new HashMap<>();
 
   static {
     for (Field field : SampleVoyages.class.getDeclaredFields()) {
@@ -124,7 +124,7 @@ public class SampleVoyages {
   }
 
   public static List<Voyage> getAll() {
-    return new ArrayList(ALL.values());
+    return new ArrayList<>(ALL.values());
   }
 
   public static Voyage lookup(VoyageNumber voyageNumber) {

src/main/java/se/citerus/dddsample/interfaces/booking/web/RouteAssignmentCommand.java

@@ -78,11 +78,7 @@ public class RouteAssignmentCommand {
     }
 
     public static Factory factory() {
-      return new Factory() {
-        public Object create() {
-          return new LegCommand();
-        }
-      };
+      return LegCommand::new;
     }
 
   }

src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingController.java

@@ -2,11 +2,9 @@ package se.citerus.dddsample.interfaces.tracking;
 
 import org.springframework.context.MessageSource;
 import org.springframework.stereotype.Controller;
-import org.springframework.validation.BindException;
 import org.springframework.validation.BindingResult;
-import org.springframework.validation.Errors;
-import org.springframework.web.bind.WebDataBinder;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.support.RequestContextUtils;
 import se.citerus.dddsample.domain.model.cargo.Cargo;
 import se.citerus.dddsample.domain.model.cargo.CargoRepository;

src/test/java/se/citerus/dddsample/infrastructure/persistence/hibernate/CargoRepositoryTest.java

@@ -23,19 +23,19 @@ import se.citerus.dddsample.domain.model.location.UnLocode;
 import se.citerus.dddsample.domain.model.voyage.Voyage;
 import se.citerus.dddsample.domain.model.voyage.VoyageNumber;
 import se.citerus.dddsample.domain.model.voyage.VoyageRepository;
-import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
-import static se.citerus.dddsample.domain.model.voyage.SampleVoyages.*;
-import static se.citerus.dddsample.domain.model.handling.HandlingEvent.Type.*;
 
 import javax.sql.DataSource;
-
 import java.lang.reflect.Field;
-import java.util.Arrays;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
 import static org.junit.Assert.*;
+import static se.citerus.dddsample.domain.model.handling.HandlingEvent.Type.LOAD;
+import static se.citerus.dddsample.domain.model.handling.HandlingEvent.Type.RECEIVE;
+import static se.citerus.dddsample.domain.model.location.SampleLocations.*;
+import static se.citerus.dddsample.domain.model.voyage.SampleVoyages.CM004;
 
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(value = {"/context-infrastructure-persistence.xml", "/context-domain.xml"})
@@ -146,7 +146,7 @@ public class CargoRepositoryTest {
         Cargo cargo = new Cargo(trackingId, new RouteSpecification(origin, destination, new Date()));
         cargoRepository.store(cargo);
 
-        cargo.assignToRoute(new Itinerary(Arrays.asList(
+        cargo.assignToRoute(new Itinerary(Collections.singletonList(
                 new Leg(
                         voyageRepository.find(new VoyageNumber("0101")),
                         locationRepository.find(STOCKHOLM.unLocode()),
@@ -181,7 +181,7 @@ public class CargoRepositoryTest {
 
         Location legFrom = locationRepository.find(new UnLocode("FIHEL"));
         Location legTo = locationRepository.find(new UnLocode("DEHAM"));
-        Itinerary newItinerary = new Itinerary(Arrays.asList(new Leg(CM004, legFrom, legTo, new Date(), new Date())));
+        Itinerary newItinerary = new Itinerary(Collections.singletonList(new Leg(CM004, legFrom, legTo, new Date(), new Date())));
 
         cargo.assignToRoute(newItinerary);
 

src/test/java/se/citerus/dddsample/infrastructure/persistence/inmemory/CargoRepositoryInMem.java

@@ -28,7 +28,7 @@ public class CargoRepositoryInMem implements CargoRepository {
    * Constructor.
    */
   public CargoRepositoryInMem() {
-    cargoDb = new HashMap<String, Cargo>();
+    cargoDb = new HashMap<>();
   }
 
   public Cargo find(final TrackingId trackingId) {
@@ -47,7 +47,7 @@ public class CargoRepositoryInMem implements CargoRepository {
   }
 
   public List<Cargo> findAll() {
-    return new ArrayList(cargoDb.values());
+    return new ArrayList<>(cargoDb.values());
   }
 
   public void init() throws Exception {

src/test/java/se/citerus/dddsample/interfaces/booking/web/ItinerarySelectionCommandTest.java

@@ -1,6 +1,5 @@
 package se.citerus.dddsample.interfaces.booking.web;
 
-import junit.framework.TestCase;
 import org.junit.Test;
 import org.springframework.mock.web.MockHttpServletRequest;
 import org.springframework.web.bind.ServletRequestDataBinder;