From a4821e4a65b07f2d5b032e2f32260c1de9d55857 Mon Sep 17 00:00:00 2001
From: orende <1337decker@gmail.com>
Date: Thu, 27 Oct 2022 14:17:10 +0200
Subject: [PATCH 01/15] Replace hardcoded strings in booking and tracking web
 apps

---
 .../booking/facade/dto/CargoRoutingDTO.java   |  2 +
 .../booking/web/CargoAdminController.java     | 12 +++-
 .../tracking/CargoTrackingController.java     |  6 +-
 .../tracking/CargoTrackingViewAdapter.java    | 34 +++++----
 .../tracking/TrackCommandValidator.java       |  1 -
 src/main/resources/messages_en.properties     | 61 +++++++++++++++-
 src/main/resources/messages_sv.properties     | 72 +++++++++++++++++++
 src/main/resources/templates/admin/list.html  | 14 ++--
 .../templates/admin/pickNewDestination.html   | 10 +--
 .../templates/admin/registrationForm.html     | 12 ++--
 .../templates/admin/selectItinerary.html      | 23 +++---
 src/main/resources/templates/admin/show.html  | 26 +++----
 .../resources/templates/adminDecorator.html   |  6 +-
 src/main/resources/templates/track.html       | 25 +++----
 14 files changed, 223 insertions(+), 81 deletions(-)
 create mode 100644 src/main/resources/messages_sv.properties

diff --git a/src/main/java/se/citerus/dddsample/interfaces/booking/facade/dto/CargoRoutingDTO.java b/src/main/java/se/citerus/dddsample/interfaces/booking/facade/dto/CargoRoutingDTO.java
index e76efff0a..21b3515ff 100644
--- a/src/main/java/se/citerus/dddsample/interfaces/booking/facade/dto/CargoRoutingDTO.java
+++ b/src/main/java/se/citerus/dddsample/interfaces/booking/facade/dto/CargoRoutingDTO.java
@@ -1,5 +1,7 @@
 package se.citerus.dddsample.interfaces.booking.facade.dto;
 
+import org.springframework.context.MessageSource;
+
 import java.io.Serializable;
 import java.time.Instant;
 import java.time.ZoneOffset;
diff --git a/src/main/java/se/citerus/dddsample/interfaces/booking/web/CargoAdminController.java b/src/main/java/se/citerus/dddsample/interfaces/booking/web/CargoAdminController.java
index 868d1723a..2060d8a2d 100644
--- a/src/main/java/se/citerus/dddsample/interfaces/booking/web/CargoAdminController.java
+++ b/src/main/java/se/citerus/dddsample/interfaces/booking/web/CargoAdminController.java
@@ -2,12 +2,15 @@
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import com.google.common.collect.ImmutableMap;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
+import org.springframework.context.MessageSource;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.ServletRequestDataBinder;
 import org.springframework.web.bind.annotation.InitBinder;
 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.interfaces.booking.facade.BookingServiceFacade;
 import se.citerus.dddsample.interfaces.booking.facade.dto.CargoRoutingDTO;
 import se.citerus.dddsample.interfaces.booking.facade.dto.LegDTO;
@@ -40,9 +43,11 @@
 public final class CargoAdminController {
 
     private final BookingServiceFacade bookingServiceFacade;
+    private final MessageSource messageSource;
 
-    public CargoAdminController(BookingServiceFacade bookingServiceFacade) {
+    public CargoAdminController(BookingServiceFacade bookingServiceFacade, MessageSource messageSource) {
         this.bookingServiceFacade = bookingServiceFacade;
+        this.messageSource = messageSource;
     }
 
     @InitBinder
@@ -52,6 +57,7 @@ private void initBinder(HttpServletRequest request, ServletRequestDataBinder bin
 
     @RequestMapping("/registration")
     public String registration(HttpServletRequest request, HttpServletResponse response, Map<String, Object> model) throws Exception {
+        model.putAll(ImmutableMap.of("messageSource", messageSource, "locale", RequestContextUtils.getLocale(request)));
         List<LocationDTO> dtoList = bookingServiceFacade.listShippingLocations();
 
         List<String> unLocodeStrings = new ArrayList<String>();
@@ -78,6 +84,7 @@ public void register(HttpServletRequest request, HttpServletResponse response,
 
     @RequestMapping("/list")
     public String list(HttpServletRequest request, HttpServletResponse response, Map<String, Object> model) throws Exception {
+        model.putAll(ImmutableMap.of("messageSource", messageSource, "locale", RequestContextUtils.getLocale(request)));
         List<CargoRoutingDTO> cargoList = bookingServiceFacade.listAllCargos();
 
         model.put("cargoList", cargoList);
@@ -86,6 +93,7 @@ public String list(HttpServletRequest request, HttpServletResponse response, Map
 
     @RequestMapping("/show")
     public String show(HttpServletRequest request, HttpServletResponse response, Map<String, Object> model) throws Exception {
+        model.putAll(ImmutableMap.of("messageSource", messageSource, "locale", RequestContextUtils.getLocale(request)));
         String trackingId = request.getParameter("trackingId");
         CargoRoutingDTO dto = bookingServiceFacade.loadCargoForRouting(trackingId);
         model.put("cargo", dto);
@@ -94,6 +102,7 @@ public String show(HttpServletRequest request, HttpServletResponse response, Map
 
     @RequestMapping("/selectItinerary")
     public String selectItinerary(HttpServletRequest request, HttpServletResponse response, Map<String, Object> model) throws Exception {
+        model.putAll(ImmutableMap.of("messageSource", messageSource, "locale", RequestContextUtils.getLocale(request)));
         String trackingId = request.getParameter("trackingId");
 
         List<RouteCandidateDTO> routeCandidates = bookingServiceFacade.requestPossibleRoutesForCargo(trackingId);
@@ -127,6 +136,7 @@ public void assignItinerary(HttpServletRequest request, HttpServletResponse resp
 
     @RequestMapping(value = "/pickNewDestination")
     public String pickNewDestination(HttpServletRequest request, HttpServletResponse response, Map<String, Object> model) throws Exception {
+        model.putAll(ImmutableMap.of("messageSource", messageSource, "locale", RequestContextUtils.getLocale(request)));
         List<LocationDTO> locations = bookingServiceFacade.listShippingLocations();
         model.put("locations", locations);
 
diff --git a/src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingController.java b/src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingController.java
index b7eb1b604..84b99f1c2 100644
--- a/src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingController.java
+++ b/src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingController.java
@@ -29,7 +29,7 @@
  * helps us shield the domain model classes.
  * <p>
  *
- * @see CargoTrackingViewAdapter
+ * @see se.citerus.dddsample.interfaces.tracking.CargoTrackingViewAdapter
  * @see se.citerus.dddsample.interfaces.booking.web.CargoAdminController
  */
 @Controller
@@ -63,17 +63,17 @@ private String onSubmit(final HttpServletRequest request,
                             final TrackCommand command,
                             final Map<String, Object> model,
                             final BindingResult bindingResult) {
+        final Locale locale = RequestContextUtils.getLocale(request);
         trackCommandValidator.validate(command, bindingResult);
 
         final TrackingId trackingId = new TrackingId(command.getTrackingId());
         final Cargo cargo = cargoRepository.find(trackingId);
 
         if (cargo != null) {
-            final Locale locale = RequestContextUtils.getLocale(request);
             final List<HandlingEvent> handlingEvents = handlingEventRepository.lookupHandlingHistoryOfCargo(trackingId).distinctEventsByCompletionTime();
             model.put("cargo", new CargoTrackingViewAdapter(cargo, messageSource, locale, handlingEvents));
         } else {
-            bindingResult.rejectValue("trackingId", "cargo.unknown_id", new Object[]{command.getTrackingId()}, "Unknown tracking id");
+            bindingResult.rejectValue("trackingId", "cargo.unknown_id", new Object[]{command.getTrackingId()}, "");
         }
         return "track";
     }
diff --git a/src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingViewAdapter.java b/src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingViewAdapter.java
index 04ff20a57..b1f02eca4 100644
--- a/src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingViewAdapter.java
+++ b/src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingViewAdapter.java
@@ -23,8 +23,9 @@ public final class CargoTrackingViewAdapter {
   private final List<HandlingEventViewAdapter> events;
   private final String FORMAT = "yyyy-MM-dd hh:mm";
   private final TimeZone timeZone;
+  private final SimpleDateFormat dateFormat = new SimpleDateFormat(FORMAT);
 
-    /**
+  /**
    * Constructor.
    *
    * @param cargo
@@ -97,6 +98,14 @@ public String getStatusText() {
     return messageSource.getMessage(code, args, "[Unknown status]", locale);
   }
 
+  public String getEtaText() {
+    return messageSource.getMessage("cargo.routing.eta", new Object[]{getDestination(), getEta()}, locale);
+  }
+
+  public String getStatusDescriptionText() {
+    return messageSource.getMessage("cargo.routing.result", new Object[]{getTrackingId(), getStatusText()}, locale);
+  }
+
   /**
    * @return Cargo destination location.
    */
@@ -131,19 +140,20 @@ public String getNextExpectedActivity() {
         return "";
       }
 
-    String text = "Next expected activity is to ";
     HandlingEvent.Type type = activity.type();
     if (type.sameValueAs(HandlingEvent.Type.LOAD)) {
-        return
-          text + type.name().toLowerCase() + " cargo onto voyage " + activity.voyage().voyageNumber() +
-          " in " + activity.location().name();
-      } else if (type.sameValueAs(HandlingEvent.Type.UNLOAD)) {
-        return
-          text + type.name().toLowerCase() + " cargo off of " + activity.voyage().voyageNumber() +
-          " in " + activity.location().name();
-      } else {
-        return text + type.name().toLowerCase() + " cargo in " + activity.location().name();
-      }
+      return messageSource.getMessage("cargo.routing.nextexpact." + type.name(), new Object[]{activity.voyage().voyageNumber(), activity.location().name()}, "Missing translation string", locale);
+    } else if (type.sameValueAs(HandlingEvent.Type.UNLOAD)) {
+      return messageSource.getMessage("cargo.routing.nextexpact." + type.name(), new Object[]{activity.voyage().voyageNumber(), activity.location().name()}, "Missing translation string", locale);
+    } else if (type.sameValueAs(HandlingEvent.Type.RECEIVE))  {
+      return messageSource.getMessage("cargo.routing.nextexpact." + type.name(), new Object[]{activity.location().name()}, "Missing translation string", locale);
+    } else if (type.sameValueAs(HandlingEvent.Type.CLAIM))  {
+      return messageSource.getMessage("cargo.routing.nextexpact." + type.name(), new Object[]{activity.location().name()}, "Missing translation string", locale);
+    } else if (type.sameValueAs(HandlingEvent.Type.CUSTOMS))  {
+      return messageSource.getMessage("cargo.routing.nextexpact." + type.name(), new Object[]{activity.location().name()}, "Missing translation string", locale);
+    } else {
+      return messageSource.getMessage("cargo.routing.nextexpact.unknown", null, "Missing translation string", locale);
+    }
   }
 
   /**
diff --git a/src/main/java/se/citerus/dddsample/interfaces/tracking/TrackCommandValidator.java b/src/main/java/se/citerus/dddsample/interfaces/tracking/TrackCommandValidator.java
index 8f8d39ebd..9d470468d 100644
--- a/src/main/java/se/citerus/dddsample/interfaces/tracking/TrackCommandValidator.java
+++ b/src/main/java/se/citerus/dddsample/interfaces/tracking/TrackCommandValidator.java
@@ -17,6 +17,5 @@ public boolean supports(@NonNull final Class<?> clazz) {
   public void validate(@NonNull final Object object,@NonNull final Errors errors) {
     ValidationUtils.rejectIfEmptyOrWhitespace(errors, "trackingId", "error.required", "Required");
   }
-
 }
 
diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties
index 356c2c2f6..5d649f814 100644
--- a/src/main/resources/messages_en.properties
+++ b/src/main/resources/messages_en.properties
@@ -4,10 +4,69 @@ cargo.status.ONBOARD_CARRIER=Onboard voyage {0}
 cargo.status.CLAIMED=Claimed
 cargo.status.UNKNOWN=Unknown
 
+cargo.misrouted=Misrouted
+cargo.notrouted=Not routed
+
 deliveryHistory.eventDescription.NOT_RECEIVED=Cargo has not yet been received.
 
 deliveryHistory.eventDescription.LOAD=Loaded onto voyage {0} in {1}, at {2}.
 deliveryHistory.eventDescription.UNLOAD=Unloaded off voyage {0} in {1}, at {2}.
 deliveryHistory.eventDescription.RECEIVE=Received in {0}, at {1}.
 deliveryHistory.eventDescription.CLAIM=Claimed in {0}, at {1}.
-deliveryHistory.eventDescription.CUSTOMS=Cleared customs in {0}, at {1}.
\ No newline at end of file
+deliveryHistory.eventDescription.CUSTOMS=Cleared customs in {0}, at {1}.
+
+booking.header=Cargo Booking and Routing
+booking.listall=List all cargos
+booking.booknew=Book new cargo
+cargo.tracking.header=Tracking cargo
+cargo.tracking.idinput=Enter your tracking id:
+cargo.tracking.submitbutton=Track!
+cargo.tracking.hint=Hint: try tracking "ABC123" or "JKL567".
+cargo.tracking.handlinghistory=Handling History
+cargo.tracking.misdirected=Cargo is misdirected
+cargo.routing.result=Cargo {0} is now: {1}
+cargo.routing.eta=Estimated time of arrival in {0}: {1}
+cargo.routing.nextexpact.LOAD=Next expected activity is to load cargo onto voyage {0} in {1}
+cargo.routing.nextexpact.UNLOAD=Next expected activity is to unload cargo off of voyage {0} in {1}
+cargo.routing.nextexpact.RECEIVE=Next expected activity is to receive cargo in {0}
+cargo.routing.nextexpact.CLAIM=Next expected activity is to claim cargo in {0}
+cargo.routing.nextexpact.CUSTOMS=Next expected activity is to customs cargo in {0}
+cargo.routing.nextexpact.unknown=Next expected activity is unknown
+
+cargo.admin.header=Cargo Administration
+cargo.admin.tablecaption=All cargos
+cargo.admin.tableheader.trackingid=Tracking ID
+cargo.admin.tableheader.origin=Origin
+cargo.admin.tableheader.destination=Destination
+cargo.admin.tableheader.routed=Routed
+cargo.admin.tableheader.arrivaldeadline=Arrival deadline:
+cargo.admin.details.caption=Details for cargo
+cargo.admin.details.picknewdest=Change destination
+cargo.admin.details.arrivaldeadline=Arrival deadline
+cargo.admin.details.selectitinerary=Route this cargo
+cargo.admin.details.reroute=reroute this cargo
+cargo.admin.details.misrouted=Cargo is misrouted
+cargo.admin.details.itinerary=Itinerary
+cargo.admin.details.voyageno=Voyage number
+cargo.admin.details.load=Load
+cargo.admin.details.unload=Unload
+cargo.admin.newdest.change=Change destination for cargo
+cargo.admin.newdest.currentdest=Current destination
+cargo.admin.newdest.newdest=New destination
+cargo.admin.newdest.submit=Change destination
+cargo.admin.register.caption=Book new cargo
+cargo.admin.register.book=Book
+cargo.admin.itinerary.caption=Select route
+cargo.admin.itinerary.summary=Cargo {0} is going from {1} to {2}
+cargo.admin.itinerary.noroutecandidates=No routes found that satisfy the route specification. Try setting an arrival deadline further into the future (a few weeks at least).
+cargo.admin.itinerary.routecandidatecaption=Route candidate {0}
+cargo.admin.itinerary.voyage=Voyage
+cargo.admin.itinerary.submit=Assign cargo to this route
+
+misc.yes=Yes
+misc.no=No
+misc.from=From
+misc.to=To
+
+error.required=The tracking id must not be empty
+cargo.unknown_id=Unknown tracking id
\ No newline at end of file
diff --git a/src/main/resources/messages_sv.properties b/src/main/resources/messages_sv.properties
new file mode 100644
index 000000000..11fcafc60
--- /dev/null
+++ b/src/main/resources/messages_sv.properties
@@ -0,0 +1,72 @@
+cargo.status.NOT_RECEIVED=Ej mottagen
+cargo.status.IN_PORT=I hamn {0}
+cargo.status.ONBOARD_CARRIER=Ombord på resa {0}
+cargo.status.CLAIMED=Upphämtad
+cargo.status.UNKNOWN=Okänt
+
+cargo.misrouted=Rutt felplanerad
+cargo.notrouted=Ej ruttplanerad
+
+deliveryHistory.eventDescription.NOT_RECEIVED=Godset har ännu ej anlänt.
+
+deliveryHistory.eventDescription.LOAD=Lastad på resa {0} i {1}, vid {2}.
+deliveryHistory.eventDescription.UNLOAD=Avlastad från resa {0} i {1}, vid {2}.
+deliveryHistory.eventDescription.RECEIVE=Mottagen i {0}, vid {1}.
+deliveryHistory.eventDescription.CLAIM=Upphämtad i {0}, vid {1}.
+deliveryHistory.eventDescription.CUSTOMS=Har förtullats i {0}, vid {1}.
+
+booking.header=Godsbokning och ruttplanering
+booking.listall=Lista allt gods
+booking.booknew=Boka nytt gods
+cargo.tracking.header=Godsspårning
+cargo.tracking.idinput=Skriv in spårningsid:
+cargo.tracking.submitbutton=Spåra!
+cargo.tracking.hint=Tips: Prova att söka på "ABC123" eller "JKL567".
+cargo.tracking.handlinghistory=Hanteringshistorik
+cargo.tracking.misdirected=Godset är felskickat
+cargo.routing.result=Godset {0} är nu: {1}
+cargo.routing.eta=Beräknad ankomsttid till {0}: {1}
+cargo.routing.nextexpact.LOAD=Nästa förväntade aktivitet är att lasta godset ombord på resa {0} i {1}
+cargo.routing.nextexpact.UNLOAD=Nästa förväntade aktivitet är att lasta av godset från resa {0} i {1}
+cargo.routing.nextexpact.RECEIVE=Nästa förväntade aktivitet är att motta godset in {0}
+cargo.routing.nextexpact.CLAIM=Nästa förväntade aktivitet är att upphämta godset i {0}
+cargo.routing.nextexpact.CUSTOMS=Nästa förväntade aktivitet är att förtulla godset i {0}
+cargo.routing.nextexpact.unknown=Nästa förväntade aktivitet är okänd
+
+cargo.admin.header=Godsadministration
+cargo.admin.tablecaption=Allt gods
+cargo.admin.tableheader.trackingid=Spårningsid
+cargo.admin.tableheader.origin=Ursprung
+cargo.admin.tableheader.destination=Destination
+cargo.admin.tableheader.routed=Ruttplanerad
+cargo.admin.tableheader.arrivaldeadline=Ankomstdeadline:
+cargo.admin.details.caption=Detaljer för godset
+cargo.admin.details.picknewdest=Ändra destination
+cargo.admin.details.arrivaldeadline=Ankomstdeadline
+cargo.admin.details.selectitinerary=Ruttplanera detta gods
+cargo.admin.details.reroute=omplanera rutt för detta gods
+cargo.admin.details.misrouted=Godsets rutt är felplanerad
+cargo.admin.details.itinerary=Resplan
+cargo.admin.details.voyageno=Resenummer
+cargo.admin.details.load=Lasta
+cargo.admin.details.unload=Lasta av
+cargo.admin.newdest.change=Ändra destination för godset {0}
+cargo.admin.newdest.currentdest=Nuvarande destination
+cargo.admin.newdest.newdest=Ny destination
+cargo.admin.newdest.submit=Ändra destination
+cargo.admin.register.caption=Boka nytt gods
+cargo.admin.register.book=Boka
+cargo.admin.itinerary.caption=Välj rutt
+cargo.admin.itinerary.summary=Godset {0} färdas från {1} till {2}
+cargo.admin.itinerary.noroutecandidates=Inga rutter hittades som uppfyller ruttspecifikationen. Prova att välja en ankomstdeadline längre in i framtiden (åtminstone ett par veckor fram).
+cargo.admin.itinerary.routecandidatecaption=Ruttkandidater {0}
+cargo.admin.itinerary.voyage=Resa
+cargo.admin.itinerary.submit=Tilldela rutten till godset
+
+misc.yes=Ja
+misc.no=Nej
+misc.from=Från
+misc.to=Till
+
+error.required=Spårningsid:t får inte vara tomt
+cargo.unknown_id=Okänt spårningsid
\ No newline at end of file
diff --git a/src/main/resources/templates/admin/list.html b/src/main/resources/templates/admin/list.html
index 934f75f2b..04d116d1e 100644
--- a/src/main/resources/templates/admin/list.html
+++ b/src/main/resources/templates/admin/list.html
@@ -4,7 +4,7 @@
       xmlns:th="http://www.thymeleaf.org">
 
 <head>
-    <title>Cargo Administration</title>
+    <title th:text="#{cargo.admin.header}">Cargo Administration</title>
     <link rel="stylesheet" type="text/css" th:href="@{/admin.css}"/>
 </head>
 
@@ -13,13 +13,13 @@
     <div th:replace="adminDecorator :: adminbody"/>
     <div id="body">
         <table border="1" width="600">
-            <caption>All cargos</caption>
+            <caption th:text="#{cargo.admin.tablecaption}">All cargos</caption>
             <thead>
             <tr>
-                <td>Tracking ID</td>
-                <td>Origin</td>
-                <td>Destination</td>
-                <td>Routed</td>
+                <td th:text="#{cargo.admin.tableheader.trackingid}">Tracking ID</td>
+                <td th:text="#{cargo.admin.tableheader.origin}">Origin</td>
+                <td th:text="#{cargo.admin.tableheader.destination}">Destination</td>
+                <td th:text="#{cargo.admin.tableheader.routed}">Routed</td>
             </tr>
             </thead>
             <tbody>
@@ -30,7 +30,7 @@
                 </td>
                 <td th:text="${cargo.origin}">Origin</td>
                 <td th:text="${cargo.finalDestination}">Final destination</td>
-                <td th:text="(${cargo.misrouted} ? 'Misrouted' : '') + (${cargo.routed} ? 'Yes' : 'No')"></td>
+                <td th:text="(${cargo.misrouted} ? #{cargo.misrouted} : '') + (${cargo.routed} ? #{misc.yes} : #{misc.no})">Routed</td>
             </tr>
             </tbody>
         </table>
diff --git a/src/main/resources/templates/admin/pickNewDestination.html b/src/main/resources/templates/admin/pickNewDestination.html
index 92cfc426e..38b2b5d03 100644
--- a/src/main/resources/templates/admin/pickNewDestination.html
+++ b/src/main/resources/templates/admin/pickNewDestination.html
@@ -4,7 +4,7 @@
       xmlns:th="http://www.thymeleaf.org">
 
 <head>
-    <title>Cargo Administration</title>
+    <title th:text="#{cargo.admin.header}">Cargo Administration</title>
     <link rel="stylesheet" type="text/css" th:href="@{/admin.css}"/>
 
     <style type="text/css">
@@ -20,14 +20,14 @@
   <form th:action="@{/admin/changeDestination}" method="post">
   <input type="hidden" name="trackingId" th:value="${cargo.trackingId}"/>
   <table>
-    <caption>Change destination for cargo <span th:text="${cargo.trackingId}"/></caption>
+    <caption><span th:text="#{cargo.admin.newdest.change}">Change destination for cargo</span> <span th:text="${cargo.trackingId}"/></caption>
     <tbody>
       <tr>
-        <td>Current destination</td>
+        <td th:text="#{cargo.admin.newdest.currentdest}">Current destination</td>
         <td th:text="${cargo.finalDestination}"/>
       </tr>
       <tr>
-        <td>New destination</td>
+        <td th:text="#{cargo.admin.newdest.newdest}">New destination</td>
         <td>
           <select name="unlocode">
             <option th:each="location : ${locations}" th:value="${location.unLocode}" th:text="${location.unLocode}"/>
@@ -39,7 +39,7 @@
       <tr>
         <td> </td>
         <td>
-          <input type="submit" value="Change destination"/>
+          <input type="submit" th:value="#{cargo.admin.newdest.submit}"/>
         </td>
       </tr>
     </tfoot>
diff --git a/src/main/resources/templates/admin/registrationForm.html b/src/main/resources/templates/admin/registrationForm.html
index 0d234a2aa..30d59a67c 100644
--- a/src/main/resources/templates/admin/registrationForm.html
+++ b/src/main/resources/templates/admin/registrationForm.html
@@ -4,7 +4,7 @@
       xmlns:th="http://www.thymeleaf.org">
 
 <head>
-    <title>Cargo Administration</title>
+    <title th:text="#{cargo.admin.header}">Cargo Administration</title>
 
     <link rel="stylesheet" type="text/css" th:href="@{/admin.css}"/>
     <link rel="stylesheet" type="text/css" th:href="@{/css/bootstrap.css}"/>
@@ -15,10 +15,10 @@
 <div id="container">
     <form th:action="@{/admin/register}" method="post">
         <table>
-            <caption>Book new cargo</caption>
+            <caption th:text="#{cargo.admin.register.caption}">Book new cargo</caption>
             <tbody>
             <tr>
-                <td>Origin</td>
+                <td th:text="#{cargo.admin.tableheader.origin}">Origin</td>
                 <td>
                     <select name="originUnlocode">
                         <th:block th:each="unlocode : ${unlocodes}">
@@ -28,7 +28,7 @@
                 </td>
             </tr>
             <tr>
-                <td>Destination</td>
+                <td th:text="#{cargo.admin.tableheader.destination}">Destination</td>
                 <td>
                     <select name="destinationUnlocode">
                         <th:block th:each="unlocode : ${unlocodes}">
@@ -38,7 +38,7 @@
                 </td>
             </tr>
             <tr>
-                <td>Arrival deadline:</td>
+                <td th:text="#{cargo.admin.tableheader.arrivaldeadline}">Arrival deadline:</td>
                 <td>
                     <input name="arrivalDeadline" type="text" size="10" id="arrivalDeadline" th:value="${#dates.format(#dates.createNow(),'dd/MM/yyyy')}"/>
                     <p class="glyphicon glyphicon-calendar"></p>
@@ -49,7 +49,7 @@
             <tr>
                 <td></td>
                 <td>
-                    <input type="submit" value="Book"/>
+                    <input type="submit" th:value="#{cargo.admin.register.book}"/>
                 </td>
             </tr>
             </tfoot>
diff --git a/src/main/resources/templates/admin/selectItinerary.html b/src/main/resources/templates/admin/selectItinerary.html
index 5d30a024a..923bab05f 100644
--- a/src/main/resources/templates/admin/selectItinerary.html
+++ b/src/main/resources/templates/admin/selectItinerary.html
@@ -4,36 +4,35 @@
       xmlns:th="http://www.thymeleaf.org">
 
 <head>
-    <title>Cargo Administration</title>
+    <title th:text="#{cargo.admin.header}">Cargo Administration</title>
     <link rel="stylesheet" type="text/css" th:href="@{/admin.css}"/>
 </head>
 <body>
 <div th:replace="adminDecorator :: adminbody"/>
 <div id="container">
     <table>
-        <caption>Select route</caption>
+        <caption th:text="#{cargo.admin.itinerary.caption}">Select route</caption>
         <tr>
-            <td>
-                Cargo <span th:text="${cargo.trackingId}"/> is going from <span th:text="${cargo.origin}"/> to <span
-                    th:text="${cargo.finalDestination}"/>
+            <td th:text="${cargo.getSelectItinerarySummaryText(messageSource, locale)}">
+                Cargo (trackingId) is going from (origin) to (final destination)
             </td>
         </tr>
     </table>
 
-    <p th:if="${#lists.isEmpty(routeCandidates)}">No routes found that satisfy the route specification.
-        Try setting an arrival deadline futher into the future (a few weeks at least).
+    <p th:if="${#lists.isEmpty(routeCandidates)}" th:text="#{cargo.admin.itinerary.noroutecandidates}">No routes found that satisfy the route specification.
+        Try setting an arrival deadline further into the future (a few weeks at least).
     </p>
 
     <form th:each="it,itStatus : ${routeCandidates}" th:action="@{/admin/assignItinerary}" method="post">
         <input type="hidden" name="trackingId" th:value="${cargo.trackingId}"/>
         <table>
-            <caption>Route candidate <span th:text="${itStatus.count}"/></caption>
+            <caption th:text="${cargo.getRouteCandidateCaption(itStatus.count, messageSource, locale)}">Route candidate <span th:text="${itStatus.count}"/></caption>
             <thead>
             <tr>
-                <td>Voyage</td>
-                <td>From</td>
+                <td th:text="#{cargo.admin.itinerary.voyage}">Voyage</td>
+                <td th:text="#{misc.from}">From</td>
                 <td></td>
-                <td>To</td>
+                <td th:text="#{misc.to}">To</td>
                 <td></td>
             </tr>
             </thead>
@@ -60,7 +59,7 @@
             <tr>
                 <td colspan="3">
                     <p>
-                        <input type="submit" value="Assign cargo to this route"/>
+                        <input type="submit" th:value="#{cargo.admin.itinerary.submit}"/>
                     </p>
                 </td>
             </tr>
diff --git a/src/main/resources/templates/admin/show.html b/src/main/resources/templates/admin/show.html
index a63054194..dcfa894db 100644
--- a/src/main/resources/templates/admin/show.html
+++ b/src/main/resources/templates/admin/show.html
@@ -4,7 +4,7 @@
       xmlns:th="http://www.thymeleaf.org">
 
 <head>
-    <title>Cargo Administration</title>
+    <title th:text="#{cargo.admin.header}">Cargo Administration</title>
 
     <link rel="stylesheet" type="text/css" th:href="@{/admin.css}"/>
 </head>
@@ -12,24 +12,24 @@
 <div th:replace="adminDecorator :: adminbody"/>
 <div id="container">
     <table>
-        <caption th:text="'Details for cargo ' + ${cargo.trackingId}"></caption>
+        <caption th:text="#{cargo.admin.details.caption} + ' ' + ${cargo.trackingId}"></caption>
         <tbody>
         <tr>
-            <td>Origin</td>
+            <td th:text="#{cargo.admin.tableheader.origin}">Origin</td>
             <td th:text="${cargo.origin}"></td>
         </tr>
         <tr>
-            <td>Destination</td>
+            <td th:text="#{cargo.admin.tableheader.destination}">Destination</td>
             <td th:text="${cargo.finalDestination}"></td>
         </tr>
         <tr>
             <td></td>
             <td>
-                <a th:href="@{/admin/pickNewDestination(trackingId=${cargo.trackingId})}">Change destination</a>
+                <a th:href="@{/admin/pickNewDestination(trackingId=${cargo.trackingId})}" th:text="#{cargo.admin.details.picknewdest}">Change destination</a>
             </td>
         </tr>
         <tr>
-            <td>Arrival deadline</td>
+            <td th:text="#{cargo.admin.details.arrivaldeadline}">Arrival deadline</td>
             <td th:text="${#temporals.format(cargo.arrivalDeadline,'dd/MM/yyyy')}"/>
         </tr>
         </tbody>
@@ -37,16 +37,16 @@
     <p></p>
     <th:block th:if="${cargo.routed}">
         <th:block th:if="${cargo.misrouted}">
-            <p><em>Cargo is misrouted - <a th:href="@{/admin/selectItinerary(trackingId=${cargo.trackingId})}">reroute
-                this cargo</a></em></p>
+            <p><em th:text="#{cargo.admin.details.misrouted}">Cargo is misrouted</em> - <a th:href="@{/admin/selectItinerary(trackingId=${cargo.trackingId})}" th:text="#{cargo.admin.details.reroute}" style="font-weight: italic;">reroute
+                this cargo</a></p>
         </th:block>
         <table border="1">
-            <caption>Itinerary</caption>
+            <caption th:text="#{cargo.admin.details.itinerary}">Itinerary</caption>
             <thead>
             <tr>
-                <td>Voyage number</td>
-                <td colspan="2">Load</td>
-                <td colspan="2">Unload</td>
+                <td th:text="#{cargo.admin.details.voyageno}">Voyage number</td>
+                <td colspan="2" th:text="#{cargo.admin.details.load}">Load</td>
+                <td colspan="2" th:text="#{cargo.admin.details.unload}">Unload</td>
             </tr>
             </thead>
             <tbody>
@@ -62,7 +62,7 @@
     </th:block>
     <th:block th:if="${!cargo.routed}">
         <p>
-            <strong>Not routed</strong> - <a th:href="@{/admin/selectItinerary(trackingId=${cargo.trackingId})}">Route this cargo</a>
+            <strong th:text="#{cargo.notrouted}">Not routed</strong> - <a th:href="@{/admin/selectItinerary(trackingId=${cargo.trackingId})}" th:text="#{cargo.admin.details.selectitinerary}">Route this cargo</a>
         </p>
     </th:block>
 </div>
diff --git a/src/main/resources/templates/adminDecorator.html b/src/main/resources/templates/adminDecorator.html
index b48b5aec7..2fc7aa6b4 100644
--- a/src/main/resources/templates/adminDecorator.html
+++ b/src/main/resources/templates/adminDecorator.html
@@ -6,15 +6,15 @@
 <body>
 <th:block th:fragment="adminbody">
     <img id="logotype" th:src="@{/images/dddsample_logotype_small.png}" alt=""/>
-    <h1>Cargo Booking and Routing</h1>
+    <h1><td th:text="#{booking.header}">Cargo Booking and Routing</td></h1>
     <ul id="menu">
         <li>
-            <a th:href="@{/admin/list}">
+            <a th:href="@{/admin/list}" th:text="#{booking.listall}">
                 List all cargos
             </a>
         </li>
         <li>
-            <a th:href="@{/admin/registration}">
+            <a th:href="@{/admin/registration}" th:text="#{booking.booknew}">
                 Book new cargo
             </a>
         </li>
diff --git a/src/main/resources/templates/track.html b/src/main/resources/templates/track.html
index 0dcee72ad..a5a730b13 100644
--- a/src/main/resources/templates/track.html
+++ b/src/main/resources/templates/track.html
@@ -4,7 +4,7 @@
       xmlns:th="http://www.thymeleaf.org">
 
 <head>
-    <title>Tracking cargo</title>
+    <title th:text="#{cargo.tracking.header}">Tracking cargo</title>
     <link rel="stylesheet" type="text/css" th:href="@{/style.css}"/>
 </head>
 
@@ -19,14 +19,14 @@
                 <form method="post" th:object="${trackCommand}">
                     <table>
                         <tr>
-                            <td>
+                            <td th:text="#{cargo.tracking.idinput}">
                                 Enter your tracking id:
                             </td>
                             <td>
                                 <input th:field="*{trackingId}" id="idInput"/>
                             </td>
                             <td>
-                                <input type="submit" value="Track!"/>
+                                <input type="submit" value="Track!" th:value="#{cargo.tracking.submitbutton}"/>
                             </td>
                         </tr>
                         <tr>
@@ -40,28 +40,19 @@
                 </form>
             </div>
 
-            <p th:if="${cargo == null}"><em>Hint: try tracking "ABC123" or "JKL567".</em></p>
+            <p th:if="${cargo == null}"><em th:text="#{cargo.tracking.hint}">Hint: try tracking "ABC123" or "JKL567".</em></p>
 
             <div id="result" th:if="${cargo != null}">
-                <h2>Cargo
-                    <th:block th:text="${cargo.getTrackingId()}">tracking id</th:block>
-                    is now:
-                    <th:block th:text="${cargo.getStatusText()}">status text</th:block>
-                </h2>
+                <h2 th:text="${cargo.getStatusDescriptionText()}"></h2>
 
-                <p>
-                    Estimated time of arrival in
-                    <th:block th:text="${cargo.destination}">destination</th:block>
-                    :
-                    <th:block th:text="${cargo.eta}">eta</th:block>
-                </p>
+                <p th:text="${cargo.getEtaText()}"></p>
 
                 <p th:text="${cargo.nextExpectedActivity}">${cargo.nextExpectedActivity}</p>
 
-                <p th:if="${cargo.isMisdirected()}" class="notify"><img th:src="@{/images/error.png}" alt=""/>Cargo is misdirected</p>
+                <p th:if="${cargo.isMisdirected()}" class="notify" th:text="#{cargo.tracking.misdirected}"><img th:src="@{/images/error.png}" alt=""/>Cargo is misdirected</p>
 
                 <th:block th:if="${!cargo.events.isEmpty()}">
-                    <h3>Handling History</h3>
+                    <h3 th:text="#{cargo.tracking.handlinghistory}">Handling History</h3>
                     <ul style="list-style-type: none;">
                         <li th:each="leg : ${cargo.events}">
                             <p>

From a0bd9b368473ba6da6209867c3f123a7ee044cb8 Mon Sep 17 00:00:00 2001
From: orende <1337decker@gmail.com>
Date: Thu, 27 Oct 2022 14:32:29 +0200
Subject: [PATCH 02/15] Move getSelectItinerarySummaryText and
 getRouteCandidateCaption from CargoRoutingDTO to CargoAdminViewAdapter

---
 .../booking/facade/dto/CargoRoutingDTO.java   |  2 --
 .../booking/web/CargoAdminController.java     | 10 +++-----
 .../booking/web/CargoAdminViewAdapter.java    | 24 +++++++++++++++++++
 .../templates/admin/selectItinerary.html      |  4 ++--
 4 files changed, 29 insertions(+), 11 deletions(-)
 create mode 100644 src/main/java/se/citerus/dddsample/interfaces/booking/web/CargoAdminViewAdapter.java

diff --git a/src/main/java/se/citerus/dddsample/interfaces/booking/facade/dto/CargoRoutingDTO.java b/src/main/java/se/citerus/dddsample/interfaces/booking/facade/dto/CargoRoutingDTO.java
index 21b3515ff..e76efff0a 100644
--- a/src/main/java/se/citerus/dddsample/interfaces/booking/facade/dto/CargoRoutingDTO.java
+++ b/src/main/java/se/citerus/dddsample/interfaces/booking/facade/dto/CargoRoutingDTO.java
@@ -1,7 +1,5 @@
 package se.citerus.dddsample.interfaces.booking.facade.dto;
 
-import org.springframework.context.MessageSource;
-
 import java.io.Serializable;
 import java.time.Instant;
 import java.time.ZoneOffset;
diff --git a/src/main/java/se/citerus/dddsample/interfaces/booking/web/CargoAdminController.java b/src/main/java/se/citerus/dddsample/interfaces/booking/web/CargoAdminController.java
index 2060d8a2d..4dd6881f1 100644
--- a/src/main/java/se/citerus/dddsample/interfaces/booking/web/CargoAdminController.java
+++ b/src/main/java/se/citerus/dddsample/interfaces/booking/web/CargoAdminController.java
@@ -57,10 +57,9 @@ private void initBinder(HttpServletRequest request, ServletRequestDataBinder bin
 
     @RequestMapping("/registration")
     public String registration(HttpServletRequest request, HttpServletResponse response, Map<String, Object> model) throws Exception {
-        model.putAll(ImmutableMap.of("messageSource", messageSource, "locale", RequestContextUtils.getLocale(request)));
         List<LocationDTO> dtoList = bookingServiceFacade.listShippingLocations();
 
-        List<String> unLocodeStrings = new ArrayList<String>();
+        List<String> unLocodeStrings = new ArrayList<>();
 
         for (LocationDTO dto : dtoList) {
             unLocodeStrings.add(dto.getUnLocode());
@@ -84,7 +83,6 @@ public void register(HttpServletRequest request, HttpServletResponse response,
 
     @RequestMapping("/list")
     public String list(HttpServletRequest request, HttpServletResponse response, Map<String, Object> model) throws Exception {
-        model.putAll(ImmutableMap.of("messageSource", messageSource, "locale", RequestContextUtils.getLocale(request)));
         List<CargoRoutingDTO> cargoList = bookingServiceFacade.listAllCargos();
 
         model.put("cargoList", cargoList);
@@ -93,7 +91,6 @@ public String list(HttpServletRequest request, HttpServletResponse response, Map
 
     @RequestMapping("/show")
     public String show(HttpServletRequest request, HttpServletResponse response, Map<String, Object> model) throws Exception {
-        model.putAll(ImmutableMap.of("messageSource", messageSource, "locale", RequestContextUtils.getLocale(request)));
         String trackingId = request.getParameter("trackingId");
         CargoRoutingDTO dto = bookingServiceFacade.loadCargoForRouting(trackingId);
         model.put("cargo", dto);
@@ -102,7 +99,7 @@ public String show(HttpServletRequest request, HttpServletResponse response, Map
 
     @RequestMapping("/selectItinerary")
     public String selectItinerary(HttpServletRequest request, HttpServletResponse response, Map<String, Object> model) throws Exception {
-        model.putAll(ImmutableMap.of("messageSource", messageSource, "locale", RequestContextUtils.getLocale(request)));
+        model.put("viewAdapter", new CargoAdminViewAdapter(messageSource, RequestContextUtils.getLocale(request)));
         String trackingId = request.getParameter("trackingId");
 
         List<RouteCandidateDTO> routeCandidates = bookingServiceFacade.requestPossibleRoutesForCargo(trackingId);
@@ -116,7 +113,7 @@ public String selectItinerary(HttpServletRequest request, HttpServletResponse re
 
     @RequestMapping(value = "/assignItinerary", method = RequestMethod.POST)
     public void assignItinerary(HttpServletRequest request, HttpServletResponse response, RouteAssignmentCommand command) throws Exception {
-        List<LegDTO> legDTOs = new ArrayList<LegDTO>(command.getLegs().size());
+        List<LegDTO> legDTOs = new ArrayList<>(command.getLegs().size());
         for (RouteAssignmentCommand.LegCommand leg : command.getLegs()) {
             legDTOs.add(new LegDTO(
                 leg.getVoyageNumber(),
@@ -136,7 +133,6 @@ public void assignItinerary(HttpServletRequest request, HttpServletResponse resp
 
     @RequestMapping(value = "/pickNewDestination")
     public String pickNewDestination(HttpServletRequest request, HttpServletResponse response, Map<String, Object> model) throws Exception {
-        model.putAll(ImmutableMap.of("messageSource", messageSource, "locale", RequestContextUtils.getLocale(request)));
         List<LocationDTO> locations = bookingServiceFacade.listShippingLocations();
         model.put("locations", locations);
 
diff --git a/src/main/java/se/citerus/dddsample/interfaces/booking/web/CargoAdminViewAdapter.java b/src/main/java/se/citerus/dddsample/interfaces/booking/web/CargoAdminViewAdapter.java
new file mode 100644
index 000000000..bc47c8377
--- /dev/null
+++ b/src/main/java/se/citerus/dddsample/interfaces/booking/web/CargoAdminViewAdapter.java
@@ -0,0 +1,24 @@
+package se.citerus.dddsample.interfaces.booking.web;
+
+import org.springframework.context.MessageSource;
+import se.citerus.dddsample.interfaces.booking.facade.dto.CargoRoutingDTO;
+
+import java.util.Locale;
+
+public class CargoAdminViewAdapter {
+    private final MessageSource messageSource;
+    private final Locale locale;
+
+    public CargoAdminViewAdapter(MessageSource messageSource, Locale locale) {
+        this.messageSource = messageSource;
+        this.locale = locale;
+    }
+
+    public String getSelectItinerarySummaryText(CargoRoutingDTO cargo) {
+        return messageSource.getMessage("cargo.admin.itinerary.summary", new Object[]{cargo.getTrackingId(), cargo.getOrigin(), cargo.getFinalDestination()}, locale);
+    }
+
+    public String getRouteCandidateCaption(Integer index) {
+        return messageSource.getMessage("cargo.admin.itinerary.routecandidatecaption", new Object[]{index}, locale);
+    }
+}
diff --git a/src/main/resources/templates/admin/selectItinerary.html b/src/main/resources/templates/admin/selectItinerary.html
index 923bab05f..b4c6b2954 100644
--- a/src/main/resources/templates/admin/selectItinerary.html
+++ b/src/main/resources/templates/admin/selectItinerary.html
@@ -13,7 +13,7 @@
     <table>
         <caption th:text="#{cargo.admin.itinerary.caption}">Select route</caption>
         <tr>
-            <td th:text="${cargo.getSelectItinerarySummaryText(messageSource, locale)}">
+            <td th:text="${viewAdapter.getSelectItinerarySummaryText(cargo)}">
                 Cargo (trackingId) is going from (origin) to (final destination)
             </td>
         </tr>
@@ -26,7 +26,7 @@
     <form th:each="it,itStatus : ${routeCandidates}" th:action="@{/admin/assignItinerary}" method="post">
         <input type="hidden" name="trackingId" th:value="${cargo.trackingId}"/>
         <table>
-            <caption th:text="${cargo.getRouteCandidateCaption(itStatus.count, messageSource, locale)}">Route candidate <span th:text="${itStatus.count}"/></caption>
+            <caption th:text="${viewAdapter.getRouteCandidateCaption(itStatus.count)}">Route candidate <span th:text="${itStatus.count}"/></caption>
             <thead>
             <tr>
                 <td th:text="#{cargo.admin.itinerary.voyage}">Voyage</td>

From 0c85d80b93ff39e23ef98fceec5ce7c3bc99a8e2 Mon Sep 17 00:00:00 2001
From: orende <1337decker@gmail.com>
Date: Thu, 27 Oct 2022 15:55:21 +0200
Subject: [PATCH 03/15] Replace FixedLocaleResolver with
 AcceptHeaderLocaleResolver to enable multiple locales

---
 .../interfaces/InterfacesApplicationContext.java  | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/main/java/se/citerus/dddsample/interfaces/InterfacesApplicationContext.java b/src/main/java/se/citerus/dddsample/interfaces/InterfacesApplicationContext.java
index 9685bef5a..cc01d0e8c 100644
--- a/src/main/java/se/citerus/dddsample/interfaces/InterfacesApplicationContext.java
+++ b/src/main/java/se/citerus/dddsample/interfaces/InterfacesApplicationContext.java
@@ -12,9 +12,10 @@
 import org.springframework.lang.Nullable;
 import org.springframework.orm.jpa.support.OpenEntityManagerInViewInterceptor;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+import org.springframework.web.servlet.LocaleResolver;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.i18n.FixedLocaleResolver;
+import org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver;
 import se.citerus.dddsample.application.ApplicationEvents;
 import se.citerus.dddsample.application.BookingService;
 import se.citerus.dddsample.domain.model.cargo.CargoRepository;
@@ -30,6 +31,7 @@
 import se.citerus.dddsample.interfaces.tracking.ws.CargoTrackingRestService;
 
 import java.io.File;
+import java.util.Arrays;
 import java.lang.invoke.MethodHandles;
 import java.util.Locale;
 
@@ -54,10 +56,13 @@ public MessageSource messageSource() {
     }
 
     @Bean
-    public FixedLocaleResolver localeResolver() {
-        FixedLocaleResolver fixedLocaleResolver = new FixedLocaleResolver();
-        fixedLocaleResolver.setDefaultLocale(Locale.ENGLISH);
-        return fixedLocaleResolver;
+    public LocaleResolver localeResolver() {
+        AcceptHeaderLocaleResolver localeResolver = new AcceptHeaderLocaleResolver();
+        localeResolver.setDefaultLocale(Locale.ENGLISH);
+        localeResolver.setSupportedLocales(Arrays.asList(
+                new Locale("sv", "SE"), // add new locales below
+                Locale.ENGLISH));
+        return localeResolver;
     }
 
     @Bean

From efc6f87192cba46a4bba6ca7431f038fadf86b77 Mon Sep 17 00:00:00 2001
From: orende <1337decker@gmail.com>
Date: Thu, 27 Oct 2022 20:12:02 +0200
Subject: [PATCH 04/15] Fix invalid color value in stylesheet

---
 src/main/resources/static/style.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/static/style.css b/src/main/resources/static/style.css
index b26d11128..f0073f9f7 100644
--- a/src/main/resources/static/style.css
+++ b/src/main/resources/static/style.css
@@ -165,7 +165,7 @@ input.button {
   background: #ccc;
   border-width: 1px;
   border-style: solid;
-  border-color: #888 #888 #8880 #888;
+  border-color: #888 #888 #888 #888;
 }
 
 input.radio {

From 1873fc849c9eea54194b3ed1d410b08728f9de8b Mon Sep 17 00:00:00 2001
From: orende <1337decker@gmail.com>
Date: Wed, 2 Nov 2022 20:33:28 +0800
Subject: [PATCH 05/15] Add customer acceptance test to verify missing id
 validation on tracking page

---
 .../citerus/dddsample/acceptance/CustomerAcceptanceTest.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/test/java/se/citerus/dddsample/acceptance/CustomerAcceptanceTest.java b/src/test/java/se/citerus/dddsample/acceptance/CustomerAcceptanceTest.java
index 20a8d04e2..4e5ecffd0 100644
--- a/src/test/java/se/citerus/dddsample/acceptance/CustomerAcceptanceTest.java
+++ b/src/test/java/se/citerus/dddsample/acceptance/CustomerAcceptanceTest.java
@@ -34,4 +34,9 @@ public void customerSiteNotifiesOnMisdirectedCargo() {
         customerPage.expectNotificationOf("Cargo is misdirected");
     }
 
+    @Test
+    public void customerSiteErrorsOnEmptyTrackingId() {
+        customerPage.trackCargoWithIdOf("");
+        customerPage.expectErrorFor("The tracking id must not be empty");
+    }
 }

From 46b07afd17fd97d267827111f3039a70934c9af8 Mon Sep 17 00:00:00 2001
From: orende <1337decker@gmail.com>
Date: Thu, 2 Mar 2023 12:23:59 +0800
Subject: [PATCH 06/15] Use modern DOCTYPE and specify charset in index.html

---
 src/main/resources/static/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html
index beb15e274..4b4477ef6 100644
--- a/src/main/resources/static/index.html
+++ b/src/main/resources/static/index.html
@@ -1,8 +1,8 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
-    <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
+    <meta charset="UTF-8"/>
     <title>DDDSample</title>
 </head>
 <body style="padding: 20px">

From dccc03612e1c0e52b22e5c3139c3a37e775db38c Mon Sep 17 00:00:00 2001
From: orende <1337decker@gmail.com>
Date: Thu, 2 Mar 2023 12:24:14 +0800
Subject: [PATCH 07/15] Add simplified chinese translation

---
 .../InterfacesApplicationContext.java         |  8 ++-
 src/main/resources/messages_zh.properties     | 72 +++++++++++++++++++
 2 files changed, 77 insertions(+), 3 deletions(-)
 create mode 100644 src/main/resources/messages_zh.properties

diff --git a/src/main/java/se/citerus/dddsample/interfaces/InterfacesApplicationContext.java b/src/main/java/se/citerus/dddsample/interfaces/InterfacesApplicationContext.java
index cc01d0e8c..12e372f9d 100644
--- a/src/main/java/se/citerus/dddsample/interfaces/InterfacesApplicationContext.java
+++ b/src/main/java/se/citerus/dddsample/interfaces/InterfacesApplicationContext.java
@@ -31,8 +31,8 @@
 import se.citerus.dddsample.interfaces.tracking.ws.CargoTrackingRestService;
 
 import java.io.File;
-import java.util.Arrays;
 import java.lang.invoke.MethodHandles;
+import java.util.Arrays;
 import java.util.Locale;
 
 @Configuration
@@ -52,6 +52,7 @@ public class InterfacesApplicationContext implements WebMvcConfigurer {
     public MessageSource messageSource() {
         ResourceBundleMessageSource messageSource = new ResourceBundleMessageSource();
         messageSource.setBasename("messages");
+        messageSource.setDefaultEncoding("UTF-8");
         return messageSource;
     }
 
@@ -59,8 +60,9 @@ public MessageSource messageSource() {
     public LocaleResolver localeResolver() {
         AcceptHeaderLocaleResolver localeResolver = new AcceptHeaderLocaleResolver();
         localeResolver.setDefaultLocale(Locale.ENGLISH);
-        localeResolver.setSupportedLocales(Arrays.asList(
-                new Locale("sv", "SE"), // add new locales below
+        localeResolver.setSupportedLocales(Arrays.asList( // add new locales below
+                new Locale("sv", "SE"),
+                Locale.SIMPLIFIED_CHINESE,
                 Locale.ENGLISH));
         return localeResolver;
     }
diff --git a/src/main/resources/messages_zh.properties b/src/main/resources/messages_zh.properties
new file mode 100644
index 000000000..b15ba5a7d
--- /dev/null
+++ b/src/main/resources/messages_zh.properties
@@ -0,0 +1,72 @@
+cargo.status.NOT_RECEIVED=???
+cargo.status.IN_PORT=???{0}
+cargo.status.ONBOARD_CARRIER=????{0}
+cargo.status.CLAIMED=??
+cargo.status.UNKNOWN=??
+
+cargo.misrouted=????
+cargo.notrouted=????
+
+deliveryHistory.eventDescription.NOT_RECEIVED=?????.
+
+deliveryHistory.eventDescription.LOAD=?????{0}?{1}?{2}.
+deliveryHistory.eventDescription.UNLOAD=?????{0}?{1}?{2}.
+deliveryHistory.eventDescription.RECEIVE=???{0}?{1}.
+deliveryHistory.eventDescription.CLAIM=???{0}?{1}.
+deliveryHistory.eventDescription.CUSTOMS=???{0}?{1}.
+
+booking.header=?????????
+booking.listall=????
+booking.booknew=?????
+cargo.tracking.header=????
+cargo.tracking.idinput=??????:
+cargo.tracking.submitbutton=??!
+cargo.tracking.hint=??????"ABC123"?"JKL567".
+cargo.tracking.handlinghistory=??????
+cargo.tracking.misdirected=???????
+cargo.routing.result=??{0}????:{1}
+cargo.routing.eta=??{0}???????: {1}
+cargo.routing.nextexpact.LOAD=??????{1}???{0}??
+cargo.routing.nextexpact.UNLOAD=??????{1}???{0}??
+cargo.routing.nextexpact.RECEIVE=??????{0}????
+cargo.routing.nextexpact.CLAIM=??????{0}????
+cargo.routing.nextexpact.CUSTOMS=??????{0}??
+cargo.routing.nextexpact.unknown=??????
+
+cargo.admin.header=????
+cargo.admin.tablecaption=????
+cargo.admin.tableheader.trackingid=????
+cargo.admin.tableheader.origin=??
+cargo.admin.tableheader.destination=??
+cargo.admin.tableheader.routed=?????
+cargo.admin.tableheader.arrivaldeadline=????:
+cargo.admin.details.caption=????
+cargo.admin.details.picknewdest=????
+cargo.admin.details.arrivaldeadline=????
+cargo.admin.details.selectitinerary=?????
+cargo.admin.details.reroute=??
+cargo.admin.details.misrouted=???????
+cargo.admin.details.itinerary=???
+cargo.admin.details.voyageno=????
+cargo.admin.details.load=??
+cargo.admin.details.unload=??
+cargo.admin.newdest.change=???????
+cargo.admin.newdest.currentdest=????
+cargo.admin.newdest.newdest=???
+cargo.admin.newdest.submit=??
+cargo.admin.register.caption=?????
+cargo.admin.register.book=??
+cargo.admin.itinerary.caption=????
+cargo.admin.itinerary.summary=??{0}?{1}?{2}??
+cargo.admin.itinerary.noroutecandidates=???????????????????????????
+cargo.admin.itinerary.routecandidatecaption=????{0}
+cargo.admin.itinerary.voyage=??
+cargo.admin.itinerary.submit=????????
+
+misc.yes=?
+misc.no=?
+misc.from=??
+misc.to=??
+
+error.required=????????
+cargo.unknown_id=??????
\ No newline at end of file

From bbf37bfb6a52c68eb2db7e6d3799abee942ea8fb Mon Sep 17 00:00:00 2001
From: orende <1337decker@gmail.com>
Date: Sat, 4 Mar 2023 11:45:37 +0800
Subject: [PATCH 08/15] Add locale change interceptor and replace locale
 resolver with custom implementation

---
 .../InterfacesApplicationContext.java         | 40 +++++++++++++++----
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/main/java/se/citerus/dddsample/interfaces/InterfacesApplicationContext.java b/src/main/java/se/citerus/dddsample/interfaces/InterfacesApplicationContext.java
index 12e372f9d..a88aedc71 100644
--- a/src/main/java/se/citerus/dddsample/interfaces/InterfacesApplicationContext.java
+++ b/src/main/java/se/citerus/dddsample/interfaces/InterfacesApplicationContext.java
@@ -8,6 +8,8 @@
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.i18n.LocaleContext;
+import org.springframework.context.i18n.SimpleLocaleContext;
 import org.springframework.context.support.ResourceBundleMessageSource;
 import org.springframework.lang.Nullable;
 import org.springframework.orm.jpa.support.OpenEntityManagerInViewInterceptor;
@@ -15,7 +17,8 @@
 import org.springframework.web.servlet.LocaleResolver;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver;
+import org.springframework.web.servlet.i18n.AbstractLocaleContextResolver;
+import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 import se.citerus.dddsample.application.ApplicationEvents;
 import se.citerus.dddsample.application.BookingService;
 import se.citerus.dddsample.domain.model.cargo.CargoRepository;
@@ -32,7 +35,6 @@
 
 import java.io.File;
 import java.lang.invoke.MethodHandles;
-import java.util.Arrays;
 import java.util.Locale;
 
 @Configuration
@@ -58,15 +60,38 @@ public MessageSource messageSource() {
 
     @Bean
     public LocaleResolver localeResolver() {
-        AcceptHeaderLocaleResolver localeResolver = new AcceptHeaderLocaleResolver();
+        AbstractLocaleContextResolver localeResolver = new AbstractLocaleContextResolver() {
+            @Override
+            public LocaleContext resolveLocaleContext(HttpServletRequest request) {
+                String[] locales = request.getParameterMap().getOrDefault("lang", new String[]{"en"});
+                String localeName = locales != null && locales.length > 0 ? locales[0] : "";
+                switch (localeName) {
+                    case "sv_SE": return new SimpleLocaleContext(new Locale("sv", "SE"));
+                    case "zh_CN": return new SimpleLocaleContext(Locale.SIMPLIFIED_CHINESE);
+                    case "en": return new SimpleLocaleContext(Locale.ENGLISH);
+                    default: {
+                        log.warn("Got unsupported locale '{}', falling back to default locale '{}'", localeName, this.getDefaultLocale());
+                        return new SimpleLocaleContext(this.getDefaultLocale());
+                    }
+                }
+            }
+
+            @Override
+            public void setLocaleContext(HttpServletRequest request, HttpServletResponse response, LocaleContext localeContext) {
+                // intentionally left blank
+            }
+        };
         localeResolver.setDefaultLocale(Locale.ENGLISH);
-        localeResolver.setSupportedLocales(Arrays.asList( // add new locales below
-                new Locale("sv", "SE"),
-                Locale.SIMPLIFIED_CHINESE,
-                Locale.ENGLISH));
         return localeResolver;
     }
 
+    @Bean
+    public LocaleChangeInterceptor localeChangeInterceptor() {
+        LocaleChangeInterceptor lci = new LocaleChangeInterceptor();
+        lci.setParamName("lang");
+        return lci;
+    }
+
     @Bean
     public CargoTrackingRestService cargoTrackingRestService(CargoRepository cargoRepository, HandlingEventRepository handlingEventRepository, MessageSource messageSource) {
         return new CargoTrackingRestService(cargoRepository, handlingEventRepository, messageSource);
@@ -94,6 +119,7 @@ public void addInterceptors(InterceptorRegistry registry) {
         OpenEntityManagerInViewInterceptor openSessionInViewInterceptor = new OpenEntityManagerInViewInterceptor();
         openSessionInViewInterceptor.setEntityManagerFactory(entityManager.getEntityManagerFactory());
         registry.addWebRequestInterceptor(openSessionInViewInterceptor);
+        registry.addInterceptor(localeChangeInterceptor());
     }
 
     @Bean

From 34977d7bf9aba90140342210fcd42100505cbd93 Mon Sep 17 00:00:00 2001
From: orende <1337decker@gmail.com>
Date: Sat, 4 Mar 2023 12:36:32 +0800
Subject: [PATCH 09/15] Add missing translations, correct some mistakes

---
 src/main/resources/messages_en.properties |   2 +
 src/main/resources/messages_sv.properties |  70 ++++++------
 src/main/resources/messages_zh.properties | 132 +++++++++++-----------
 3 files changed, 105 insertions(+), 99 deletions(-)

diff --git a/src/main/resources/messages_en.properties b/src/main/resources/messages_en.properties
index 5d649f814..47d985acd 100644
--- a/src/main/resources/messages_en.properties
+++ b/src/main/resources/messages_en.properties
@@ -1,3 +1,4 @@
+# this is the default language/locale
 cargo.status.NOT_RECEIVED=Not received
 cargo.status.IN_PORT=In port {0}
 cargo.status.ONBOARD_CARRIER=Onboard voyage {0}
@@ -19,6 +20,7 @@ booking.header=Cargo Booking and Routing
 booking.listall=List all cargos
 booking.booknew=Book new cargo
 cargo.tracking.header=Tracking cargo
+cargo.tracking.footer=This application is written by
 cargo.tracking.idinput=Enter your tracking id:
 cargo.tracking.submitbutton=Track!
 cargo.tracking.hint=Hint: try tracking "ABC123" or "JKL567".
diff --git a/src/main/resources/messages_sv.properties b/src/main/resources/messages_sv.properties
index 11fcafc60..fb231362f 100644
--- a/src/main/resources/messages_sv.properties
+++ b/src/main/resources/messages_sv.properties
@@ -1,72 +1,74 @@
+# Note: file encoding must be UTF-8
 cargo.status.NOT_RECEIVED=Ej mottagen
 cargo.status.IN_PORT=I hamn {0}
-cargo.status.ONBOARD_CARRIER=Ombord på resa {0}
-cargo.status.CLAIMED=Upphämtad
-cargo.status.UNKNOWN=Okänt
+cargo.status.ONBOARD_CARRIER=Ombord på resa {0}
+cargo.status.CLAIMED=Upphämtad
+cargo.status.UNKNOWN=Okänt
 
 cargo.misrouted=Rutt felplanerad
 cargo.notrouted=Ej ruttplanerad
 
-deliveryHistory.eventDescription.NOT_RECEIVED=Godset har ännu ej anlänt.
+deliveryHistory.eventDescription.NOT_RECEIVED=Godset har ännu ej anlänt.
 
-deliveryHistory.eventDescription.LOAD=Lastad på resa {0} i {1}, vid {2}.
-deliveryHistory.eventDescription.UNLOAD=Avlastad från resa {0} i {1}, vid {2}.
+deliveryHistory.eventDescription.LOAD=Lastad på resa {0} i {1}, vid {2}.
+deliveryHistory.eventDescription.UNLOAD=Avlastad från resa {0} i {1}, vid {2}.
 deliveryHistory.eventDescription.RECEIVE=Mottagen i {0}, vid {1}.
-deliveryHistory.eventDescription.CLAIM=Upphämtad i {0}, vid {1}.
-deliveryHistory.eventDescription.CUSTOMS=Har förtullats i {0}, vid {1}.
+deliveryHistory.eventDescription.CLAIM=Upphämtad i {0}, vid {1}.
+deliveryHistory.eventDescription.CUSTOMS=Har förtullats i {0}, vid {1}.
 
 booking.header=Godsbokning och ruttplanering
 booking.listall=Lista allt gods
 booking.booknew=Boka nytt gods
-cargo.tracking.header=Godsspårning
-cargo.tracking.idinput=Skriv in spårningsid:
-cargo.tracking.submitbutton=Spåra!
-cargo.tracking.hint=Tips: Prova att söka på "ABC123" eller "JKL567".
+cargo.tracking.header=Godsspårning
+cargo.tracking.footer=Den här applikation är skapad av
+cargo.tracking.idinput=Skriv in spårningsid:
+cargo.tracking.submitbutton=Spåra!
+cargo.tracking.hint=Tips: Prova att söka på "ABC123" eller "JKL567".
 cargo.tracking.handlinghistory=Hanteringshistorik
-cargo.tracking.misdirected=Godset är felskickat
-cargo.routing.result=Godset {0} är nu: {1}
-cargo.routing.eta=Beräknad ankomsttid till {0}: {1}
-cargo.routing.nextexpact.LOAD=Nästa förväntade aktivitet är att lasta godset ombord på resa {0} i {1}
-cargo.routing.nextexpact.UNLOAD=Nästa förväntade aktivitet är att lasta av godset från resa {0} i {1}
-cargo.routing.nextexpact.RECEIVE=Nästa förväntade aktivitet är att motta godset in {0}
-cargo.routing.nextexpact.CLAIM=Nästa förväntade aktivitet är att upphämta godset i {0}
-cargo.routing.nextexpact.CUSTOMS=Nästa förväntade aktivitet är att förtulla godset i {0}
-cargo.routing.nextexpact.unknown=Nästa förväntade aktivitet är okänd
+cargo.tracking.misdirected=Godset är felskickat
+cargo.routing.result=Godset {0} är nu: {1}
+cargo.routing.eta=Beräknad ankomsttid till {0}: {1}
+cargo.routing.nextexpact.LOAD=Nästa förväntade aktivitet är att lasta godset ombord på resa {0} i {1}
+cargo.routing.nextexpact.UNLOAD=Nästa förväntade aktivitet är att lasta av godset från resa {0} i {1}
+cargo.routing.nextexpact.RECEIVE=Nästa förväntade aktivitet är att motta godset in {0}
+cargo.routing.nextexpact.CLAIM=Nästa förväntade aktivitet är att upphämta godset i {0}
+cargo.routing.nextexpact.CUSTOMS=Nästa förväntade aktivitet är att förtulla godset i {0}
+cargo.routing.nextexpact.unknown=Nästa förväntade aktivitet är okänd
 
 cargo.admin.header=Godsadministration
 cargo.admin.tablecaption=Allt gods
-cargo.admin.tableheader.trackingid=Spårningsid
+cargo.admin.tableheader.trackingid=Spårningsid
 cargo.admin.tableheader.origin=Ursprung
 cargo.admin.tableheader.destination=Destination
 cargo.admin.tableheader.routed=Ruttplanerad
 cargo.admin.tableheader.arrivaldeadline=Ankomstdeadline:
-cargo.admin.details.caption=Detaljer för godset
-cargo.admin.details.picknewdest=Ändra destination
+cargo.admin.details.caption=Detaljer för godset
+cargo.admin.details.picknewdest=Ändra destination
 cargo.admin.details.arrivaldeadline=Ankomstdeadline
 cargo.admin.details.selectitinerary=Ruttplanera detta gods
-cargo.admin.details.reroute=omplanera rutt för detta gods
-cargo.admin.details.misrouted=Godsets rutt är felplanerad
+cargo.admin.details.reroute=omplanera rutt för detta gods
+cargo.admin.details.misrouted=Godsets rutt är felplanerad
 cargo.admin.details.itinerary=Resplan
 cargo.admin.details.voyageno=Resenummer
 cargo.admin.details.load=Lasta
 cargo.admin.details.unload=Lasta av
-cargo.admin.newdest.change=Ändra destination för godset {0}
+cargo.admin.newdest.change=Ändra destination för godset {0}
 cargo.admin.newdest.currentdest=Nuvarande destination
 cargo.admin.newdest.newdest=Ny destination
-cargo.admin.newdest.submit=Ändra destination
+cargo.admin.newdest.submit=Ändra destination
 cargo.admin.register.caption=Boka nytt gods
 cargo.admin.register.book=Boka
-cargo.admin.itinerary.caption=Välj rutt
-cargo.admin.itinerary.summary=Godset {0} färdas från {1} till {2}
-cargo.admin.itinerary.noroutecandidates=Inga rutter hittades som uppfyller ruttspecifikationen. Prova att välja en ankomstdeadline längre in i framtiden (åtminstone ett par veckor fram).
+cargo.admin.itinerary.caption=Välj rutt
+cargo.admin.itinerary.summary=Godset {0} färdas från {1} till {2}
+cargo.admin.itinerary.noroutecandidates=Inga rutter hittades som uppfyller ruttspecifikationen. Prova att välja en ankomstdeadline längre in i framtiden (åtminstone ett par veckor fram).
 cargo.admin.itinerary.routecandidatecaption=Ruttkandidater {0}
 cargo.admin.itinerary.voyage=Resa
 cargo.admin.itinerary.submit=Tilldela rutten till godset
 
 misc.yes=Ja
 misc.no=Nej
-misc.from=Från
+misc.from=Från
 misc.to=Till
 
-error.required=Spårningsid:t får inte vara tomt
-cargo.unknown_id=Okänt spårningsid
\ No newline at end of file
+error.required=Spårningsid:t får inte vara tomt
+cargo.unknown_id=Okänt spårningsid
\ No newline at end of file
diff --git a/src/main/resources/messages_zh.properties b/src/main/resources/messages_zh.properties
index b15ba5a7d..fb2cae713 100644
--- a/src/main/resources/messages_zh.properties
+++ b/src/main/resources/messages_zh.properties
@@ -1,72 +1,74 @@
-cargo.status.NOT_RECEIVED=???
-cargo.status.IN_PORT=???{0}
-cargo.status.ONBOARD_CARRIER=????{0}
-cargo.status.CLAIMED=??
-cargo.status.UNKNOWN=??
+# Note: file encoding must be UTF-8
+cargo.status.NOT_RECEIVED=未接收
+cargo.status.IN_PORT=�泊在{0}
+cargo.status.ONBOARD_CARRIER=正在上传{0}
+cargo.status.CLAIMED=�求
+cargo.status.UNKNOWN=未知
 
-cargo.misrouted=????
-cargo.notrouted=????
+cargo.misrouted=无效航线
+cargo.notrouted=缺�航线
 
-deliveryHistory.eventDescription.NOT_RECEIVED=?????.
+deliveryHistory.eventDescription.NOT_RECEIVED=船货未接收.
 
-deliveryHistory.eventDescription.LOAD=?????{0}?{1}?{2}.
-deliveryHistory.eventDescription.UNLOAD=?????{0}?{1}?{2}.
-deliveryHistory.eventDescription.RECEIVE=???{0}?{1}.
-deliveryHistory.eventDescription.CLAIM=???{0}?{1}.
-deliveryHistory.eventDescription.CUSTOMS=???{0}?{1}.
+deliveryHistory.eventDescription.LOAD=加货到航程{0}在{1}于{2}.
+deliveryHistory.eventDescription.UNLOAD=下货从航程{0}在{1}于{2}.
+deliveryHistory.eventDescription.RECEIVE=接收在{0}于{1}.
+deliveryHistory.eventDescription.CLAIM=�求在{0}于{1}.
+deliveryHistory.eventDescription.CUSTOMS=通关在{0}于{1}.
 
-booking.header=?????????
-booking.listall=????
-booking.booknew=?????
-cargo.tracking.header=????
-cargo.tracking.idinput=??????:
-cargo.tracking.submitbutton=??!
-cargo.tracking.hint=??????"ABC123"?"JKL567".
-cargo.tracking.handlinghistory=??????
-cargo.tracking.misdirected=???????
-cargo.routing.result=??{0}????:{1}
-cargo.routing.eta=??{0}???????: {1}
-cargo.routing.nextexpact.LOAD=??????{1}???{0}??
-cargo.routing.nextexpact.UNLOAD=??????{1}???{0}??
-cargo.routing.nextexpact.RECEIVE=??????{0}????
-cargo.routing.nextexpact.CLAIM=??????{0}????
-cargo.routing.nextexpact.CUSTOMS=??????{0}??
-cargo.routing.nextexpact.unknown=??????
+booking.header=船货约定与航程管�
+booking.listall=罗列船货
+booking.booknew=约定新船货
+cargo.tracking.header=追踪船货
+cargo.tracking.footer=这个项目的作者是
+cargo.tracking.idinput=填空追踪��:
+cargo.tracking.submitbutton=追踪!
+cargo.tracking.hint=�示：试试索"ABC123"或"JKL567".
+cargo.tracking.handlinghistory=船货管�记录
+cargo.tracking.misdirected=无效航线的船货
+cargo.routing.result=船货{0}正在到达:{1}
+cargo.routing.eta=开往{0}的预计到达时间: {1}
+cargo.routing.nextexpact.LOAD=下一活动是在{1}加货到{0}航程
+cargo.routing.nextexpact.UNLOAD=下一活动是在{1}下货从{0}航程
+cargo.routing.nextexpact.RECEIVE=下一活动是在{0}接�船货
+cargo.routing.nextexpact.CLAIM=下一活动是在{0}�求船货
+cargo.routing.nextexpact.CUSTOMS=下一活动是在{0}通关
+cargo.routing.nextexpact.unknown=下一活动未知
 
-cargo.admin.header=????
-cargo.admin.tablecaption=????
-cargo.admin.tableheader.trackingid=????
-cargo.admin.tableheader.origin=??
-cargo.admin.tableheader.destination=??
-cargo.admin.tableheader.routed=?????
-cargo.admin.tableheader.arrivaldeadline=????:
-cargo.admin.details.caption=????
-cargo.admin.details.picknewdest=????
-cargo.admin.details.arrivaldeadline=????
-cargo.admin.details.selectitinerary=?????
-cargo.admin.details.reroute=??
-cargo.admin.details.misrouted=???????
-cargo.admin.details.itinerary=???
-cargo.admin.details.voyageno=????
-cargo.admin.details.load=??
-cargo.admin.details.unload=??
-cargo.admin.newdest.change=???????
-cargo.admin.newdest.currentdest=????
-cargo.admin.newdest.newdest=???
-cargo.admin.newdest.submit=??
-cargo.admin.register.caption=?????
-cargo.admin.register.book=??
-cargo.admin.itinerary.caption=????
-cargo.admin.itinerary.summary=??{0}?{1}?{2}??
-cargo.admin.itinerary.noroutecandidates=???????????????????????????
-cargo.admin.itinerary.routecandidatecaption=????{0}
-cargo.admin.itinerary.voyage=??
-cargo.admin.itinerary.submit=????????
+cargo.admin.header=船货管�
+cargo.admin.tablecaption=所有船货
+cargo.admin.tableheader.trackingid=追踪��
+cargo.admin.tableheader.origin=本�
+cargo.admin.tableheader.destination=终点
+cargo.admin.tableheader.routed=行程约定了
+cargo.admin.tableheader.arrivaldeadline=到达期�:
+cargo.admin.details.caption=船货细节
+cargo.admin.details.picknewdest=改�终点
+cargo.admin.details.arrivaldeadline=到达期�
+cargo.admin.details.selectitinerary=选择旅程表
+cargo.admin.details.reroute=改�
+cargo.admin.details.misrouted=无效航线的船货
+cargo.admin.details.itinerary=旅程表
+cargo.admin.details.voyageno=航程��
+cargo.admin.details.load=加货
+cargo.admin.details.unload=下货
+cargo.admin.newdest.change=改�船货的终点
+cargo.admin.newdest.currentdest=目�终点
+cargo.admin.newdest.newdest=新终点
+cargo.admin.newdest.submit=改�
+cargo.admin.register.caption=约定新船货
+cargo.admin.register.book=约定
+cargo.admin.itinerary.caption=选择航线
+cargo.admin.itinerary.summary=船货{0}从{1}到{2}途中
+cargo.admin.itinerary.noroutecandidates=找�到�格行程�件的行程。请试试选择晚一点的到达期�。
+cargo.admin.itinerary.routecandidatecaption=候选行程{0}
+cargo.admin.itinerary.voyage=航程
+cargo.admin.itinerary.submit=将船货分�到行程
 
-misc.yes=?
-misc.no=?
-misc.from=??
-misc.to=??
+misc.yes=是
+misc.no=�
+misc.from=�自
+misc.to=开往
 
-error.required=????????
-cargo.unknown_id=??????
\ No newline at end of file
+error.required=追踪���能空白
+cargo.unknown_id=追踪��未知
\ No newline at end of file

From fa9241771aedf0c19d3fc48a8cd39340ca17bc1b Mon Sep 17 00:00:00 2001
From: orende <1337decker@gmail.com>
Date: Sat, 4 Mar 2023 19:39:27 +0800
Subject: [PATCH 10/15] Add language selection dropdown

---
 src/main/resources/static/index.html | 29 ++++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html
index 4b4477ef6..8e8fca07c 100644
--- a/src/main/resources/static/index.html
+++ b/src/main/resources/static/index.html
@@ -3,18 +3,43 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
     <meta charset="UTF-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title>DDDSample</title>
+
+    <script type="text/javascript">
+function localeChangeFn() {
+    document.getElementById("locales").onchange = () => {
+        var selectedOption = document.getElementById("locales").value;
+        if (!!selectedOption && selectedOption != '') {
+            document.getElementById('cargoTrackingLink').href = `track?lang=${selectedOption}`;
+            document.getElementById('bookingAndRoutingLink').href = `admin/list?lang=${selectedOption}`;
+        }
+    }
+}
+    </script>
 </head>
 <body style="padding: 20px">
+
 <p><img src="images/web_logo.png"/></p>
+
 <p>Welcome to the <strong>DDDSample</strong> application.</p>
+
+<span>Select language</span>:
+<select id="locales" oninput="localeChangeFn()" autocomplete="off">
+    <option value="en" selected="">English</option>
+    <option value="sv_SE">Swedish/Svenska</option>
+    <option value="zh_CN">Simplified Chinese/简体中文</option>
+</select>
+
 <p>There are two web interfaces available:</p>
 <ul>
-<li>Public <a href="track">cargo tracking</a></li>
-<li>Administration of <a href="admin/list">booking and routing</a>.</li>
+<li>Public <a id="cargoTrackingLink" href="track?lang=en">cargo tracking</a></li>
+<li>Administration of <a id="bookingAndRoutingLink" href="admin/list?lang=en">booking and routing</a>.</li>
 </ul>
+
 <p>The Incident Logging application, that is used to register handling events, is a stand-alone application and a separate download.</p>
 <p>Please visit the <a href="https://github.com/citerus/dddsample-core/">project website</a> for more information and a screencast demonstration of how the application works.</p>
+
 <p><i>This project is a joint effort by Eric Evans' company <a href="http://www.domainlanguage.com" class="externalLink">Domain Language</a>
  and the Swedish software consulting company <a href="http://www.citerus.se" class="externalLink">Citerus</a>.</i></p>
 </body>

From 58ef60334a4d969e15e1bceb7bb0ac19368c1776 Mon Sep 17 00:00:00 2001
From: orende <1337decker@gmail.com>
Date: Sat, 4 Mar 2023 19:40:42 +0800
Subject: [PATCH 11/15] Move i18n logic to infrastructure.i18n package

---
 .../i18n/QueryParamLocaleResolver.java        | 81 +++++++++++++++++++
 .../InterfacesApplicationContext.java         | 30 ++-----
 2 files changed, 87 insertions(+), 24 deletions(-)
 create mode 100644 src/main/java/se/citerus/dddsample/infrastructure/i18n/QueryParamLocaleResolver.java

diff --git a/src/main/java/se/citerus/dddsample/infrastructure/i18n/QueryParamLocaleResolver.java b/src/main/java/se/citerus/dddsample/infrastructure/i18n/QueryParamLocaleResolver.java
new file mode 100644
index 000000000..c1c7735d6
--- /dev/null
+++ b/src/main/java/se/citerus/dddsample/infrastructure/i18n/QueryParamLocaleResolver.java
@@ -0,0 +1,81 @@
+package se.citerus.dddsample.infrastructure.i18n;
+
+import org.springframework.context.i18n.LocaleContext;
+import org.springframework.context.i18n.SimpleLocaleContext;
+import org.springframework.util.StringUtils;
+import org.springframework.web.servlet.i18n.AbstractLocaleContextResolver;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Enumeration;
+import java.util.List;
+import java.util.Locale;
+
+public class QueryParamLocaleResolver extends AbstractLocaleContextResolver {
+    private List<Locale> supportedLocales;
+
+    @Override
+    public LocaleContext resolveLocaleContext(HttpServletRequest request) {
+        String[] locales = request.getParameterMap().get("lang");
+        String localeName;
+        if (locales != null && locales.length > 0) {
+            localeName = locales[0];
+        } else {
+            return new SimpleLocaleContext(getDefaultLocale());
+        }
+
+        Locale requestLocale = convertLocaleName(localeName);
+        List<Locale> supportedLocales = getSupportedLocales();
+        if (supportedLocales.isEmpty() || supportedLocales.contains(requestLocale)) {
+            return new SimpleLocaleContext(requestLocale);
+        }
+
+        Locale supportedLocale = findSupportedLocale(request, supportedLocales);
+        if (supportedLocale != null) {
+            return new SimpleLocaleContext(supportedLocale);
+        }
+        return new SimpleLocaleContext(getDefaultLocale() != null ? getDefaultLocale() : requestLocale);
+    }
+
+    private Locale findSupportedLocale(HttpServletRequest request, List<Locale> supportedLocales) {
+        Enumeration<Locale> requestLocales = request.getLocales();
+        Locale languageMatch = null;
+        while (requestLocales.hasMoreElements()) {
+            Locale locale = requestLocales.nextElement();
+            if (supportedLocales.contains(locale)) {
+                if (languageMatch == null || languageMatch.getLanguage().equals(locale.getLanguage())) {
+                    // Full match: language + country, possibly narrowed from earlier language-only match
+                    return locale;
+                }
+            }
+            else if (languageMatch == null) {
+                // Let's try to find a language-only match as a fallback
+                for (Locale candidate : supportedLocales) {
+                    if (!StringUtils.hasLength(candidate.getCountry()) &&
+                            candidate.getLanguage().equals(locale.getLanguage())) {
+                        languageMatch = candidate;
+                        break;
+                    }
+                }
+            }
+        }
+        return languageMatch;
+    }
+
+    private Locale convertLocaleName(String localeName) {
+        return localeName.contains("_") ? new Locale(localeName.split("_")[0], localeName.split("_")[1]) : new Locale(localeName);
+    }
+
+    @Override
+    public void setLocaleContext(HttpServletRequest request, HttpServletResponse response, LocaleContext localeContext) {
+        // intentionally left blank
+    }
+
+    public List<Locale> getSupportedLocales() {
+        return supportedLocales;
+    }
+
+    public void setSupportedLocales(List<Locale> supportedLocales) {
+        this.supportedLocales = supportedLocales;
+    }
+}
diff --git a/src/main/java/se/citerus/dddsample/interfaces/InterfacesApplicationContext.java b/src/main/java/se/citerus/dddsample/interfaces/InterfacesApplicationContext.java
index a88aedc71..512a7d453 100644
--- a/src/main/java/se/citerus/dddsample/interfaces/InterfacesApplicationContext.java
+++ b/src/main/java/se/citerus/dddsample/interfaces/InterfacesApplicationContext.java
@@ -8,8 +8,6 @@
 import org.springframework.context.MessageSource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.i18n.LocaleContext;
-import org.springframework.context.i18n.SimpleLocaleContext;
 import org.springframework.context.support.ResourceBundleMessageSource;
 import org.springframework.lang.Nullable;
 import org.springframework.orm.jpa.support.OpenEntityManagerInViewInterceptor;
@@ -17,7 +15,6 @@
 import org.springframework.web.servlet.LocaleResolver;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.i18n.AbstractLocaleContextResolver;
 import org.springframework.web.servlet.i18n.LocaleChangeInterceptor;
 import se.citerus.dddsample.application.ApplicationEvents;
 import se.citerus.dddsample.application.BookingService;
@@ -25,6 +22,7 @@
 import se.citerus.dddsample.domain.model.handling.HandlingEventRepository;
 import se.citerus.dddsample.domain.model.location.LocationRepository;
 import se.citerus.dddsample.domain.model.voyage.VoyageRepository;
+import se.citerus.dddsample.infrastructure.i18n.QueryParamLocaleResolver;
 import se.citerus.dddsample.interfaces.booking.facade.BookingServiceFacade;
 import se.citerus.dddsample.interfaces.booking.facade.internal.BookingServiceFacadeImpl;
 import se.citerus.dddsample.interfaces.booking.web.CargoAdminController;
@@ -35,6 +33,7 @@
 
 import java.io.File;
 import java.lang.invoke.MethodHandles;
+import java.util.List;
 import java.util.Locale;
 
 @Configuration
@@ -60,27 +59,10 @@ public MessageSource messageSource() {
 
     @Bean
     public LocaleResolver localeResolver() {
-        AbstractLocaleContextResolver localeResolver = new AbstractLocaleContextResolver() {
-            @Override
-            public LocaleContext resolveLocaleContext(HttpServletRequest request) {
-                String[] locales = request.getParameterMap().getOrDefault("lang", new String[]{"en"});
-                String localeName = locales != null && locales.length > 0 ? locales[0] : "";
-                switch (localeName) {
-                    case "sv_SE": return new SimpleLocaleContext(new Locale("sv", "SE"));
-                    case "zh_CN": return new SimpleLocaleContext(Locale.SIMPLIFIED_CHINESE);
-                    case "en": return new SimpleLocaleContext(Locale.ENGLISH);
-                    default: {
-                        log.warn("Got unsupported locale '{}', falling back to default locale '{}'", localeName, this.getDefaultLocale());
-                        return new SimpleLocaleContext(this.getDefaultLocale());
-                    }
-                }
-            }
-
-            @Override
-            public void setLocaleContext(HttpServletRequest request, HttpServletResponse response, LocaleContext localeContext) {
-                // intentionally left blank
-            }
-        };
+        QueryParamLocaleResolver localeResolver = new QueryParamLocaleResolver();
+        localeResolver.setSupportedLocales(List.of(Locale.ENGLISH,
+                Locale.SIMPLIFIED_CHINESE,
+                new Locale("sv", "SE"))); // add new locales here when available
         localeResolver.setDefaultLocale(Locale.ENGLISH);
         return localeResolver;
     }

From fd8c7952976d1c170f9d587d14da366db4f29c1e Mon Sep 17 00:00:00 2001
From: orende <1337decker@gmail.com>
Date: Sat, 4 Mar 2023 19:41:10 +0800
Subject: [PATCH 12/15] Change doctypes, add meta tags for encoding

---
 src/main/resources/templates/admin/list.html             | 4 +++-
 .../resources/templates/admin/pickNewDestination.html    | 4 +++-
 src/main/resources/templates/admin/registrationForm.html | 5 +++--
 src/main/resources/templates/admin/selectItinerary.html  | 4 +++-
 src/main/resources/templates/admin/show.html             | 5 +++--
 src/main/resources/templates/adminDecorator.html         | 2 +-
 src/main/resources/templates/track.html                  | 9 ++++++---
 7 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/templates/admin/list.html b/src/main/resources/templates/admin/list.html
index 04d116d1e..cfb7beefc 100644
--- a/src/main/resources/templates/admin/list.html
+++ b/src/main/resources/templates/admin/list.html
@@ -1,9 +1,11 @@
-<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring4-4.dtd">
+<!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:th="http://www.thymeleaf.org">
 
 <head>
+    <meta charset="UTF-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title th:text="#{cargo.admin.header}">Cargo Administration</title>
     <link rel="stylesheet" type="text/css" th:href="@{/admin.css}"/>
 </head>
diff --git a/src/main/resources/templates/admin/pickNewDestination.html b/src/main/resources/templates/admin/pickNewDestination.html
index 38b2b5d03..a7b165ccf 100644
--- a/src/main/resources/templates/admin/pickNewDestination.html
+++ b/src/main/resources/templates/admin/pickNewDestination.html
@@ -1,9 +1,11 @@
-<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring4-4.dtd">
+<!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:th="http://www.thymeleaf.org">
 
 <head>
+    <meta charset="UTF-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title th:text="#{cargo.admin.header}">Cargo Administration</title>
     <link rel="stylesheet" type="text/css" th:href="@{/admin.css}"/>
 
diff --git a/src/main/resources/templates/admin/registrationForm.html b/src/main/resources/templates/admin/registrationForm.html
index 30d59a67c..04ee7ce08 100644
--- a/src/main/resources/templates/admin/registrationForm.html
+++ b/src/main/resources/templates/admin/registrationForm.html
@@ -1,11 +1,12 @@
-<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring4-4.dtd">
+<!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:th="http://www.thymeleaf.org">
 
 <head>
+    <meta charset="UTF-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title th:text="#{cargo.admin.header}">Cargo Administration</title>
-
     <link rel="stylesheet" type="text/css" th:href="@{/admin.css}"/>
     <link rel="stylesheet" type="text/css" th:href="@{/css/bootstrap.css}"/>
     <link rel="stylesheet" type="text/css" th:href="@{/css/bootstrap-datepicker.css}"/>
diff --git a/src/main/resources/templates/admin/selectItinerary.html b/src/main/resources/templates/admin/selectItinerary.html
index b4c6b2954..a178b1365 100644
--- a/src/main/resources/templates/admin/selectItinerary.html
+++ b/src/main/resources/templates/admin/selectItinerary.html
@@ -1,9 +1,11 @@
-<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring4-4.dtd">
+<!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:th="http://www.thymeleaf.org">
 
 <head>
+    <meta charset="UTF-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title th:text="#{cargo.admin.header}">Cargo Administration</title>
     <link rel="stylesheet" type="text/css" th:href="@{/admin.css}"/>
 </head>
diff --git a/src/main/resources/templates/admin/show.html b/src/main/resources/templates/admin/show.html
index dcfa894db..0cabf3f99 100644
--- a/src/main/resources/templates/admin/show.html
+++ b/src/main/resources/templates/admin/show.html
@@ -1,11 +1,12 @@
-<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring4-4.dtd">
+<!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:th="http://www.thymeleaf.org">
 
 <head>
+    <meta charset="UTF-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title th:text="#{cargo.admin.header}">Cargo Administration</title>
-
     <link rel="stylesheet" type="text/css" th:href="@{/admin.css}"/>
 </head>
 <body>
diff --git a/src/main/resources/templates/adminDecorator.html b/src/main/resources/templates/adminDecorator.html
index 2fc7aa6b4..546d0b1fd 100644
--- a/src/main/resources/templates/adminDecorator.html
+++ b/src/main/resources/templates/adminDecorator.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring4-4.dtd">
+<!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:th="http://www.thymeleaf.org">
diff --git a/src/main/resources/templates/track.html b/src/main/resources/templates/track.html
index a5a730b13..385d3986e 100644
--- a/src/main/resources/templates/track.html
+++ b/src/main/resources/templates/track.html
@@ -1,9 +1,11 @@
-<!DOCTYPE html SYSTEM "http://www.thymeleaf.org/dtd/xhtml1-strict-thymeleaf-spring4-4.dtd">
+<!DOCTYPE html>
 
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:th="http://www.thymeleaf.org">
 
 <head>
+    <meta charset="UTF-8"/>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <title th:text="#{cargo.tracking.header}">Tracking cargo</title>
     <link rel="stylesheet" type="text/css" th:href="@{/style.css}"/>
 </head>
@@ -73,8 +75,9 @@ <h3 th:text="#{cargo.tracking.handlinghistory}">Handling History</h3>
         </div>
     </div>
     <div id="footer">
-        This application is written by <a href="http://www.citerus.se" target="_blank">Citerus</a>
-        and <a href="http://www.domainlanguage.com" target="_blank">Domain Language</a>
+        <span th:text="#{cargo.tracking.footer}">This application is written by</span>
+        <a href="http://www.citerus.se" target="_blank">Citerus</a>
+        & <a href="http://www.domainlanguage.com" target="_blank">Domain Language Inc</a>
     </div>
 </div>
 <script type="text/javascript" charset="UTF-8">

From 2f3662c3b78c7944db04f62165b505791769bdb4 Mon Sep 17 00:00:00 2001
From: orende <1337decker@gmail.com>
Date: Sun, 5 Mar 2023 09:42:12 +0800
Subject: [PATCH 13/15] Add check for validation errors and early exit to
 CargoTrackingController onSubmit method

---
 .../interfaces/tracking/CargoTrackingController.java          | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingController.java b/src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingController.java
index 84b99f1c2..30740deff 100644
--- a/src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingController.java
+++ b/src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingController.java
@@ -65,6 +65,10 @@ private String onSubmit(final HttpServletRequest request,
                             final BindingResult bindingResult) {
         final Locale locale = RequestContextUtils.getLocale(request);
         trackCommandValidator.validate(command, bindingResult);
+        if (bindingResult.hasErrors()) {
+            bindingResult.rejectValue("trackingId", "error.required");
+            return "track";
+        }
 
         final TrackingId trackingId = new TrackingId(command.getTrackingId());
         final Cargo cargo = cargoRepository.find(trackingId);

From b171f2172acc3b72916028cc2e79da3c9a9683b7 Mon Sep 17 00:00:00 2001
From: Decker108 <1337decker@gmail.com>
Date: Tue, 24 Dec 2024 19:46:49 +0100
Subject: [PATCH 14/15] upgrade maven to 3.8.1, fix incorrect imports

---
 .mvn/wrapper/maven-wrapper.properties                         | 2 +-
 .../infrastructure/i18n/QueryParamLocaleResolver.java         | 4 ++--
 .../interfaces/booking/web/CargoAdminController.java          | 1 -
 .../interfaces/tracking/CargoTrackingViewAdapter.java         | 1 -
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties
index a447c9fa8..d26693d38 100755
--- a/.mvn/wrapper/maven-wrapper.properties
+++ b/.mvn/wrapper/maven-wrapper.properties
@@ -1 +1 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip
\ No newline at end of file
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip
\ No newline at end of file
diff --git a/src/main/java/se/citerus/dddsample/infrastructure/i18n/QueryParamLocaleResolver.java b/src/main/java/se/citerus/dddsample/infrastructure/i18n/QueryParamLocaleResolver.java
index c1c7735d6..18b3f9ef4 100644
--- a/src/main/java/se/citerus/dddsample/infrastructure/i18n/QueryParamLocaleResolver.java
+++ b/src/main/java/se/citerus/dddsample/infrastructure/i18n/QueryParamLocaleResolver.java
@@ -5,8 +5,8 @@
 import org.springframework.util.StringUtils;
 import org.springframework.web.servlet.i18n.AbstractLocaleContextResolver;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Locale;
diff --git a/src/main/java/se/citerus/dddsample/interfaces/booking/web/CargoAdminController.java b/src/main/java/se/citerus/dddsample/interfaces/booking/web/CargoAdminController.java
index 4dd6881f1..f66b9744c 100644
--- a/src/main/java/se/citerus/dddsample/interfaces/booking/web/CargoAdminController.java
+++ b/src/main/java/se/citerus/dddsample/interfaces/booking/web/CargoAdminController.java
@@ -2,7 +2,6 @@
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import com.google.common.collect.ImmutableMap;
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.context.MessageSource;
 import org.springframework.stereotype.Controller;
diff --git a/src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingViewAdapter.java b/src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingViewAdapter.java
index b1f02eca4..72353fc8a 100644
--- a/src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingViewAdapter.java
+++ b/src/main/java/se/citerus/dddsample/interfaces/tracking/CargoTrackingViewAdapter.java
@@ -23,7 +23,6 @@ public final class CargoTrackingViewAdapter {
   private final List<HandlingEventViewAdapter> events;
   private final String FORMAT = "yyyy-MM-dd hh:mm";
   private final TimeZone timeZone;
-  private final SimpleDateFormat dateFormat = new SimpleDateFormat(FORMAT);
 
   /**
    * Constructor.

From 690bbb777f60f37b9fcd81e3a64ad94a6f9b87e4 Mon Sep 17 00:00:00 2001
From: Decker108 <1337decker@gmail.com>
Date: Tue, 24 Dec 2024 19:54:47 +0100
Subject: [PATCH 15/15] replace guava immutablemap with stdlib map

---
 .../interfaces/handling/HandlingReportIntegrationTest.java   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/test/java/se/citerus/dddsample/interfaces/handling/HandlingReportIntegrationTest.java b/src/test/java/se/citerus/dddsample/interfaces/handling/HandlingReportIntegrationTest.java
index f98275e5f..ca08b7fae 100644
--- a/src/test/java/se/citerus/dddsample/interfaces/handling/HandlingReportIntegrationTest.java
+++ b/src/test/java/se/citerus/dddsample/interfaces/handling/HandlingReportIntegrationTest.java
@@ -1,7 +1,6 @@
 package se.citerus.dddsample.interfaces.handling;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.ImmutableMap;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -49,7 +48,7 @@ public class HandlingReportIntegrationTest {
     @Transactional
     @Test
     void shouldReturn201ResponseWhenHandlingReportIsSubmitted() throws Exception {
-        String body = mapper.writeValueAsString(ImmutableMap.of(
+        String body = mapper.writeValueAsString(Map.of(
                 "completionTime", "2022-10-30T13:37:00",
                 "trackingIds", Collections.singletonList("ABC123"),
                 "type", HandlingEvent.Type.CUSTOMS.name(),
@@ -77,7 +76,7 @@ void shouldReturn201ResponseWhenHandlingReportIsSubmitted() throws Exception {
     @SuppressWarnings("unchecked")
     @Test
     void shouldReturnValidationErrorResponseWhenInvalidHandlingReportIsSubmitted() throws Exception {
-        String body = mapper.writeValueAsString(ImmutableMap.of(
+        String body = mapper.writeValueAsString(Map.of(
                 "completionTime", "invalid date",
                 "trackingIds", Collections.singletonList("ABC123"),
                 "type", HandlingEvent.Type.CUSTOMS.name(),