Merge branch 'develop'

FragonGamer · FragonGamer · commit 81a2820c00e1 · 2022-08-01T11:25:35.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -29,3 +29,5 @@ hs_err_pid*
 /bin/
 
 src/main/java/info/unterrainer/commons/rdbutils/Information.java
+/.apt_generated/
+/.apt_generated_tests/
diff --git a/.project b/.project
@@ -20,4 +20,15 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1658217977296</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>
diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml
@@ -16,4 +16,4 @@ services:
 networks:
   default:
     external:
-      name: proxy_default
+      name: proxy_default
diff --git a/pom.xml b/pom.xml
@@ -1,6 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<parent>
 		<groupId>info.unterrainer.commons</groupId>
@@ -10,7 +8,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>rdb-utils</artifactId>
-	<version>0.2.0</version>
+	<version>0.2.1</version>
 	<name>RdbUtils</name>
 	<packaging>jar</packaging>
 
@@ -24,27 +22,27 @@
 		<dependency>
 			<groupId>info.unterrainer.commons</groupId>
 			<artifactId>jre-utils</artifactId>
-			<version>0.3.0</version>
+			<version>0.3.6</version>
 		</dependency>
 		<dependency>
-			<groupId>javax.persistence</groupId>
-			<artifactId>javax.persistence-api</artifactId>
-			<version>2.2</version>
+			<groupId>jakarta.persistence</groupId>
+			<artifactId>jakarta.persistence-api</artifactId>
+			<version>3.1.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-c3p0</artifactId>
-			<version>5.4.15.Final</version>
+			<version>6.1.1.Final</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-core</artifactId>
-			<version>5.4.24.Final</version>
+			<version>6.1.1.Final</version>
 		</dependency>
 		<dependency>
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-entitymanager</artifactId>
-			<version>5.4.15.Final</version>
+			<version>5.6.10.Final</version>
 		</dependency>
 		<dependency>
 			<groupId>org.liquibase</groupId>
@@ -74,11 +72,10 @@
 						<execution>
 							<id>analyze</id>
 							<configuration>
-								<ignoredUnusedDeclaredDependencies
-									combine.children="append">
-									<ignoredUnusedDeclaredDependency>javax.persistence:javax.persistence-api</ignoredUnusedDeclaredDependency>
+								<ignoredUnusedDeclaredDependencies combine.children="append">
+									<ignoredUnusedDeclaredDependency>jakarta.persistence:jakarta.persistence-api</ignoredUnusedDeclaredDependency>
 									<ignoredUnusedDeclaredDependency>mysql:mysql-connector-java</ignoredUnusedDeclaredDependency>
-									<ignoredUnusedDeclaredDependency>org.eclipse.persistence:javax.persistence</ignoredUnusedDeclaredDependency>
+									<ignoredUnusedDeclaredDependency>org.eclipse.persistence:jakarta.persistence</ignoredUnusedDeclaredDependency>
 									<ignoredUnusedDeclaredDependency>org.hibernate:hibernate-c3p0</ignoredUnusedDeclaredDependency>
 									<ignoredUnusedDeclaredDependency>org.hibernate:hibernate-core</ignoredUnusedDeclaredDependency>
 									<ignoredUnusedDeclaredDependency>org.hibernate:hibernate-entitymanager</ignoredUnusedDeclaredDependency>
diff --git a/src/main/java/info/unterrainer/commons/rdbutils/RdbConfiguration.java b/src/main/java/info/unterrainer/commons/rdbutils/RdbConfiguration.java
@@ -29,7 +29,7 @@ public static RdbConfiguration read(final String prefix) {
 			p = prefix;
 		RdbConfiguration config = new RdbConfiguration();
 		config.driver = Optional.ofNullable(System.getenv(p + "DB_DRIVER")).orElse("mariadb");
-		config.server = Optional.ofNullable(System.getenv(p + "DB_SERVER")).orElse("10.10.196.4");
+		config.server = Optional.ofNullable(System.getenv(p + "DB_SERVER")).orElse("localhost");
 		config.port = Optional.ofNullable(System.getenv(p + "DB_PORT")).orElse("3306");
 		config.name = Optional.ofNullable(System.getenv(p + "DB_NAME")).orElse("test");
 		config.user = Optional.ofNullable(System.getenv(p + "DB_USER")).orElse("test");
diff --git a/src/main/java/info/unterrainer/commons/rdbutils/RdbUtils.java b/src/main/java/info/unterrainer/commons/rdbutils/RdbUtils.java
@@ -9,12 +9,11 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-
 import info.unterrainer.commons.jreutils.Resources;
 import info.unterrainer.commons.jreutils.ShutdownHook;
 import info.unterrainer.commons.rdbutils.exceptions.RdbUtilException;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Persistence;
 import liquibase.Contexts;
 import liquibase.LabelExpression;
 import liquibase.Liquibase;
@@ -28,9 +27,9 @@
 @Slf4j
 public class RdbUtils {
 
-	public static final String PROPERTY_NAME_URL = "javax.persistence.jdbc.url";
-	public static final String PROPERTY_NAME_USER = "javax.persistence.jdbc.user";
-	public static final String PROPERTY_NAME_PASSWORD = "javax.persistence.jdbc.password";
+	public static final String PROPERTY_NAME_URL = "jakarta.persistence.jdbc.url";
+	public static final String PROPERTY_NAME_USER = "jakarta.persistence.jdbc.user";
+	public static final String PROPERTY_NAME_PASSWORD = "jakarta.persistence.jdbc.password";
 
 	/**
 	 * Creates a new {@link EntityManagerFactory} with default-parameters or
diff --git a/src/main/java/info/unterrainer/commons/rdbutils/Transactions.java b/src/main/java/info/unterrainer/commons/rdbutils/Transactions.java
@@ -3,8 +3,8 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManager;
 
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
diff --git a/src/main/java/info/unterrainer/commons/rdbutils/converters/LocalDateTimeConverter.java b/src/main/java/info/unterrainer/commons/rdbutils/converters/LocalDateTimeConverter.java
@@ -4,22 +4,25 @@
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
-
-import info.unterrainer.commons.jreutils.DateUtils;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
 
 @Converter()
 public class LocalDateTimeConverter implements AttributeConverter<LocalDateTime, Timestamp> {
 
 	@Override
 	public Timestamp convertToDatabaseColumn(final LocalDateTime entityValue) {
-		return entityValue == null ? null
-				: new Timestamp(DateUtils.utcLocalDateTimeToEpoch(entityValue.truncatedTo(ChronoUnit.MICROS)));
+		if (entityValue == null)
+			return null;
+		Timestamp timestamp = Timestamp.valueOf(entityValue);
+		timestamp.setNanos(entityValue.truncatedTo(ChronoUnit.MICROS).getNano());
+		return timestamp;
 	}
 
 	@Override
 	public LocalDateTime convertToEntityAttribute(final Timestamp dbValue) {
-		return dbValue == null ? null : DateUtils.epochToUtcLocalDateTime(dbValue.getTime());
+		if (dbValue == null)
+			return null;
+		return dbValue.toLocalDateTime();
 	}
 }
diff --git a/src/main/java/info/unterrainer/commons/rdbutils/converters/ZonedDateTimeConverter.java b/src/main/java/info/unterrainer/commons/rdbutils/converters/ZonedDateTimeConverter.java
diff --git a/src/main/java/info/unterrainer/commons/rdbutils/entities/BasicAsyncJpa.java b/src/main/java/info/unterrainer/commons/rdbutils/entities/BasicAsyncJpa.java
@@ -1,8 +1,8 @@
 package info.unterrainer.commons.rdbutils.entities;
 
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.MappedSuperclass;
 
 import info.unterrainer.commons.rdbutils.enums.AsyncState;
 import lombok.Data;
diff --git a/src/main/java/info/unterrainer/commons/rdbutils/entities/BasicJpa.java b/src/main/java/info/unterrainer/commons/rdbutils/entities/BasicJpa.java
@@ -2,11 +2,11 @@
 
 import java.time.LocalDateTime;
 
-import javax.persistence.Convert;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.Convert;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.MappedSuperclass;
 
 import info.unterrainer.commons.rdbutils.converters.LocalDateTimeConverter;
 import lombok.Data;
diff --git a/src/test/java/info/unterrainer/commons/rdbutils/HibernateDialectTests.java b/src/test/java/info/unterrainer/commons/rdbutils/HibernateDialectTests.java
@@ -5,8 +5,8 @@
 import java.time.LocalDateTime;
 import java.util.List;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Query;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/info/unterrainer/commons/rdbutils/LocalDateTimeConverterTests.java b/src/test/java/info/unterrainer/commons/rdbutils/LocalDateTimeConverterTests.java
@@ -4,6 +4,7 @@
 
 import java.sql.Timestamp;
 import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
 
 import org.junit.jupiter.api.Test;
 
@@ -18,15 +19,18 @@ public class LocalDateTimeConverterTests {
 	public void conversionFromLocalDateTimeToTimestamp() {
 		LocalDateTime d = DateUtils.nowUtc();
 		Timestamp ts = converter.convertToDatabaseColumn(d);
-
-		assertThat(DateUtils.utcLocalDateTimeToEpoch(d)).isEqualTo(ts.getTime());
+		assertThat(ts.toLocalDateTime()).isEqualTo(d.truncatedTo(ChronoUnit.MICROS));
 	}
 
 	@Test
 	public void conversionFromTimestampToLocalDateTime() {
-		Timestamp ts = new Timestamp(DateUtils.utcLocalDateTimeToEpoch(DateUtils.nowUtc()));
+		LocalDateTime now = DateUtils.nowUtc();
+		Timestamp ts = new Timestamp(DateUtils.utcLocalDateTimeToEpoch(now));
 		LocalDateTime d = converter.convertToEntityAttribute(ts);
 
-		assertThat(ts.getTime()).isEqualTo(DateUtils.utcLocalDateTimeToEpoch(d));
+		Timestamp timestamp = Timestamp.valueOf(d);
+		timestamp.setNanos(d.truncatedTo(ChronoUnit.MICROS).getNano());
+
+		assertThat(d).isEqualTo(ts.toLocalDateTime());
 	}
 }
diff --git a/src/test/java/info/unterrainer/commons/rdbutils/ManualLockingTests.java b/src/test/java/info/unterrainer/commons/rdbutils/ManualLockingTests.java
@@ -6,10 +6,10 @@
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.LockModeType;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.LockModeType;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/info/unterrainer/commons/rdbutils/ManualTests.java b/src/test/java/info/unterrainer/commons/rdbutils/ManualTests.java
@@ -1,13 +1,14 @@
 package info.unterrainer.commons.rdbutils;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Query;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Query;
+import jakarta.persistence.TypedQuery;
 
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
@@ -46,7 +47,7 @@ public void persistingAndReadingEntityWorks() {
 		persistTestEntity(testJpa);
 		TestJpa jpa = selectFirstTestEntity();
 		assertThat(jpa.getMessage()).isEqualTo(testJpa.getMessage());
-		assertThat(jpa.getCreatedOn()).isEqualTo(testJpa.getCreatedOn().truncatedTo(ChronoUnit.MICROS));
+		assertEquals(jpa.getCreatedOn(), testJpa.getCreatedOn().truncatedTo(ChronoUnit.MICROS));
 		assertThat(jpa.getEditedOn()).isEqualTo(testJpa.getEditedOn().truncatedTo(ChronoUnit.MICROS));
 	}
 
diff --git a/src/test/java/info/unterrainer/commons/rdbutils/TransactionalTests.java b/src/test/java/info/unterrainer/commons/rdbutils/TransactionalTests.java
@@ -2,9 +2,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Query;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.Query;
 
 import org.junit.jupiter.api.Test;
 
diff --git a/src/test/java/info/unterrainer/commons/rdbutils/jpas/TestJpa.java b/src/test/java/info/unterrainer/commons/rdbutils/jpas/TestJpa.java
@@ -1,7 +1,7 @@
 package info.unterrainer.commons.rdbutils.jpas;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
 
 import info.unterrainer.commons.rdbutils.entities.BasicJpa;
 import lombok.Data;
diff --git a/src/test/resources/META-INF/persistence.xml b/src/test/resources/META-INF/persistence.xml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<persistence version="2.2"
-	xmlns="http://xmlns.jcp.org/xml/ns/persistence"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd">
+<persistence version="3.0" xmlns="https://jakarta.ee/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd">
 	<persistence-unit name="test" transaction-type="RESOURCE_LOCAL">
 		<!-- Hibernate specific -->
 		<provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
 
 		<class>info.unterrainer.commons.rdbutils.entities.BasicJpa</class>
 		<class>info.unterrainer.commons.rdbutils.converters.LocalDateTimeConverter</class>
-		
+
 		<properties>
 			<!-- Hibernate-specific / MariaDB-JDBC-driver specific -->
-			<property name="javax.persistence.jdbc.driver" value="org.mariadb.jdbc.Driver" />
+			<property name="jakarta.persistence.jdbc.driver" value="org.mariadb.jdbc.Driver" />
 			<property name="hibernate.connection.driver_class" value="org.mariadb.jdbc.Driver" />
 			<property name="hibernate.dialect" value="org.hibernate.dialect.MariaDBDialect" />
 			<property name="hibernate.temp.use_jdbc_metadata_defaults" value="false" />
-			<property name="hibernate.jdbc.time_zone" value="UTC"/>
-			
+			<property name="hibernate.jdbc.time_zone" value="UTC" />
+
 			<property name="hibernate.show_sql" value="false" />
 			<property name="hibernate.format_sql" value="false" />
 			<property name="hibernate.c3p0.min_size" value="5" />
