Update dependencies for JPA 3 support

CHANGELOG.txt

@@ -1,5 +1,8 @@
 NestedJ Changelog:
 
+- 6.0.0
+    - support JPA 3 (replace javax.persistence.* with jakarta.persistence.*)
+
 - 5.0.3
     - pass the node instance into generated JDBC key resolver
 

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>pl.exsio</groupId>
     <artifactId>NestedJ</artifactId>
-    <version>5.0.4.RELEASE</version>
+    <version>6.0.0.RELEASE</version>
     <packaging>jar</packaging>
 
     <name>NestedJ</name>
@@ -13,31 +13,32 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.5.0</version>
+        <version>3.0.5</version>
         <relativePath />
     </parent>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <java.version>1.8</java.version>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
-        <logback.version>1.2.3</logback.version>
-        <h2.version>1.4.200</h2.version>
+        <java.version>17</java.version>
+        <maven.compiler.source>17</maven.compiler.source>
+        <maven.compiler.target>17</maven.compiler.target>
+        <logback.version>1.4.6</logback.version>
+        <h2.version>2.1.214</h2.version>
     </properties>
 
     <dependencies>
 
         <dependency>
-            <groupId>org.hibernate.javax.persistence</groupId>
-            <artifactId>hibernate-jpa-2.1-api</artifactId>
-            <version>1.0.2.Final</version>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <version>3.1.0</version>
             <scope>provided</scope>
         </dependency>
+
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
-            <version>5.3.7</version>
+            <version>6.0.7</version>
             <scope>provided</scope>
         </dependency>
 
@@ -77,7 +78,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
+                <version>3.0.0</version>
                 <configuration>
                     <argLine>${argLine}</argLine>
                     <includes>
@@ -88,7 +89,7 @@
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
-                <version>0.8.7</version>
+                <version>0.8.9</version>
                 <executions>
                     <execution>
                         <goals>

src/main/java/pl/exsio/nestedj/DelegatingNestedNodeRepository.java

@@ -19,7 +19,12 @@
  */
 package pl.exsio.nestedj;
 
-import pl.exsio.nestedj.delegate.*;
+import pl.exsio.nestedj.delegate.NestedNodeHierarchyManipulator;
+import pl.exsio.nestedj.delegate.NestedNodeInserter;
+import pl.exsio.nestedj.delegate.NestedNodeMover;
+import pl.exsio.nestedj.delegate.NestedNodeRebuilder;
+import pl.exsio.nestedj.delegate.NestedNodeRemover;
+import pl.exsio.nestedj.delegate.NestedNodeRetriever;
 import pl.exsio.nestedj.ex.InvalidNodeException;
 import pl.exsio.nestedj.ex.InvalidParentException;
 import pl.exsio.nestedj.ex.RepositoryLockedException;

src/main/java/pl/exsio/nestedj/config/jdbc/factory/JdbcNestedNodeRepositoryFactory.java

@@ -23,8 +23,16 @@
 import pl.exsio.nestedj.DelegatingNestedNodeRepository;
 import pl.exsio.nestedj.NestedNodeRepository;
 import pl.exsio.nestedj.config.jdbc.JdbcNestedNodeRepositoryConfiguration;
-import pl.exsio.nestedj.delegate.control.*;
-import pl.exsio.nestedj.delegate.query.jdbc.*;
+import pl.exsio.nestedj.delegate.control.QueryBasedNestedNodeInserter;
+import pl.exsio.nestedj.delegate.control.QueryBasedNestedNodeMover;
+import pl.exsio.nestedj.delegate.control.QueryBasedNestedNodeRebuilder;
+import pl.exsio.nestedj.delegate.control.QueryBasedNestedNodeRemover;
+import pl.exsio.nestedj.delegate.control.QueryBasedNestedNodeRetriever;
+import pl.exsio.nestedj.delegate.query.jdbc.JdbcNestedNodeInsertingQueryDelegate;
+import pl.exsio.nestedj.delegate.query.jdbc.JdbcNestedNodeMovingQueryDelegate;
+import pl.exsio.nestedj.delegate.query.jdbc.JdbcNestedNodeRebuildingQueryDelegate;
+import pl.exsio.nestedj.delegate.query.jdbc.JdbcNestedNodeRemovingQueryDelegate;
+import pl.exsio.nestedj.delegate.query.jdbc.JdbcNestedNodeRetrievingQueryDelegate;
 import pl.exsio.nestedj.lock.NoLock;
 import pl.exsio.nestedj.model.NestedNode;
 

src/main/java/pl/exsio/nestedj/config/jpa/JpaNestedNodeRepositoryConfiguration.java

@@ -20,11 +20,11 @@
 
 package pl.exsio.nestedj.config.jpa;
 
+import jakarta.persistence.EntityManager;
 import pl.exsio.nestedj.config.jpa.discriminator.JpaTreeDiscriminator;
 import pl.exsio.nestedj.config.jpa.discriminator.MapJpaTreeDiscriminator;
 import pl.exsio.nestedj.model.NestedNode;
 
-import javax.persistence.EntityManager;
 import java.io.Serializable;
 
 /**

src/main/java/pl/exsio/nestedj/config/jpa/discriminator/JpaTreeDiscriminator.java

@@ -20,11 +20,11 @@
 
 package pl.exsio.nestedj.config.jpa.discriminator;
 
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 import pl.exsio.nestedj.model.NestedNode;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
 import java.io.Serializable;
 import java.util.List;
 

src/main/java/pl/exsio/nestedj/config/jpa/discriminator/MapJpaTreeDiscriminator.java

@@ -20,11 +20,11 @@
 
 package pl.exsio.nestedj.config.jpa.discriminator;
 
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 import pl.exsio.nestedj.model.NestedNode;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;

src/main/java/pl/exsio/nestedj/config/jpa/factory/JpaNestedNodeRepositoryFactory.java

@@ -23,8 +23,16 @@
 import pl.exsio.nestedj.DelegatingNestedNodeRepository;
 import pl.exsio.nestedj.NestedNodeRepository;
 import pl.exsio.nestedj.config.jpa.JpaNestedNodeRepositoryConfiguration;
-import pl.exsio.nestedj.delegate.control.*;
-import pl.exsio.nestedj.delegate.query.jpa.*;
+import pl.exsio.nestedj.delegate.control.QueryBasedNestedNodeInserter;
+import pl.exsio.nestedj.delegate.control.QueryBasedNestedNodeMover;
+import pl.exsio.nestedj.delegate.control.QueryBasedNestedNodeRebuilder;
+import pl.exsio.nestedj.delegate.control.QueryBasedNestedNodeRemover;
+import pl.exsio.nestedj.delegate.control.QueryBasedNestedNodeRetriever;
+import pl.exsio.nestedj.delegate.query.jpa.JpaNestedNodeInsertingQueryDelegate;
+import pl.exsio.nestedj.delegate.query.jpa.JpaNestedNodeMovingQueryDelegate;
+import pl.exsio.nestedj.delegate.query.jpa.JpaNestedNodeRebuildingQueryDelegate;
+import pl.exsio.nestedj.delegate.query.jpa.JpaNestedNodeRemovingQueryDelegate;
+import pl.exsio.nestedj.delegate.query.jpa.JpaNestedNodeRetrievingQueryDelegate;
 import pl.exsio.nestedj.lock.NoLock;
 import pl.exsio.nestedj.model.NestedNode;
 

src/main/java/pl/exsio/nestedj/config/mem/factory/InMemoryNestedNodeRepositoryFactory.java

@@ -23,8 +23,16 @@
 import pl.exsio.nestedj.DelegatingNestedNodeRepository;
 import pl.exsio.nestedj.NestedNodeRepository;
 import pl.exsio.nestedj.config.mem.InMemoryNestedNodeRepositoryConfiguration;
-import pl.exsio.nestedj.delegate.control.*;
-import pl.exsio.nestedj.delegate.query.mem.*;
+import pl.exsio.nestedj.delegate.control.QueryBasedNestedNodeInserter;
+import pl.exsio.nestedj.delegate.control.QueryBasedNestedNodeMover;
+import pl.exsio.nestedj.delegate.control.QueryBasedNestedNodeRebuilder;
+import pl.exsio.nestedj.delegate.control.QueryBasedNestedNodeRemover;
+import pl.exsio.nestedj.delegate.control.QueryBasedNestedNodeRetriever;
+import pl.exsio.nestedj.delegate.query.mem.InMemoryNestedNodeInsertingQueryDelegate;
+import pl.exsio.nestedj.delegate.query.mem.InMemoryNestedNodeMovingQueryDelegate;
+import pl.exsio.nestedj.delegate.query.mem.InMemoryNestedNodeRebuildingQueryDelegate;
+import pl.exsio.nestedj.delegate.query.mem.InMemoryNestedNodeRemovingQueryDelegate;
+import pl.exsio.nestedj.delegate.query.mem.InMemoryNestedNodeRetrievingQueryDelegate;
 import pl.exsio.nestedj.lock.NoLock;
 import pl.exsio.nestedj.model.NestedNode;
 

src/main/java/pl/exsio/nestedj/delegate/query/jpa/JpaNestedNodeInsertingQueryDelegate.java

@@ -20,13 +20,13 @@
 
 package pl.exsio.nestedj.delegate.query.jpa;
 
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaUpdate;
+import jakarta.persistence.criteria.Root;
 import pl.exsio.nestedj.config.jpa.JpaNestedNodeRepositoryConfiguration;
 import pl.exsio.nestedj.delegate.query.NestedNodeInsertingQueryDelegate;
 import pl.exsio.nestedj.model.NestedNode;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaUpdate;
-import javax.persistence.criteria.Root;
 import java.io.Serializable;
 
 public class JpaNestedNodeInsertingQueryDelegate<ID extends Serializable, N extends NestedNode<ID>>

src/main/java/pl/exsio/nestedj/delegate/query/jpa/JpaNestedNodeMovingQueryDelegate.java

@@ -20,15 +20,15 @@
 
 package pl.exsio.nestedj.delegate.query.jpa;
 
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaUpdate;
+import jakarta.persistence.criteria.Expression;
+import jakarta.persistence.criteria.Root;
 import pl.exsio.nestedj.config.jpa.JpaNestedNodeRepositoryConfiguration;
 import pl.exsio.nestedj.delegate.query.NestedNodeMovingQueryDelegate;
 import pl.exsio.nestedj.model.NestedNode;
 import pl.exsio.nestedj.model.NestedNodeInfo;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaUpdate;
-import javax.persistence.criteria.Expression;
-import javax.persistence.criteria.Root;
 import java.io.Serializable;
 
 import static pl.exsio.nestedj.model.NestedNode.ID;

src/main/java/pl/exsio/nestedj/delegate/query/jpa/JpaNestedNodeQueryDelegate.java

@@ -20,14 +20,14 @@
 
 package pl.exsio.nestedj.delegate.query.jpa;
 
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 import pl.exsio.nestedj.config.jpa.JpaNestedNodeRepositoryConfiguration;
 import pl.exsio.nestedj.config.jpa.discriminator.JpaTreeDiscriminator;
 import pl.exsio.nestedj.model.NestedNode;
 
-import javax.persistence.EntityManager;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collections;

src/main/java/pl/exsio/nestedj/delegate/query/jpa/JpaNestedNodeRebuildingQueryDelegate.java

@@ -20,18 +20,22 @@
 
 package pl.exsio.nestedj.delegate.query.jpa;
 
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.CriteriaUpdate;
+import jakarta.persistence.criteria.Root;
 import pl.exsio.nestedj.config.jpa.JpaNestedNodeRepositoryConfiguration;
 import pl.exsio.nestedj.delegate.query.NestedNodeRebuildingQueryDelegate;
 import pl.exsio.nestedj.model.NestedNode;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.CriteriaUpdate;
-import javax.persistence.criteria.Root;
 import java.io.Serializable;
 import java.util.List;
 
-import static pl.exsio.nestedj.model.NestedNode.*;
+import static pl.exsio.nestedj.model.NestedNode.ID;
+import static pl.exsio.nestedj.model.NestedNode.LEFT;
+import static pl.exsio.nestedj.model.NestedNode.LEVEL;
+import static pl.exsio.nestedj.model.NestedNode.PARENT_ID;
+import static pl.exsio.nestedj.model.NestedNode.RIGHT;
 
 public class JpaNestedNodeRebuildingQueryDelegate<ID extends Serializable, N extends NestedNode<ID>>
         extends JpaNestedNodeQueryDelegate<ID, N>

src/main/java/pl/exsio/nestedj/delegate/query/jpa/JpaNestedNodeRemovingQueryDelegate.java

@@ -20,18 +20,26 @@
 
 package pl.exsio.nestedj.delegate.query.jpa;
 
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaDelete;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.CriteriaUpdate;
+import jakarta.persistence.criteria.Root;
 import pl.exsio.nestedj.config.jpa.JpaNestedNodeRepositoryConfiguration;
 import pl.exsio.nestedj.delegate.query.NestedNodeRemovingQueryDelegate;
 import pl.exsio.nestedj.ex.InvalidNodeException;
 import pl.exsio.nestedj.model.NestedNode;
 import pl.exsio.nestedj.model.NestedNodeInfo;
 
-import javax.persistence.NoResultException;
-import javax.persistence.criteria.*;
 import java.io.Serializable;
 import java.util.Optional;
 
-import static pl.exsio.nestedj.model.NestedNode.*;
+import static pl.exsio.nestedj.model.NestedNode.ID;
+import static pl.exsio.nestedj.model.NestedNode.LEFT;
+import static pl.exsio.nestedj.model.NestedNode.LEVEL;
+import static pl.exsio.nestedj.model.NestedNode.PARENT_ID;
+import static pl.exsio.nestedj.model.NestedNode.RIGHT;
 
 public class JpaNestedNodeRemovingQueryDelegate<ID extends Serializable, N extends NestedNode<ID>>
         extends JpaNestedNodeQueryDelegate<ID, N>

src/main/java/pl/exsio/nestedj/delegate/query/jpa/JpaNestedNodeRetrievingQueryDelegate.java

@@ -20,21 +20,25 @@
 
 package pl.exsio.nestedj.delegate.query.jpa;
 
+import jakarta.persistence.NoResultException;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import pl.exsio.nestedj.config.jpa.JpaNestedNodeRepositoryConfiguration;
 import pl.exsio.nestedj.delegate.query.NestedNodeRetrievingQueryDelegate;
 import pl.exsio.nestedj.model.NestedNode;
 import pl.exsio.nestedj.model.NestedNodeInfo;
 
-import javax.persistence.NoResultException;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
-import static pl.exsio.nestedj.model.NestedNode.*;
+import static pl.exsio.nestedj.model.NestedNode.ID;
+import static pl.exsio.nestedj.model.NestedNode.LEFT;
+import static pl.exsio.nestedj.model.NestedNode.LEVEL;
+import static pl.exsio.nestedj.model.NestedNode.PARENT_ID;
+import static pl.exsio.nestedj.model.NestedNode.RIGHT;
 
 public class JpaNestedNodeRetrievingQueryDelegate<ID extends Serializable, N extends NestedNode<ID>>
         extends JpaNestedNodeQueryDelegate<ID, N>

src/main/java/pl/exsio/nestedj/delegate/query/mem/InMemoryNestedNodeRetrievingQueryDelegate.java

@@ -31,7 +31,11 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import static pl.exsio.nestedj.model.NestedNode.*;
+import static pl.exsio.nestedj.model.NestedNode.ID;
+import static pl.exsio.nestedj.model.NestedNode.LEFT;
+import static pl.exsio.nestedj.model.NestedNode.LEVEL;
+import static pl.exsio.nestedj.model.NestedNode.PARENT_ID;
+import static pl.exsio.nestedj.model.NestedNode.RIGHT;
 
 public class InMemoryNestedNodeRetrievingQueryDelegate<ID extends Serializable, N extends NestedNode<ID>>
         extends InMemoryNestedNodeQueryDelegate<ID, N>