Implemented a mechanism to set the offset/time-zone to use for conversions

[jpa-converters] / src / main / java / de / juplo / jpa / converters / OffsetDateTimeConverter.java

diff --git a/src/main/java/de/juplo/jpa/converters/OffsetDateTimeConverter.java b/src/main/java/de/juplo/jpa/converters/OffsetDateTimeConverter.java
index 3228aca..3c4365f 100644 (file)
--- a/src/main/java/de/juplo/jpa/converters/OffsetDateTimeConverter.java
+++ b/src/main/java/de/juplo/jpa/converters/OffsetDateTimeConverter.java
@@ -2,7 +2,6 @@ package de.juplo.jpa.converters;
 
 import java.sql.Timestamp;
 import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
 import javax.persistence.AttributeConverter;
 import javax.persistence.Converter;
 
@@ -19,7 +18,7 @@ public class OffsetDateTimeConverter implements AttributeConverter<OffsetDateTim
   {
     if (odt == null)
       return null;
-    return Timestamp.from(odt.withOffsetSameInstant(ZoneOffset.UTC).toInstant());
+    return Timestamp.valueOf(odt.withOffsetSameInstant(TimeConversions.getZoneOffset()).toLocalDateTime());
   }
 
   @Override
@@ -27,6 +26,6 @@ public class OffsetDateTimeConverter implements AttributeConverter<OffsetDateTim
   {
     if (ts == null)
       return null;
-    return OffsetDateTime.of(ts.toLocalDateTime(), ZoneOffset.UTC);
+    return OffsetDateTime.of(ts.toLocalDateTime(), TimeConversions.getZoneOffset());
   }
 }