Merge branch 'develop'

Author: Gerald Unterrainer

pom.xml

@@ -8,7 +8,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>rdb-utils</artifactId>
-	<version>0.2.2</version>
+	<version>0.2.3</version>
 	<name>RdbUtils</name>
 	<packaging>jar</packaging>
 

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

@@ -0,0 +1,75 @@
+package info.unterrainer.commons.rdbutils;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
+
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import info.unterrainer.commons.jreutils.DateUtils;
+import info.unterrainer.commons.rdbutils.converters.LocalDateTimeConverter;
+import info.unterrainer.commons.rdbutils.exceptions.RdbUtilException;
+import info.unterrainer.commons.rdbutils.jpas.TestJpa;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class LocalDateTimeConverterIntegrationTests {
+
+	LocalDateTimeConverter converter = new LocalDateTimeConverter();
+
+	public static EntityManagerFactory emf;
+
+	@BeforeAll
+	public static void setupClass() {
+		try {
+			emf = RdbUtils.createAutoclosingEntityManagerFactory(ManualTests.class, "test");
+		} catch (RdbUtilException e) {
+			log.error("Error getting EntityManagerFactory", e);
+		}
+	}
+
+	@BeforeEach
+	public void beforeMethod() {
+		deleteTestTable();
+	}
+
+	@Test
+	public void persistingAndReadingEntityWorks() {
+		LocalDateTime nowUtc = DateUtils.nowUtc();
+		TestJpa testJpa = TestJpa.builder().message("test").createdOn(nowUtc).editedOn(nowUtc).build();
+
+		persistTestEntity(testJpa);
+		TestJpa jpa = selectFirstTestEntity();
+		assertThat(jpa.getEditedOn()).isEqualTo(testJpa.getEditedOn().truncatedTo(ChronoUnit.MICROS));
+	}
+
+	private int deleteTestTable() {
+		return Transactions.withNewTransactionReturning(emf, em -> {
+			Query q = em.createQuery(String.format("DELETE FROM %s AS o", TestJpa.class.getSimpleName()));
+			int entitiesDeleted = q.executeUpdate();
+			log.info("[{}] entities deleted", entitiesDeleted);
+			return entitiesDeleted;
+		});
+	}
+
+	private void persistTestEntity(final TestJpa jpa) {
+		Transactions.withNewTransaction(emf, em -> {
+			em.persist(jpa);
+		});
+	}
+
+	private TestJpa selectFirstTestEntity() {
+		return Transactions.withNewTransactionReturning(emf, em -> {
+			TypedQuery<TestJpa> q = em
+					.createQuery(String.format("SELECT o FROM %s AS o", TestJpa.class.getSimpleName()), TestJpa.class);
+			q.setMaxResults(1);
+			return q.getSingleResult();
+		});
+	}
+}

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

@@ -10,7 +10,9 @@
 
 import info.unterrainer.commons.jreutils.DateUtils;
 import info.unterrainer.commons.rdbutils.converters.LocalDateTimeConverter;
+import lombok.extern.slf4j.Slf4j;
 
+@Slf4j
 public class LocalDateTimeConverterTests {
 
 	LocalDateTimeConverter converter = new LocalDateTimeConverter();
@@ -26,11 +28,13 @@ public void conversionFromLocalDateTimeToTimestamp() {
 	public void conversionFromTimestampToLocalDateTime() {
 		LocalDateTime now = DateUtils.nowUtc();
 		Timestamp ts = new Timestamp(DateUtils.utcLocalDateTimeToEpoch(now));
+		ts.setNanos(now.truncatedTo(ChronoUnit.MICROS).getNano());
 		LocalDateTime d = converter.convertToEntityAttribute(ts);
 
 		Timestamp timestamp = Timestamp.valueOf(d);
 		timestamp.setNanos(d.truncatedTo(ChronoUnit.MICROS).getNano());
+		LocalDateTime other = DateUtils.nowUtc();
 
-		assertThat(d).isEqualTo(ts.toLocalDateTime());
+		assertThat(d).isEqualTo(other);
 	}
 }

src/test/java/info/unterrainer/commons/rdbutils/jpas/TestJpa.java

@@ -1,9 +1,8 @@
 package info.unterrainer.commons.rdbutils.jpas;
 
+import info.unterrainer.commons.rdbutils.entities.BasicJpa;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
-
-import info.unterrainer.commons.rdbutils.entities.BasicJpa;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;