From bc18f697779d55641e9318de11984010704ce067 Mon Sep 17 00:00:00 2001
From: BerndBreier <33351391+BerndBreier@users.noreply.github.com>
Date: Wed, 22 Jan 2020 14:40:08 +0100
Subject: [PATCH] TSK-1021 InstantTypeHandler Comments from Mustapha

---
 .../src/main/java/pro/taskana/impl/TaskanaEngineImpl.java | 4 ++--
 .../test/java/pro/taskana/sampledata/SqlReplacerTest.java | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskanaEngineImpl.java b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskanaEngineImpl.java
index 7fa6cfd28..1d034d4f2 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/impl/TaskanaEngineImpl.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/impl/TaskanaEngineImpl.java
@@ -235,8 +235,8 @@ public class TaskanaEngineImpl implements TaskanaEngine {
     }
 
     // register type handlers
-    configuration.getTypeHandlerRegistry().register(MapTypeHandler.class);
-    configuration.getTypeHandlerRegistry().register(Instant.class, InstantTypeHandler.class);
+    configuration.getTypeHandlerRegistry().register(new MapTypeHandler());
+    configuration.getTypeHandlerRegistry().register(Instant.class, new InstantTypeHandler());
     // add mappers
     configuration.addMapper(TaskMapper.class);
     configuration.addMapper(TaskMonitorMapper.class);
diff --git a/lib/taskana-data/src/test/java/pro/taskana/sampledata/SqlReplacerTest.java b/lib/taskana-data/src/test/java/pro/taskana/sampledata/SqlReplacerTest.java
index 120e39455..1dbf5aca3 100644
--- a/lib/taskana-data/src/test/java/pro/taskana/sampledata/SqlReplacerTest.java
+++ b/lib/taskana-data/src/test/java/pro/taskana/sampledata/SqlReplacerTest.java
@@ -4,6 +4,8 @@ import static org.hamcrest.MatcherAssert.assertThat;
 import static pro.taskana.sampledata.SqlReplacer.DATE_TIME_FORMATTER;
 import static pro.taskana.sampledata.SqlReplacer.RELATIVE_DATE_PATTERN;
 
+import java.time.Instant;
+import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.regex.Matcher;
 import org.hamcrest.CoreMatchers;
@@ -15,7 +17,7 @@ class SqlReplacerTest {
 
   @Test
   void replaceRelativeTimeFunctionSameDate() {
-    ZonedDateTime now = ZonedDateTime.now();
+    ZonedDateTime now = Instant.now().atZone(ZoneId.of("UTC"));
     String dateFormatted = now.format(DATE_TIME_FORMATTER);
     String sqlStringReplaced = SqlReplacer.replaceDatePlaceholder(now, "... RELATIVE_DATE(0) ...");
     assertThat(sqlStringReplaced, CoreMatchers.containsString(dateFormatted));
@@ -45,7 +47,7 @@ class SqlReplacerTest {
 
   @Test
   void replaceRelativeTimeFunctionPosDate() {
-    ZonedDateTime now = ZonedDateTime.now();
+    ZonedDateTime now = Instant.now().atZone(ZoneId.of("UTC"));
     String dateFormatted = now.plusDays(5).format(DATE_TIME_FORMATTER);
     String sqlStringReplaced = SqlReplacer.replaceDatePlaceholder(now, "... RELATIVE_DATE(5) ...");
     assertThat(sqlStringReplaced, CoreMatchers.containsString(dateFormatted));
@@ -53,7 +55,7 @@ class SqlReplacerTest {
 
   @Test
   void replaceRelativeTimeFunctionNegDate() {
-    ZonedDateTime now = ZonedDateTime.now();
+    ZonedDateTime now = Instant.now().atZone(ZoneId.of("UTC"));
     String dateFormatted = now.plusDays(-10).format(DATE_TIME_FORMATTER);
     String sqlStringReplaced =
         SqlReplacer.replaceDatePlaceholder(now, "... RELATIVE_DATE(-10) ...");