updated rdb-utils and changed from javax.persistence to jakarta.persistence

Author: FragonGamer

README.md

@@ -27,10 +27,11 @@ Of course you can use your own. This example is only given as a reference and qu
 
 ```xml
 <?xml version="1.0" encoding="UTF-8"?>
-<persistence version="2.0"
-	xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/persistence 
-   http://java.sun.com/xml/ns/persistence/persistence_2_0.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="my-persistence-unit" transaction-type="RESOURCE_LOCAL">
 		<!-- Hibernate specific -->
@@ -41,9 +42,9 @@ Of course you can use your own. This example is only given as a reference and qu
 
 		<properties>
 			<!-- Hibernate-specific / MariaDB-JDBC-driver specific -->
-			<property name="javax.persistence.jdbc.driver" value="org.mariadb.jdbc.Driver" />
-			<property name="javax.persistence.lock.timeout" value="10000" />
-			<property name="javax.persistence.query.timeout" value="60000" />
+			<property name="jakarta.persistence.jdbc.driver" value="org.mariadb.jdbc.Driver" />
+			<property name="jakarta.persistence.lock.timeout" value="10000" />
+			<property name="jakarta.persistence.query.timeout" value="60000" />
 			<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" />

pom.xml

@@ -15,7 +15,7 @@
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>http-server</artifactId>
-	<version>0.3.2</version>
+	<version>0.3.3</version>
 	<name>HttpServer</name>
 	<packaging>jar</packaging>
 
@@ -28,22 +28,22 @@
 		<dependency>
 			<groupId>info.unterrainer.commons</groupId>
 			<artifactId>jre-utils</artifactId>
-			<version>0.3.0</version>
+			<version>0.3.6</version>
 		</dependency>
 		<dependency>
 			<groupId>info.unterrainer.commons</groupId>
 			<artifactId>rdb-utils</artifactId>
-			<version>0.2.0</version>
+			<version>0.2.1</version>
 		</dependency>
 		<dependency>
 			<groupId>info.unterrainer.commons</groupId>
 			<artifactId>serialization</artifactId>
 			<version>0.2.3</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.antlr</groupId>

src/main/java/info/unterrainer/commons/httpserver/daos/AsyncJpaListQueryBuilder.java

@@ -4,9 +4,9 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.TypedQuery;
 
 import info.unterrainer.commons.rdbutils.entities.BasicAsyncJpa;
 import info.unterrainer.commons.rdbutils.enums.AsyncState;
@@ -27,7 +27,7 @@ public TypedQuery<P> getTypedQuery(final EntityManager em) {
 	}
 
 	@Override
-	public javax.persistence.Query getCountQuery(final EntityManager em) {
+	public jakarta.persistence.Query getCountQuery(final EntityManager em) {
 		return dao.coreDao.getCountQuery(em, selectClause, joinClause, whereClause, parameters, asyncStates,
 				readTenantIds);
 	}

src/main/java/info/unterrainer/commons/httpserver/daos/AsyncJpqlDao.java

@@ -1,6 +1,6 @@
 package info.unterrainer.commons.httpserver.daos;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 
 import info.unterrainer.commons.httpserver.jpas.BasicPermissionJpa;
 import info.unterrainer.commons.rdbutils.entities.BasicAsyncJpa;

src/main/java/info/unterrainer/commons/httpserver/daos/AsyncListQueryBuilder.java

@@ -4,9 +4,9 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.TypedQuery;
 
 import info.unterrainer.commons.rdbutils.entities.BasicAsyncJpa;
 import info.unterrainer.commons.rdbutils.enums.AsyncState;
@@ -27,7 +27,7 @@ public TypedQuery<T> getTypedQuery(final EntityManager em) {
 	}
 
 	@Override
-	public javax.persistence.Query getCountQuery(final EntityManager em) {
+	public jakarta.persistence.Query getCountQuery(final EntityManager em) {
 		return dao.coreDao.getCountQuery(em, selectClause, joinClause, whereClause, parameters, asyncStates,
 				readTenantIds);
 	}

src/main/java/info/unterrainer/commons/httpserver/daos/BasicJpqlDao.java

@@ -4,9 +4,9 @@
 import java.util.Set;
 import java.util.function.Function;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.TypedQuery;
 
 import info.unterrainer.commons.rdbutils.entities.BasicJpa;
 import io.javalin.http.Context;

src/main/java/info/unterrainer/commons/httpserver/daos/BasicListQueryBuilder.java

@@ -2,9 +2,9 @@
 
 import java.util.HashMap;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.TypedQuery;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
+import jakarta.persistence.TypedQuery;
 
 import info.unterrainer.commons.rdbutils.entities.BasicJpa;
 import lombok.AccessLevel;
@@ -35,7 +35,7 @@ public TypedQuery<X> getTypedQuery(final EntityManager em) {
 				lockPessimistic, null, readTenantIds);
 	}
 
-	public javax.persistence.Query getCountQuery(final EntityManager em) {
+	public jakarta.persistence.Query getCountQuery(final EntityManager em) {
 		return dao.coreDao.getCountQuery(em, selectClause, joinClause, whereClause, parameters, null, readTenantIds);
 	}
 

src/main/java/info/unterrainer/commons/httpserver/daos/BasicQueryEntityManagerBuilder.java

@@ -6,7 +6,7 @@
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import info.unterrainer.commons.httpserver.enums.Attribute;
 import info.unterrainer.commons.rdbutils.entities.BasicJpa;

src/main/java/info/unterrainer/commons/httpserver/daos/CountQueryBuilder.java

@@ -1,6 +1,6 @@
 package info.unterrainer.commons.httpserver.daos;
 
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManagerFactory;
 
 import info.unterrainer.commons.rdbutils.Transactions;
 import info.unterrainer.commons.rdbutils.entities.BasicJpa;
@@ -14,10 +14,12 @@ public class CountQueryBuilder<P extends BasicJpa> extends BasicListQueryBuilder
 	public Long build() {
 		if (entityManager != null)
 			return (Long) dao.coreDao
-					.getCountQuery(entityManager, selectClause, joinClause, whereClause, parameters, null, readTenantIds)
+					.getCountQuery(entityManager, selectClause, joinClause, whereClause, parameters, null,
+							readTenantIds)
 					.getSingleResult();
 		return (Long) Transactions.withNewTransactionReturning(emf,
-				em -> dao.coreDao.getCountQuery(em, selectClause, joinClause, whereClause, parameters, null, readTenantIds)
+				em -> dao.coreDao
+						.getCountQuery(em, selectClause, joinClause, whereClause, parameters, null, readTenantIds)
 						.getSingleResult());
 	}
 }

src/main/java/info/unterrainer/commons/httpserver/daos/InsertQueryBuilder.java

@@ -2,7 +2,7 @@
 
 import java.util.function.Function;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
 
 import info.unterrainer.commons.rdbutils.Transactions;
 import info.unterrainer.commons.rdbutils.entities.BasicJpa;