Merge pull request #314 from speedment/jpa3

Migrate to JPA 3
speedment · Apr 11, 2023 · 8850698 · 8850698
2 parents 7e44610 + 74bfa23
commit 8850698
Show file tree

Hide file tree

Showing 99 changed files with 201 additions and 185 deletions.
diff --git a/application/pom.xml b/application/pom.xml
@@ -52,8 +52,9 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>javax.persistence-api</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <version>${jakarta.version}</version>
         </dependency>
 
         <dependency>

diff --git a/application/src/main/java/com/speedment/jpastreamer/application/JPAStreamer.java b/application/src/main/java/com/speedment/jpastreamer/application/JPAStreamer.java
@@ -18,8 +18,8 @@
 import com.speedment.jpastreamer.rootfactory.RootFactory;
 import com.speedment.jpastreamer.streamconfiguration.StreamConfiguration;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
 import java.util.ServiceLoader;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
@@ -193,7 +193,7 @@ default <T> Stream<T> stream(final Projection<T> projection) {
     /**
      * Resets the Streamer associated with the provided Entity classes.
      * <p> 
-     * This will create a new instance of the underlying {@code java.persistence.EntityManager}, removing all entries of the 
+     * This will create a new instance of the underlying {@code jakarta.persistence.EntityManager}, removing all entries of the 
      * associated Entity class from the first-level cache. 
      * 
      * In case JPAStreamer was configured with a {@code Supplier<EntityManager>} the lifecycle of the Entity Managers is 

diff --git a/...cation/src/main/java/com/speedment/jpastreamer/application/JPAStreamerBuilderFactory.java b/...cation/src/main/java/com/speedment/jpastreamer/application/JPAStreamerBuilderFactory.java
@@ -12,8 +12,8 @@
  */
 package com.speedment.jpastreamer.application;
 
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.EntityManagerFactory;
 import java.util.function.Supplier;
 
 public interface JPAStreamerBuilderFactory {

diff --git a/application/src/main/java9/module-info.java b/application/src/main/java9/module-info.java
@@ -11,7 +11,7 @@
  * See: https://github.com/speedment/jpa-streamer/blob/master/LICENSE
  */
 module jpastreamer.application {
-    requires transitive java.persistence;
+    requires transitive jakarta.persistence;
     requires transitive jpastreamer.field;
     requires transitive jpastreamer.streamconfiguration;
     requires jpastreamer.rootfactory;
@@ -20,4 +20,4 @@
 
     uses com.speedment.jpastreamer.application.JPAStreamerBuilderFactory;
 
-}
+}
diff --git a/core/pom.xml b/core/pom.xml
@@ -37,8 +37,9 @@
     <dependencies>
 
         <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>javax.persistence-api</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <version>${jakarta.version}</version>
         </dependency>
 
         <dependency>

diff --git a/core/src/main/java9/module-info.java b/core/src/main/java9/module-info.java
@@ -13,7 +13,7 @@
 module jpastreamer.core {
     exports com.speedment.jpastreamer.core;
 
-    requires transitive java.persistence;
+    requires transitive jakarta.persistence;
     requires transitive jpastreamer.application;
     requires transitive jpastreamer.field;
 

diff --git a/criteria/pom.xml b/criteria/pom.xml
@@ -41,9 +41,11 @@
         </dependency>
 
         <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>javax.persistence-api</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <version>${jakarta.version}</version>
         </dependency>
+
     </dependencies>
 
 </project>
diff --git a/criteria/src/main/java/com/speedment/jpastreamer/criteria/Criteria.java b/criteria/src/main/java/com/speedment/jpastreamer/criteria/Criteria.java
@@ -12,9 +12,9 @@
  */
 package com.speedment.jpastreamer.criteria;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 import java.util.List;
 
 /**

diff --git a/criteria/src/main/java/com/speedment/jpastreamer/criteria/CriteriaFactory.java b/criteria/src/main/java/com/speedment/jpastreamer/criteria/CriteriaFactory.java
@@ -14,10 +14,10 @@
 
 import static java.util.Objects.requireNonNull;
 
-import javax.persistence.EntityManager;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.CriteriaQuery;
+import jakarta.persistence.criteria.Root;
 
 /**
  * @author Mislav Milicevic

diff --git a/criteria/src/main/java/com/speedment/jpastreamer/criteria/OrderFactory.java b/criteria/src/main/java/com/speedment/jpastreamer/criteria/OrderFactory.java
@@ -12,7 +12,7 @@
  */
 package com.speedment.jpastreamer.criteria;
 
-import javax.persistence.criteria.Order;
+import jakarta.persistence.criteria.Order;
 import java.util.Comparator;
 import java.util.List;
 

diff --git a/criteria/src/main/java/com/speedment/jpastreamer/criteria/PredicateFactory.java b/criteria/src/main/java/com/speedment/jpastreamer/criteria/PredicateFactory.java
@@ -14,7 +14,7 @@
 
 import com.speedment.jpastreamer.field.predicate.SpeedmentPredicate;
 
-import javax.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Predicate;
 
 /**
  * @author Mislav Milicevic

diff --git a/criteria/src/main/java/com/speedment/jpastreamer/criteria/QueryParameter.java b/criteria/src/main/java/com/speedment/jpastreamer/criteria/QueryParameter.java
@@ -12,7 +12,7 @@
  */
 package com.speedment.jpastreamer.criteria;
 
-import javax.persistence.criteria.ParameterExpression;
+import jakarta.persistence.criteria.ParameterExpression;
 
 /**
  * Stores a query parameter and the value associated with the parameter

diff --git a/criteria/src/main/java9/module-info.java b/criteria/src/main/java9/module-info.java
@@ -11,7 +11,7 @@
  * See: https://github.com/speedment/jpa-streamer/blob/master/LICENSE
  */
 module jpastreamer.criteria {
-    requires transitive java.persistence;
+    requires transitive jakarta.persistence;
     requires transitive jpastreamer.field;
 
     exports com.speedment.jpastreamer.criteria;

diff --git a/field/pom.xml b/field/pom.xml
@@ -39,8 +39,9 @@
     <dependencies>
 
         <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>javax.persistence-api</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <version>${jakarta.version}</version>
         </dependency>
 
         <dependency>

diff --git a/field/src/main/java/com/speedment/jpastreamer/field/internal/ByteFieldImpl.java b/field/src/main/java/com/speedment/jpastreamer/field/internal/ByteFieldImpl.java
@@ -24,7 +24,6 @@
 import com.speedment.jpastreamer.field.predicate.Inclusion;
 import com.speedment.jpastreamer.field.predicate.SpeedmentPredicate;
 
-import javax.persistence.AttributeConverter;
 import java.util.Collection;
 
 import static com.speedment.jpastreamer.field.internal.util.CollectionUtil.collectionToSet;

diff --git a/field/src/main/java/com/speedment/jpastreamer/field/trait/HasAttributeConverterClass.java b/field/src/main/java/com/speedment/jpastreamer/field/trait/HasAttributeConverterClass.java
@@ -12,7 +12,7 @@
  */
 package com.speedment.jpastreamer.field.trait;
 
-import javax.persistence.AttributeConverter;
+import jakarta.persistence.AttributeConverter;
 
 /**
  *

diff --git a/field/src/main/java9/module-info.java b/field/src/main/java9/module-info.java
@@ -12,7 +12,7 @@
  */
 module jpastreamer.field {
     requires com.speedment.common.invariant;
-    requires transitive java.persistence; // We expose this in fields via AttributeConverter
+    requires transitive jakarta.persistence; // We expose this in fields via AttributeConverter
 
     requires transitive com.speedment.common.function;
     requires transitive com.speedment.runtime.compute;

diff --git a/fieldgenerator/fieldgenerator-component/pom.xml b/fieldgenerator/fieldgenerator-component/pom.xml
@@ -38,8 +38,9 @@
     <dependencies>
 
         <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>javax.persistence-api</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <version>${jakarta.version}</version>
         </dependency>
 
         <dependency>

diff --git a/.../src/main/java/com/speedment/jpastreamer/fieldgenerator/component/FilmTitleConverter.java b/.../src/main/java/com/speedment/jpastreamer/fieldgenerator/component/FilmTitleConverter.java
@@ -12,8 +12,8 @@
  */
 package com.speedment.jpastreamer.fieldgenerator.component;
 
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
+import jakarta.persistence.AttributeConverter;
+import jakarta.persistence.Converter;
 
 @Converter
 public class FilmTitleConverter implements

diff --git a/fieldgenerator/fieldgenerator-component/src/main/java9/module-info.java b/fieldgenerator/fieldgenerator-component/src/main/java9/module-info.java
@@ -11,7 +11,7 @@
  * See: https://github.com/speedment/jpa-streamer/blob/master/LICENSE
  */
 module jpastreamer.fieldgenerator.component {
-    requires java.persistence;
+    requires jakarta.persistence;
 
     exports com.speedment.jpastreamer.fieldgenerator.component;
 }
diff --git a/fieldgenerator/fieldgenerator-standard/pom.xml b/fieldgenerator/fieldgenerator-standard/pom.xml
@@ -38,8 +38,9 @@
     <dependencies>
 
         <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>javax.persistence-api</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <version>${jakarta.version}</version>
         </dependency>
 
         <dependency>
@@ -130,8 +131,6 @@
         </profile>
     </profiles>
 
-
-
     <!--    <profiles>
             <profile>
                 <id>release</id>

diff --git a/...c/main/java/com/speedment/jpastreamer/fieldgenerator/StandardFieldGeneratorProcessor.java b/...c/main/java/com/speedment/jpastreamer/fieldgenerator/StandardFieldGeneratorProcessor.java
@@ -28,7 +28,7 @@
  * @since 0.1.0
  */
 
-@SupportedAnnotationTypes("javax.persistence.Entity")
+@SupportedAnnotationTypes("jakarta.persistence.Entity")
 @SupportedOptions({"jpaStreamerPackage", "jpaStreamerPrefix", "jpaStreamerSuffix"})
 @SupportedSourceVersion(SourceVersion.RELEASE_8)
 @AutoService(Processor.class)

diff --git a/...va/com/speedment/jpastreamer/fieldgenerator/internal/InternalFieldGeneratorProcessor.java b/...va/com/speedment/jpastreamer/fieldgenerator/internal/InternalFieldGeneratorProcessor.java
@@ -26,6 +26,10 @@
 import com.speedment.jpastreamer.fieldgenerator.internal.typeparser.TypeParser;
 import com.speedment.jpastreamer.field.*;
 
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Lob;
+
 import javax.annotation.processing.AbstractProcessor;
 import javax.annotation.processing.Messager;
 import javax.annotation.processing.ProcessingEnvironment;
@@ -35,16 +39,13 @@
 import javax.lang.model.type.TypeMirror;
 import javax.lang.model.util.Elements;
 import javax.lang.model.util.Types;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Lob;
+
 import javax.tools.Diagnostic;
 import javax.tools.JavaFileObject;
 import java.io.IOException;
 import java.io.Writer;
 import java.lang.reflect.Type;
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;

diff --git a/fieldgenerator/fieldgenerator-standard/src/main/java9/module-info.java b/fieldgenerator/fieldgenerator-standard/src/main/java9/module-info.java
@@ -15,7 +15,7 @@
     requires transitive com.google.auto.service;
 
     requires com.speedment.common.codegen;
-    requires java.persistence;
+    requires jakarta.persistence;
     requires jpastreamer.field;
 
     exports com.speedment.jpastreamer.fieldgenerator;

diff --git a/fieldgenerator/fieldgenerator-test-package/pom.xml b/fieldgenerator/fieldgenerator-test-package/pom.xml
@@ -38,8 +38,9 @@
     <dependencies>
 
         <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>javax.persistence-api</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
+            <version>${jakarta.version}</version>
         </dependency>
 
         <dependency>

diff --git a/...reamer/fieldgenerator/renaming/Actor.java → ...r/fieldgenerator/test/renaming/Actor.java b/...reamer/fieldgenerator/renaming/Actor.java → ...r/fieldgenerator/test/renaming/Actor.java
@@ -10,13 +10,13 @@
  *
  * See: https://github.com/speedment/jpa-streamer/blob/master/LICENSE
  */
-package com.speedment.jpastreamer.fieldgenerator.renaming;
+package com.speedment.jpastreamer.fieldgenerator.test.renaming;
 
 import lombok.AccessLevel;
 import lombok.Data;
 import lombok.Getter;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/...treamer/fieldgenerator/renaming/Film.java → ...er/fieldgenerator/test/renaming/Film.java b/...treamer/fieldgenerator/renaming/Film.java → ...er/fieldgenerator/test/renaming/Film.java
@@ -10,9 +10,9 @@
  *
  * See: https://github.com/speedment/jpa-streamer/blob/master/LICENSE
  */
-package com.speedment.jpastreamer.fieldgenerator.renaming;
+package com.speedment.jpastreamer.fieldgenerator.test.renaming;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.sql.Time;
 import java.time.LocalDateTime;
 import java.util.*;

diff --git a/...mer/fieldgenerator/renaming/Language.java → ...ieldgenerator/test/renaming/Language.java b/...mer/fieldgenerator/renaming/Language.java → ...ieldgenerator/test/renaming/Language.java
@@ -10,9 +10,9 @@
  *
  * See: https://github.com/speedment/jpa-streamer/blob/master/LICENSE
  */
-package com.speedment.jpastreamer.fieldgenerator.renaming;
+package com.speedment.jpastreamer.fieldgenerator.test.renaming;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import java.io.Serializable;
 import java.util.Set;
 

diff --git a/...treamer/fieldgenerator/renaming/Main.java → ...er/fieldgenerator/test/renaming/Main.java b/...treamer/fieldgenerator/renaming/Main.java → ...er/fieldgenerator/test/renaming/Main.java
@@ -10,7 +10,7 @@
  *
  * See: https://github.com/speedment/jpa-streamer/blob/master/LICENSE
  */
-package com.speedment.jpastreamer.fieldgenerator.renaming;
+package com.speedment.jpastreamer.fieldgenerator.test.renaming;
 
 import com.speedment.jpastreamer.fieldgenerator.test.renaming.inner.FilmB;
 
@@ -37,6 +37,6 @@ public static void main(String[] args) {
                 .filter(FilmB.rating.in("G", "PG"))
                 .sorted(FilmB.title)
                 .forEachOrdered(System.out::println);
-
+        
     }
 }
diff --git a/...treamer/fieldgenerator/renaming/User.java → ...er/fieldgenerator/test/renaming/User.java b/...treamer/fieldgenerator/renaming/User.java → ...er/fieldgenerator/test/renaming/User.java
@@ -10,10 +10,9 @@
  *
  * See: https://github.com/speedment/jpa-streamer/blob/master/LICENSE
  */
-package com.speedment.jpastreamer.fieldgenerator.renaming;
-
-import javax.persistence.*;
+package com.speedment.jpastreamer.fieldgenerator.test.renaming;
 
+import jakarta.persistence.*;
 @Entity
 public class User {
 

diff --git a/...reamer/fieldgenerator/renaming/User2.java → ...r/fieldgenerator/test/renaming/User2.java b/...reamer/fieldgenerator/renaming/User2.java → ...r/fieldgenerator/test/renaming/User2.java
@@ -10,9 +10,9 @@
  *
  * See: https://github.com/speedment/jpa-streamer/blob/master/LICENSE
  */
-package com.speedment.jpastreamer.fieldgenerator.renaming;
+package com.speedment.jpastreamer.fieldgenerator.test.renaming;
 
-import javax.persistence.*;
+import jakarta.persistence.*;
 import javax.validation.constraints.NotEmpty;
 
 import java.io.Serializable;
@@ -21,6 +21,7 @@
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+
 @Entity
 @Table(name="user")
 @Data