OPENJPA-2908

openjpa-lib/src/main/java/org/apache/openjpa/lib/conf/ClassListValue.java

@@ -56,21 +56,18 @@ protected String getInternalString() {
     @Override
     protected void setInternalString(String val) {
         String[] vals = StringUtil.split(val, ",", 0);
-        if (vals != null) {
-            for (int i = 0; i < vals.length; i++)
-                vals[i] = vals[i].trim();
+        if (vals.length == 0) {
+            set(null);
+            return;
         }
-
         final ClassLoader loader = AccessController.doPrivileged(J2DoPrivHelper.getContextClassLoaderAction());
-        set(ofNullable(StringUtil.split(val, ",", 0))
-                .map(it -> Stream.of(it).map(v -> {
-                    try {
-                        return loader.loadClass(v.trim());
-                    } catch (final ClassNotFoundException e) {
-                        throw new IllegalStateException(e);
-                    }
-                }).toArray(Class<?>[]::new))
-                .orElse(null));
+        set(Stream.of(vals).map(v -> {
+            try {
+                return loader.loadClass(v.trim());
+            } catch (final ClassNotFoundException e) {
+                throw new IllegalStateException(e);
+            }
+        }).toArray(Class<?>[]::new));
     }
 
     @Override

openjpa-persistence/src/main/java/org/apache/openjpa/persistence/PersistenceProviderImpl.java

@@ -46,6 +46,7 @@
 import jakarta.persistence.spi.PersistenceProvider;
 import jakarta.persistence.spi.PersistenceUnitInfo;
 import jakarta.persistence.spi.ProviderUtil;
+import jakarta.persistence.spi.TransformerException;
 
 import java.lang.instrument.ClassFileTransformer;
 import java.lang.instrument.IllegalClassFormatException;
@@ -384,12 +385,12 @@ public ClassLoader getClassLoader(Class<?> context, ClassLoader env) {
 
         @Override
         public byte[] transform(ClassLoader cl, String name, Class<?> previousVersion, ProtectionDomain pd, byte[] bytes)
-                throws IllegalClassFormatException {
+                throws TransformerException {
             try {
                 return _trans.transform(cl, name, previousVersion, pd, bytes);
             }
             catch (IllegalClassFormatException e) {
-                throw e;
+                throw new TransformerException(e);
             }
         }
     }

openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/CriteriaBuilderImpl.java

@@ -20,9 +20,13 @@
 
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.nio.channels.UnsupportedAddressTypeException;
 import java.sql.Date;
 import java.sql.Time;
 import java.sql.Timestamp;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Map;
@@ -983,4 +987,70 @@ public <T> Predicate qbe(From<?, T> from, T example) {
     public ComparisonStyle qbeStyle() {
         return new ComparisonStyle.Default();
     }
+
+    @Override
+    public <N extends Number> Expression<N> ceiling(Expression<N> x) {
+        // TODO Implement ceiling op
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Expression<Double> exp(Expression<? extends Number> x) {
+        // TODO Implement exp op
+        throw new UnsupportedAddressTypeException();
+    }
+
+    @Override
+    public <N extends Number> Expression<N> floor(Expression<N> x) {
+        // TODO Implement floor op
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Expression<Double> ln(Expression<? extends Number> x) {
+        // TODO Implement ln op
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Expression<LocalDate> localDate() {
+        // TODO Implement localDate
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Expression<LocalDateTime> localDateTime() {
+        // TODO Implement ceiling op
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Expression<LocalTime> localTime() {
+        // TODO Implement localTime op
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Expression<Double> power(Expression<? extends Number> x, Number y) {
+        // TODO Implement power op
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Expression<Double> power(Expression<? extends Number> x, Expression<? extends Number> y) {
+        // TODO Implement power op
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public <T extends Number> Expression<T> round(Expression<T> x, Integer n) {
+        // TODO Implement round op
+        throw new UnsupportedOperationException();
+    }
+
+    @Override
+    public Expression<Integer> sign(Expression<? extends Number> x) {
+        // TODO Implement sign op
+        throw new UnsupportedOperationException();
+    }
 }

openjpa-persistence/src/main/java/org/apache/openjpa/persistence/criteria/Expressions.java

@@ -1612,7 +1612,7 @@ public StringBuilder asValue(AliasContext q) {
         }
     }
 
-    public static class SimpleCase<C,R> extends ExpressionImpl<R> implements CriteriaBuilder.SimpleCase<C,R> {
+    public static class SimpleCase<C, R> extends ExpressionImpl<R> implements CriteriaBuilder.SimpleCase<C,R> {
         private final List<Expression<? extends R>> thens = new ArrayList<>();
         private final List<Expression<C>> whens = new ArrayList<>();
         private Expression<? extends R> otherwise;
@@ -1632,12 +1632,19 @@ public Expression<C> getExpression() {
             return caseOperand;
         }
 
-        public SimpleCase<C,R> when(Expression<C> when, Expression<? extends R> then) {
-            whens.add(when);
+        public SimpleCase<C,R> when(Expression<? extends C> when, Expression<? extends R> then) {
+            whens.add((Expression<C>) when);
             thens.add(then);
             return this;
         }
 
+        @Override
+        public SimpleCase<C, R> when(Expression<? extends C> condition, R result) {
+            whens.add((Expression<C>) condition);
+            thens.add(new Constant<>(result));
+            return this;
+        }
+
         @Override
         public SimpleCase<C,R> when(C when, Expression<? extends R> then) {
             return when(new Constant<>(when), then);

pom.xml

@@ -101,7 +101,7 @@
         <pool2.version>2.12.0</pool2.version>
 
         <jakarta.annotation-api.version>2.1.1</jakarta.annotation-api.version>
-        <jakarta.persistence-api.version>3.0.0</jakarta.persistence-api.version>
+        <jakarta.persistence-api.version>3.1.0</jakarta.persistence-api.version>
         <jakarta.transaction-api.version>2.0.1</jakarta.transaction-api.version>
         <jakarta.validation-api.version>3.0.2</jakarta.validation-api.version>
         <jakarta.jms-api.version>3.1.0</jakarta.jms-api.version>