Return a UTC ZonedDateTime from CargoRoutingDTO::getArrivalDeadline

src/main/java/se/citerus/dddsample/interfaces/booking/facade/dto/CargoRoutingDTO.java

@@ -2,6 +2,9 @@
 
 import java.io.Serializable;
 import java.time.Instant;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.temporal.Temporal;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -67,8 +70,7 @@ public boolean isRouted() {
     return !legs.isEmpty();
   }
 
-  public Instant getArrivalDeadline() {
-    return arrivalDeadline;
+  public ZonedDateTime getArrivalDeadline() {
+    return arrivalDeadline.atZone(ZoneOffset.UTC);
   }
-
 }

src/main/resources/templates/admin/show.html

@@ -30,7 +30,7 @@
         </tr>
         <tr>
             <td>Arrival deadline</td>
-            <td th:text="${#dates.format(cargo.arrivalDeadline,'dd/MM/yyyy')}"/>
+            <td th:text="${#temporals.format(cargo.arrivalDeadline,'dd/MM/yyyy')}"/>
         </tr>
         </tbody>
     </table>

src/test/java/se/citerus/dddsample/acceptance/pages/CargoDetailsPage.java

@@ -58,7 +58,7 @@ public CargoDestinationPage changeDestination() {
     public void expectArrivalDeadlineOf(LocalDate expectedArrivalDeadline) {
         String actualArrivalDeadline = driver.findElement(By.xpath("//div[@id='container']/table/tbody/tr[4]/td[2]")).getText();
 
-        assertThat(expectedArrivalDeadline.format(FORMATTER)).isEqualTo(actualArrivalDeadline);
+        assertThat(actualArrivalDeadline).isEqualTo(expectedArrivalDeadline.format(FORMATTER));
     }
 
     public void expectRoutedOf(String routingStatus) {