Updated project to Java 21, migrated to Jakarta namespace and updated…

… dependencies to latest version.
kumuluz · Nov 29, 2023 · 74e3e36 · 74e3e36
1 parent 54bb123
commit 74e3e36
Show file tree

Hide file tree

Showing 33 changed files with 115 additions and 93 deletions.
diff --git a/core/pom.xml b/core/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <artifactId>kumuluzee-rest</artifactId>
         <groupId>com.kumuluz.ee.rest</groupId>
-        <version>2.1.0-SNAPSHOT</version>
+        <version>3.0.0-SNAPSHOT</version>
     </parent>
 
     <name>KumuluzEE REST Core</name>
@@ -17,8 +17,8 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.persistence</groupId>
-            <artifactId>javax.persistence-api</artifactId>
+            <groupId>jakarta.persistence</groupId>
+            <artifactId>jakarta.persistence-api</artifactId>
         </dependency>
         <dependency>
             <groupId>org.parboiled</groupId>

diff --git a/core/src/main/java/com/kumuluz/ee/rest/beans/CriteriaField.java b/core/src/main/java/com/kumuluz/ee/rest/beans/CriteriaField.java
@@ -20,7 +20,8 @@
  */
 package com.kumuluz.ee.rest.beans;
 
-import javax.persistence.criteria.Path;
+import jakarta.persistence.criteria.Path;
+
 import java.io.Serializable;
 
 /**

diff --git a/core/src/main/java/com/kumuluz/ee/rest/beans/CriteriaWhereQuery.java b/core/src/main/java/com/kumuluz/ee/rest/beans/CriteriaWhereQuery.java
@@ -20,7 +20,8 @@
  */
 package com.kumuluz.ee.rest.beans;
 
-import javax.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Predicate;
+
 import java.io.Serializable;
 
 /**

diff --git a/core/src/main/java/com/kumuluz/ee/rest/beans/QueryParameters.java b/core/src/main/java/com/kumuluz/ee/rest/beans/QueryParameters.java
@@ -110,7 +110,7 @@ public void setFields(List<String> fields) {
      * {@link #addFilterExpression(FilterExpressionOperation, QueryFilterExpression)} ()} instead.
      */
     public void addFilter(QueryFilter filter) {
-        if(filter != null) {
+        if (filter != null) {
             getFilters().add(filter);
         }
     }

diff --git a/core/src/main/java/com/kumuluz/ee/rest/interfaces/CriteriaFilter.java b/core/src/main/java/com/kumuluz/ee/rest/interfaces/CriteriaFilter.java
@@ -20,9 +20,9 @@
  */
 package com.kumuluz.ee.rest.interfaces;
 
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
+import jakarta.persistence.criteria.CriteriaBuilder;
+import jakarta.persistence.criteria.Predicate;
+import jakarta.persistence.criteria.Root;
 
 /**
  * @author Tilen Faganel

diff --git a/core/src/main/java/com/kumuluz/ee/rest/utils/JPAUtils.java b/core/src/main/java/com/kumuluz/ee/rest/utils/JPAUtils.java
@@ -31,13 +31,13 @@
 import com.kumuluz.ee.rest.exceptions.NoSuchEntityFieldException;
 import com.kumuluz.ee.rest.exceptions.QueryFormatException;
 import com.kumuluz.ee.rest.interfaces.CriteriaFilter;
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.Tuple;
+import jakarta.persistence.TupleElement;
+import jakarta.persistence.TypedQuery;
+import jakarta.persistence.criteria.*;
+import jakarta.persistence.metamodel.*;
 
-import javax.persistence.EntityManager;
-import javax.persistence.Tuple;
-import javax.persistence.TupleElement;
-import javax.persistence.TypedQuery;
-import javax.persistence.criteria.*;
-import javax.persistence.metamodel.*;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
@@ -194,7 +194,7 @@ public static <T> List<T> queryEntities(EntityManager em, Class<T> entity, Query
     }
 
     private static <T> Optional<TypedQuery<T>> buildQuery(EntityManager em, Class<T> entity, QueryParameters q, CriteriaFilter<T> customFilter,
-                                                List<QueryHintPair> queryHints, String rootAlias, boolean forceDistinct) {
+                                                          List<QueryHintPair> queryHints, String rootAlias, boolean forceDistinct) {
         if (em == null || entity == null)
             throw new IllegalArgumentException("The entity manager and the entity cannot be null.");
 
@@ -384,17 +384,17 @@ public static List<Selection<?>> createFieldsSelect(Root<?> r, QueryParameters q
     // Temporary methods to not break the public API
 
     private static <T> Optional<TypedQuery<T>> buildQuerySimple(EntityManager em, Class<T> entity, QueryParameters q,
-                                                      CriteriaFilter<T> customFilter,
-                                                      List<QueryHintPair> queryHints, String rootAlias,
-                                                      boolean forceDistinct) {
+                                                                CriteriaFilter<T> customFilter,
+                                                                List<QueryHintPair> queryHints, String rootAlias,
+                                                                boolean forceDistinct) {
         return buildQuerySimple(em, entity, q, customFilter, queryHints, rootAlias, forceDistinct, false);
     }
 
     @SuppressWarnings("unchecked")
     private static <T> Optional<TypedQuery<T>> buildQuerySimple(EntityManager em, Class<T> entity, QueryParameters q,
-                                                      CriteriaFilter<T> customFilter,
-                                                      List<QueryHintPair> queryHints, String rootAlias,
-                                                      boolean forceDistinct, boolean ignorePaging) {
+                                                                CriteriaFilter<T> customFilter,
+                                                                List<QueryHintPair> queryHints, String rootAlias,
+                                                                boolean forceDistinct, boolean ignorePaging) {
 
         LOG.finest("Querying entity: '" + entity.getSimpleName() + "' with parameters: " + q + "(simple)");
 
@@ -478,9 +478,9 @@ private static <T> Optional<TypedQuery<T>> buildQuerySimple(EntityManager em, Cl
 
     @SuppressWarnings("unchecked")
     private static <T> Optional<TypedQuery<T>> buildQueryAdvanced(EntityManager em, Class<T> entity, QueryParameters q,
-                                                       CriteriaFilter<T> customFilter,
-                                                       List<QueryHintPair> queryHints, String rootAlias,
-                                                       boolean forceDistinct) {
+                                                                  CriteriaFilter<T> customFilter,
+                                                                  List<QueryHintPair> queryHints, String rootAlias,
+                                                                  boolean forceDistinct) {
 
         LOG.finest("Querying entity: '" + entity.getSimpleName() + "' with parameters: " + q + "(advanced)");
 
@@ -778,7 +778,7 @@ private static Predicate createWhereQueryInternal(EntityManager em, CriteriaBuil
                                 );
                             }
                     }
-                }  else if (isCollection) {
+                } else if (isCollection) {
 
                     String idField;
 
@@ -840,7 +840,7 @@ private static <T> Stream<T> createEntitiesFromTuples(List<Tuple> tuples, Class<
             try {
                 el = entity.getConstructor().newInstance();
             } catch (InstantiationException | IllegalAccessException |
-                    NoSuchMethodException | InvocationTargetException e) {
+                     NoSuchMethodException | InvocationTargetException e) {
 
                 throw new AssertionError();
             }
@@ -864,7 +864,8 @@ private static <T> Stream<T> createEntitiesFromTuples(List<Tuple> tuples, Class<
                         String[] fName = te.getAlias().split("\\.");
 
                         createEntityFromTuple(fName, entity, el, o, i);
-                    } catch (NoSuchFieldException | IllegalAccessException | NoSuchMethodException | InvocationTargetException | InstantiationException e) {
+                    } catch (NoSuchFieldException | IllegalAccessException | NoSuchMethodException |
+                             InvocationTargetException | InstantiationException e) {
 
                         throw new NoSuchEntityFieldException(e.getMessage(), te.getAlias(), entity.getSimpleName());
                     }
@@ -1135,7 +1136,7 @@ private static CriteriaField getCriteriaField(String fieldName, Root<?> r, Map<S
             String mappedFieldName = mappedFieldOptional.get();
 
             String[] mappedFields = mappedFieldName.split("\\.");
-            for (String mappedField: mappedFields) {
+            for (String mappedField : mappedFields) {
                 fieldPath = fieldPath == null ? mappedField : fieldPath + "." + mappedField;
 
                 if (fieldJoins.containsKey(fieldPath)) {

diff --git a/core/src/main/java/com/kumuluz/ee/rest/utils/StreamUtils.java b/core/src/main/java/com/kumuluz/ee/rest/utils/StreamUtils.java
@@ -493,7 +493,8 @@ private static StreamCriteriaWhereQuery createWhereQueryInternal(Class<?> clazz,
 
     private static StreamCriteriaField getStreamCriteriaField(Class<?> clazz, String fieldName) {
 
-        if (fieldName == null) throw new NoSuchEntityFieldException("No such entity field", fieldName, clazz.getSimpleName());
+        if (fieldName == null)
+            throw new NoSuchEntityFieldException("No such entity field", fieldName, clazz.getSimpleName());
 
         String[] fields = fieldName.split("\\.");
 

diff --git a/core/src/test/java/com/kumuluz/ee/rest/test/JPAUtilsCountTest.java b/core/src/test/java/com/kumuluz/ee/rest/test/JPAUtilsCountTest.java
@@ -6,12 +6,12 @@
 import com.kumuluz.ee.rest.test.entities.User;
 import com.kumuluz.ee.rest.test.utils.JpaUtil;
 import com.kumuluz.ee.rest.utils.JPAUtils;
+import jakarta.persistence.EntityManager;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import javax.persistence.EntityManager;
 import java.util.Arrays;
 import java.util.Collection;
 

diff --git a/core/src/test/java/com/kumuluz/ee/rest/test/JPAUtilsCriteriaFilterTest.java b/core/src/test/java/com/kumuluz/ee/rest/test/JPAUtilsCriteriaFilterTest.java
@@ -6,12 +6,12 @@
 import com.kumuluz.ee.rest.test.entities.User;
 import com.kumuluz.ee.rest.test.utils.JpaUtil;
 import com.kumuluz.ee.rest.utils.JPAUtils;
+import jakarta.persistence.EntityManager;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import javax.persistence.EntityManager;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;

diff --git a/core/src/test/java/com/kumuluz/ee/rest/test/JPAUtilsFieldsTest.java b/core/src/test/java/com/kumuluz/ee/rest/test/JPAUtilsFieldsTest.java
@@ -7,12 +7,12 @@
 import com.kumuluz.ee.rest.test.entities.User;
 import com.kumuluz.ee.rest.test.utils.JpaUtil;
 import com.kumuluz.ee.rest.utils.JPAUtils;
+import jakarta.persistence.EntityManager;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import javax.persistence.EntityManager;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;

diff --git a/core/src/test/java/com/kumuluz/ee/rest/test/JPAUtilsFiltersTest.java b/core/src/test/java/com/kumuluz/ee/rest/test/JPAUtilsFiltersTest.java
@@ -9,12 +9,12 @@
 import com.kumuluz.ee.rest.test.entities.User;
 import com.kumuluz.ee.rest.test.utils.JpaUtil;
 import com.kumuluz.ee.rest.utils.JPAUtils;
+import jakarta.persistence.EntityManager;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import javax.persistence.EntityManager;
 import java.time.ZonedDateTime;
 import java.util.Arrays;
 import java.util.Collection;

diff --git a/core/src/test/java/com/kumuluz/ee/rest/test/JPAUtilsOrderTest.java b/core/src/test/java/com/kumuluz/ee/rest/test/JPAUtilsOrderTest.java
@@ -9,12 +9,12 @@
 import com.kumuluz.ee.rest.test.entities.User;
 import com.kumuluz.ee.rest.test.utils.JpaUtil;
 import com.kumuluz.ee.rest.utils.JPAUtils;
+import jakarta.persistence.EntityManager;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import javax.persistence.EntityManager;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Comparator;

diff --git a/core/src/test/java/com/kumuluz/ee/rest/test/JPAUtilsPagingTest.java b/core/src/test/java/com/kumuluz/ee/rest/test/JPAUtilsPagingTest.java
@@ -6,12 +6,12 @@
 import com.kumuluz.ee.rest.test.entities.User;
 import com.kumuluz.ee.rest.test.utils.JpaUtil;
 import com.kumuluz.ee.rest.utils.JPAUtils;
+import jakarta.persistence.EntityManager;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import javax.persistence.EntityManager;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;

diff --git a/core/src/test/java/com/kumuluz/ee/rest/test/JPAUtilsTemporalTest.java b/core/src/test/java/com/kumuluz/ee/rest/test/JPAUtilsTemporalTest.java
@@ -9,12 +9,12 @@
 import com.kumuluz.ee.rest.test.entities.User;
 import com.kumuluz.ee.rest.test.utils.JpaUtil;
 import com.kumuluz.ee.rest.utils.JPAUtils;
+import jakarta.persistence.EntityManager;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import javax.persistence.EntityManager;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;

diff --git a/core/src/test/java/com/kumuluz/ee/rest/test/QueriedTest.java b/core/src/test/java/com/kumuluz/ee/rest/test/QueriedTest.java
@@ -10,7 +10,8 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
+
 import java.util.Arrays;
 import java.util.Collection;
 

diff --git a/core/src/test/java/com/kumuluz/ee/rest/test/QueryStreamTest.java b/core/src/test/java/com/kumuluz/ee/rest/test/QueryStreamTest.java
@@ -4,12 +4,12 @@
 import com.kumuluz.ee.rest.test.entities.User;
 import com.kumuluz.ee.rest.test.utils.JpaUtil;
 import com.kumuluz.ee.rest.utils.JPAUtils;
+import jakarta.persistence.EntityManager;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import javax.persistence.EntityManager;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Optional;

diff --git a/core/src/test/java/com/kumuluz/ee/rest/test/StreamUtilsCountTest.java b/core/src/test/java/com/kumuluz/ee/rest/test/StreamUtilsCountTest.java
@@ -6,12 +6,12 @@
 import com.kumuluz.ee.rest.test.entities.User;
 import com.kumuluz.ee.rest.test.utils.JpaUtil;
 import com.kumuluz.ee.rest.utils.StreamUtils;
+import jakarta.persistence.EntityManager;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import javax.persistence.EntityManager;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
@@ -72,7 +72,7 @@ public void testQueryCount() {
         Long count = StreamUtils.queryEntitiesCount(users, q);
 
         Assert.assertNotNull(count);
-        Assert.assertEquals( 2L, count.longValue());
+        Assert.assertEquals(2L, count.longValue());
     }
 
     @Test

diff --git a/core/src/test/java/com/kumuluz/ee/rest/test/StreamUtilsFieldsTest.java b/core/src/test/java/com/kumuluz/ee/rest/test/StreamUtilsFieldsTest.java
@@ -7,12 +7,12 @@
 import com.kumuluz.ee.rest.test.entities.User;
 import com.kumuluz.ee.rest.test.utils.JpaUtil;
 import com.kumuluz.ee.rest.utils.StreamUtils;
+import jakarta.persistence.EntityManager;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import javax.persistence.EntityManager;
 import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.ZoneId;

diff --git a/core/src/test/java/com/kumuluz/ee/rest/test/StreamUtilsFiltersTest.java b/core/src/test/java/com/kumuluz/ee/rest/test/StreamUtilsFiltersTest.java
@@ -9,12 +9,12 @@
 import com.kumuluz.ee.rest.test.entities.User;
 import com.kumuluz.ee.rest.test.utils.JpaUtil;
 import com.kumuluz.ee.rest.utils.StreamUtils;
+import jakarta.persistence.EntityManager;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import javax.persistence.EntityManager;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;

diff --git a/core/src/test/java/com/kumuluz/ee/rest/test/StreamUtilsOrderTest.java b/core/src/test/java/com/kumuluz/ee/rest/test/StreamUtilsOrderTest.java
@@ -16,7 +16,8 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import javax.persistence.EntityManager;
+import jakarta.persistence.EntityManager;
+
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Comparator;

diff --git a/core/src/test/java/com/kumuluz/ee/rest/test/StreamUtilsPagingTest.java b/core/src/test/java/com/kumuluz/ee/rest/test/StreamUtilsPagingTest.java
@@ -6,12 +6,12 @@
 import com.kumuluz.ee.rest.test.entities.User;
 import com.kumuluz.ee.rest.test.utils.JpaUtil;
 import com.kumuluz.ee.rest.utils.StreamUtils;
+import jakarta.persistence.EntityManager;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
-import javax.persistence.EntityManager;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;

diff --git a/core/src/test/java/com/kumuluz/ee/rest/test/entities/Event.java b/core/src/test/java/com/kumuluz/ee/rest/test/entities/Event.java
@@ -1,6 +1,10 @@
 package com.kumuluz.ee.rest.test.entities;
 
-import javax.persistence.*;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
+
 import java.time.Instant;
 import java.time.OffsetDateTime;
 import java.time.ZonedDateTime;

diff --git a/core/src/test/java/com/kumuluz/ee/rest/test/entities/ExternalInfo.java b/core/src/test/java/com/kumuluz/ee/rest/test/entities/ExternalInfo.java
@@ -1,7 +1,7 @@
 package com.kumuluz.ee.rest.test.entities;
 
-import javax.persistence.Column;
-import javax.persistence.MappedSuperclass;
+import jakarta.persistence.Column;
+import jakarta.persistence.MappedSuperclass;
 
 /**
  * @author gpor0