Merge branch 'develop'

Author: guFalcon

pom.xml

@@ -10,15 +10,15 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>rdb-utils</artifactId>
-	<version>0.1.2</version>
+	<version>0.1.3</version>
 	<name>RdbUtils</name>
 	<packaging>jar</packaging>
 
 	<dependencies>
 		<dependency>
 			<groupId>info.unterrainer.commons</groupId>
 			<artifactId>jre-utils</artifactId>
-			<version>0.1.2</version>
+			<version>0.1.4</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.persistence</groupId>

src/main/java/info/unterrainer/commons/parentpom/Information.java

@@ -2,6 +2,6 @@
 
 public class Information {
 	public static final String name = "Parent-POM";
-	public static final String buildTime = "2020-12-10T07:24:25Z";
-	public static final String pomVersion = "0.1.2";
+	public static final String buildTime = "2021-03-05T08:13:18Z";
+	public static final String pomVersion = "0.1.3";
 }

src/main/java/info/unterrainer/commons/rdbutils/converters/LocalDateTimeConverter.java

@@ -7,16 +7,19 @@
 import javax.persistence.AttributeConverter;
 import javax.persistence.Converter;
 
+import info.unterrainer.commons.jreutils.DateUtils;
+
 @Converter()
 public class LocalDateTimeConverter implements AttributeConverter<LocalDateTime, Timestamp> {
 
 	@Override
-	public Timestamp convertToDatabaseColumn(final LocalDateTime attribute) {
-		return attribute == null ? null : Timestamp.valueOf(attribute.truncatedTo(ChronoUnit.MICROS));
+	public Timestamp convertToDatabaseColumn(final LocalDateTime entityValue) {
+		return entityValue == null ? null
+				: new Timestamp(DateUtils.utcLocalDateTimeToEpoch(entityValue.truncatedTo(ChronoUnit.MICROS)));
 	}
 
 	@Override
-	public LocalDateTime convertToEntityAttribute(final Timestamp dbData) {
-		return dbData == null ? null : dbData.toLocalDateTime();
+	public LocalDateTime convertToEntityAttribute(final Timestamp dbValue) {
+		return dbValue == null ? null : DateUtils.epochToUtcLocalDateTime(dbValue.getTime());
 	}
 }

src/main/java/info/unterrainer/commons/rdbutils/converters/ZonedDateTimeConverter.java

@@ -7,16 +7,19 @@
 import javax.persistence.AttributeConverter;
 import javax.persistence.Converter;
 
+import info.unterrainer.commons.jreutils.DateUtils;
+
 @Converter(autoApply = true)
 public class ZonedDateTimeConverter implements AttributeConverter<LocalDateTime, Timestamp> {
 
 	@Override
-	public Timestamp convertToDatabaseColumn(final java.time.LocalDateTime entityValue) {
-		return entityValue == null ? null : Timestamp.valueOf(entityValue.truncatedTo(ChronoUnit.MICROS));
+	public Timestamp convertToDatabaseColumn(final LocalDateTime entityValue) {
+		return entityValue == null ? null
+				: new Timestamp(DateUtils.utcLocalDateTimeToEpoch(entityValue.truncatedTo(ChronoUnit.MICROS)));
 	}
 
 	@Override
 	public LocalDateTime convertToEntityAttribute(final Timestamp dbValue) {
-		return dbValue == null ? null : dbValue.toLocalDateTime();
+		return dbValue == null ? null : DateUtils.epochToUtcLocalDateTime(dbValue.getTime());
 	}
 }

src/test/java/info/unterrainer/commons/rdbutils/LocalDateTimeConverterTests.java

@@ -0,0 +1,32 @@
+package info.unterrainer.commons.rdbutils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.sql.Timestamp;
+import java.time.LocalDateTime;
+
+import org.junit.jupiter.api.Test;
+
+import info.unterrainer.commons.jreutils.DateUtils;
+import info.unterrainer.commons.rdbutils.converters.LocalDateTimeConverter;
+
+public class LocalDateTimeConverterTests {
+
+	LocalDateTimeConverter converter = new LocalDateTimeConverter();
+
+	@Test
+	public void conversionFromLocalDateTimeToTimestamp() {
+		LocalDateTime d = DateUtils.nowUtc();
+		Timestamp ts = converter.convertToDatabaseColumn(d);
+
+		assertThat(DateUtils.utcLocalDateTimeToEpoch(d)).isEqualTo(ts.getTime());
+	}
+
+	@Test
+	public void conversionFromTimestampToLocalDateTime() {
+		Timestamp ts = new Timestamp(DateUtils.utcLocalDateTimeToEpoch(DateUtils.nowUtc()));
+		LocalDateTime d = converter.convertToEntityAttribute(ts);
+
+		assertThat(ts.getTime()).isEqualTo(DateUtils.utcLocalDateTimeToEpoch(d));
+	}
+}