nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-1021 InstantTypeHandler Comments from Mustapha

This commit is contained in:
BerndBreier 2020-01-22 14:40:08 +01:00 committed by Mustapha Zorgati
parent 8c8bb69b57
commit bc18f69777
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/taskana-core/src/main/java/pro/taskana/impl/TaskanaEngineImpl.java
View File

@ -235,8 +235,8 @@ public class TaskanaEngineImpl implements TaskanaEngine {
} }
// register type handlers // register type handlers
configuration.getTypeHandlerRegistry().register(MapTypeHandler.class); configuration.getTypeHandlerRegistry().register(new MapTypeHandler());
configuration.getTypeHandlerRegistry().register(Instant.class, InstantTypeHandler.class); configuration.getTypeHandlerRegistry().register(Instant.class, new InstantTypeHandler());
// add mappers // add mappers
configuration.addMapper(TaskMapper.class); configuration.addMapper(TaskMapper.class);
configuration.addMapper(TaskMonitorMapper.class); configuration.addMapper(TaskMonitorMapper.class);

8
lib/taskana-data/src/test/java/pro/taskana/sampledata/SqlReplacerTest.java
View File

@ -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.DATE_TIME_FORMATTER;
import static pro.taskana.sampledata.SqlReplacer.RELATIVE_DATE_PATTERN; import static pro.taskana.sampledata.SqlReplacer.RELATIVE_DATE_PATTERN;
import java.time.Instant;
import java.time.ZoneId;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import org.hamcrest.CoreMatchers; import org.hamcrest.CoreMatchers;
@ -15,7 +17,7 @@ class SqlReplacerTest {
@Test @Test
void replaceRelativeTimeFunctionSameDate() { void replaceRelativeTimeFunctionSameDate() {
ZonedDateTime now = ZonedDateTime.now(); ZonedDateTime now = Instant.now().atZone(ZoneId.of("UTC"));
String dateFormatted = now.format(DATE_TIME_FORMATTER); String dateFormatted = now.format(DATE_TIME_FORMATTER);
String sqlStringReplaced = SqlReplacer.replaceDatePlaceholder(now, "... RELATIVE_DATE(0) ..."); String sqlStringReplaced = SqlReplacer.replaceDatePlaceholder(now, "... RELATIVE_DATE(0) ...");
assertThat(sqlStringReplaced, CoreMatchers.containsString(dateFormatted)); assertThat(sqlStringReplaced, CoreMatchers.containsString(dateFormatted));
@ -45,7 +47,7 @@ class SqlReplacerTest {
@Test @Test
void replaceRelativeTimeFunctionPosDate() { void replaceRelativeTimeFunctionPosDate() {
ZonedDateTime now = ZonedDateTime.now(); ZonedDateTime now = Instant.now().atZone(ZoneId.of("UTC"));
String dateFormatted = now.plusDays(5).format(DATE_TIME_FORMATTER); String dateFormatted = now.plusDays(5).format(DATE_TIME_FORMATTER);
String sqlStringReplaced = SqlReplacer.replaceDatePlaceholder(now, "... RELATIVE_DATE(5) ..."); String sqlStringReplaced = SqlReplacer.replaceDatePlaceholder(now, "... RELATIVE_DATE(5) ...");
assertThat(sqlStringReplaced, CoreMatchers.containsString(dateFormatted)); assertThat(sqlStringReplaced, CoreMatchers.containsString(dateFormatted));
@ -53,7 +55,7 @@ class SqlReplacerTest {
@Test @Test
void replaceRelativeTimeFunctionNegDate() { void replaceRelativeTimeFunctionNegDate() {
ZonedDateTime now = ZonedDateTime.now(); ZonedDateTime now = Instant.now().atZone(ZoneId.of("UTC"));
String dateFormatted = now.plusDays(-10).format(DATE_TIME_FORMATTER); String dateFormatted = now.plusDays(-10).format(DATE_TIME_FORMATTER);
String sqlStringReplaced = String sqlStringReplaced =
SqlReplacer.replaceDatePlaceholder(now, "... RELATIVE_DATE(-10) ..."); SqlReplacer.replaceDatePlaceholder(now, "... RELATIVE_DATE(-10) ...");