Fix logviewer using Instant with TIMESTAMP

which broke due to forcing jOOQ to use Instant with TIMESTAMP

Author: Zabuzard

logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/logs/LogREST.java

@@ -8,9 +8,6 @@
 import org.togetherjava.tjbot.logwatcher.watcher.StreamWatcher;
 import org.togetherjava.tjbot.db.generated.tables.pojos.Logevents;
 
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-
 @RestController
 public class LogREST {
 
@@ -28,10 +25,8 @@ public ResponseEntity<Void> logEvent(@RequestBody final LogEvent body) {
     }
 
     private Logevents mapToLogevents(final LogEvent body) {
-        return new Logevents(Integer.MIN_VALUE,
-                LocalDateTime.ofInstant(body.getInstant(), ZoneId.systemDefault()),
-                body.getThread(), body.getLevel(), body.getLoggerName(), body.getMessage(),
-                body.getEndOfBatch(), body.getLoggerFqcn(), body.getThreadId(),
-                body.getThreadPriority());
+        return new Logevents(Integer.MIN_VALUE, body.getInstant(), body.getThread(),
+                body.getLevel(), body.getLoggerName(), body.getMessage(), body.getEndOfBatch(),
+                body.getLoggerFqcn(), body.getThreadId(), body.getThreadPriority());
     }
 }

logviewer/src/main/java/org/togetherjava/tjbot/logwatcher/views/logs/StreamedView.java

@@ -24,6 +24,8 @@
 import org.vaadin.crudui.crud.impl.GridCrud;
 
 import javax.annotation.security.PermitAll;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -128,7 +130,8 @@ private void setInstantFormatter() {
 
 
         innerGrid
-            .addColumn(new LocalDateTimeRenderer<>(Logevents::getTime,
+            .addColumn(new LocalDateTimeRenderer<>(
+                    logEvents -> LocalDateTime.ofInstant(logEvents.getTime(), ZoneOffset.UTC),
                     DateTimeFormatter.ofPattern("yyy-MM-dd HH:mm:ss.SSS")))
             .setHeader("Instant")
             .setComparator(Comparator.comparing(Logevents::getTime))