Next phase criteria refactoring to allow more complex scenarios

data-document-model/src/main/java/io/micronaut/data/document/model/query/builder/CosmosSqlQueryBuilder2.java

@@ -49,6 +49,8 @@
 import java.util.Map;
 import java.util.StringJoiner;
 
+import static io.micronaut.data.model.jpa.criteria.impl.CriteriaUtils.requireProperty;
+
 /**
  * The Azure Cosmos DB sql query builder.
  *
@@ -141,7 +143,8 @@ protected SqlPredicateVisitor createPredicateVisitor(AnnotationMetadata annotati
             private static final String ARRAY_CONTAINS = "ARRAY_CONTAINS";
 
             @Override
-            public void visitIsNull(PersistentPropertyPath propertyPath) {
+            public void visitIsNull(Expression<?> expression) {
+                PersistentPropertyPath propertyPath = requireProperty(expression).getPropertyPath();
                 query.append(NOT).append(SPACE).append(IS_DEFINED).append(OPEN_BRACKET);
                 appendPropertyRef(propertyPath);
                 query.append(CLOSE_BRACKET).append(SPACE).append(OR).append(SPACE);
@@ -151,7 +154,8 @@ public void visitIsNull(PersistentPropertyPath propertyPath) {
             }
 
             @Override
-            public void visitIsNotNull(PersistentPropertyPath propertyPath) {
+            public void visitIsNotNull(Expression<?> expression) {
+                PersistentPropertyPath propertyPath = requireProperty(expression).getPropertyPath();
                 query.append(IS_DEFINED).append(OPEN_BRACKET);
                 appendPropertyRef(propertyPath);
                 query.append(CLOSE_BRACKET).append(SPACE).append(AND).append(SPACE);
@@ -161,7 +165,8 @@ public void visitIsNotNull(PersistentPropertyPath propertyPath) {
             }
 
             @Override
-            public void visitIsEmpty(PersistentPropertyPath propertyPath) {
+            public void visitIsEmpty(Expression<?> expression) {
+                PersistentPropertyPath propertyPath = requireProperty(expression).getPropertyPath();
                 query.append(NOT).append(SPACE).append(IS_DEFINED).append(OPEN_BRACKET);
                 appendPropertyRef(propertyPath);
                 query.append(CLOSE_BRACKET).append(SPACE).append(OR).append(SPACE);
@@ -173,7 +178,8 @@ public void visitIsEmpty(PersistentPropertyPath propertyPath) {
             }
 
             @Override
-            public void visitIsNotEmpty(PersistentPropertyPath propertyPath) {
+            public void visitIsNotEmpty(Expression<?> expression) {
+                PersistentPropertyPath propertyPath = requireProperty(expression).getPropertyPath();
                 query.append(IS_DEFINED).append(OPEN_BRACKET);
                 appendPropertyRef(propertyPath);
                 query.append(CLOSE_BRACKET).append(SPACE).append(AND).append(SPACE);
@@ -185,11 +191,12 @@ public void visitIsNotEmpty(PersistentPropertyPath propertyPath) {
             }
 
             @Override
-            public void visitArrayContains(PersistentPropertyPath leftProperty, Expression<?> expression) {
+            public void visitArrayContains(Expression<?> leftExpression, Expression<?> rightExpression) {
+                PersistentPropertyPath leftProperty = requireProperty(leftExpression).getPropertyPath();
                 query.append(ARRAY_CONTAINS).append(OPEN_BRACKET);
                 appendPropertyRef(leftProperty);
                 query.append(COMMA);
-                appendExpression(expression, leftProperty);
+                appendExpression(rightExpression, leftExpression);
                 query.append(COMMA);
                 query.append("true").append(CLOSE_BRACKET);
             }

data-jdbc/src/test/groovy/io/micronaut/data/jdbc/h2/H2RepositorySpec.groovy

@@ -248,7 +248,6 @@ class H2RepositorySpec extends AbstractRepositorySpec implements H2TestPropertyP
         return true
     }
 
-    @PendingFeature
     void "test criteria lower select" () {
         when:
             savePersons(["Jeff", "James"])

data-model/src/main/java/io/micronaut/data/model/PersistentPropertyPath.java

@@ -54,7 +54,7 @@ public PersistentPropertyPath(@NonNull PersistentProperty property) {
      * @param associations The associations
      * @param property     The property
      */
-    public PersistentPropertyPath(List<Association> associations, @NonNull PersistentProperty property) {
+    public PersistentPropertyPath(@NonNull List<Association> associations, @NonNull PersistentProperty property) {
         this(associations, property, null);
     }
 
@@ -65,7 +65,9 @@ public PersistentPropertyPath(List<Association> associations, @NonNull Persisten
      * @param property     The property
      * @param path         The path
      */
-    public PersistentPropertyPath(List<Association> associations, @NonNull PersistentProperty property, @Nullable String path) {
+    public PersistentPropertyPath(@NonNull List<Association> associations, @NonNull PersistentProperty property, @Nullable String path) {
+        Objects.requireNonNull(associations);
+        Objects.requireNonNull(property);
         this.associations = associations;
         this.property = property;
         this.path = path;

data-model/src/main/java/io/micronaut/data/model/jpa/criteria/ExpressionType.java

@@ -0,0 +1,71 @@
+/*
+ * Copyright 2017-2024 original authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.micronaut.data.model.jpa.criteria;
+
+import io.micronaut.core.annotation.Experimental;
+import io.micronaut.data.model.jpa.criteria.impl.expression.ClassExpressionType;
+
+/**
+ * The expression type.
+ *
+ * @param <E> The type
+ * @author Denis Stepanov
+ * @since 4.10
+ */
+@Experimental
+public interface ExpressionType<E> {
+
+    /**
+     * The boolean type.
+     */
+    ExpressionType<Boolean> BOOLEAN = new ClassExpressionType<>(Boolean.class);
+
+    /**
+     * The object type.
+     */
+    ExpressionType<Object> OBJECT = new ClassExpressionType<>(Object.class);
+
+    /**
+     * @return The type name
+     */
+    String getName();
+
+    /**
+     * @return true if the expression is of boolean type
+     */
+    boolean isBoolean();
+
+    /**
+     * @return true if the expression is of numeric type
+     */
+    boolean isNumeric();
+
+    /**
+     * @return true if the expression is of comparable type
+     */
+    boolean isComparable();
+
+    /**
+     * @return true if the expression is of string type
+     */
+    boolean isTextual();
+
+    /**
+     * @return The Java type
+     */
+    Class<E> getJavaType();
+
+}

data-model/src/main/java/io/micronaut/data/model/jpa/criteria/IExpression.java

@@ -37,19 +37,15 @@
 public interface IExpression<T> extends Expression<T>, ISelection<T> {
 
     /**
-     * @return true if the expression is of boolean type
+     * @return The expression type
      */
-    boolean isBoolean();
-
-    /**
-     * @return true if the expression is of numeric type
-     */
-    boolean isNumeric();
+    @NonNull
+    ExpressionType<T> getExpressionType();
 
-    /**
-     * @return true if the expression is of comparable type
-     */
-    boolean isComparable();
+    @Override
+    default Class<? extends T> getJavaType() {
+        return getExpressionType().getJavaType();
+    }
 
     @Override
     @NonNull

data-model/src/main/java/io/micronaut/data/model/jpa/criteria/IPredicate.java

@@ -29,18 +29,8 @@
 public interface IPredicate extends Predicate, IExpression<Boolean> {
 
     @Override
-    default boolean isBoolean() {
-        return true;
-    }
-
-    @Override
-    default boolean isNumeric() {
-        return false;
-    }
-
-    @Override
-    default boolean isComparable() {
-        return true;
+    default ExpressionType<Boolean> getExpressionType() {
+        return ExpressionType.BOOLEAN;
     }
 
     /**

data-model/src/main/java/io/micronaut/data/model/jpa/criteria/PersistentPropertyPath.java

@@ -19,8 +19,8 @@
 import io.micronaut.core.annotation.NonNull;
 import io.micronaut.data.model.Association;
 import io.micronaut.data.model.PersistentProperty;
-import io.micronaut.data.model.jpa.criteria.impl.CriteriaUtils;
-import io.micronaut.data.model.jpa.criteria.impl.predicate.PersistentPropertyUnaryPredicate;
+import io.micronaut.data.model.jpa.criteria.impl.expression.ClassExpressionType;
+import io.micronaut.data.model.jpa.criteria.impl.predicate.UnaryPredicate;
 import io.micronaut.data.model.jpa.criteria.impl.predicate.PredicateUnaryOp;
 import jakarta.persistence.criteria.Path;
 import jakarta.persistence.criteria.Predicate;
@@ -59,28 +59,18 @@ default String getPathAsString() {
     }
 
     @Override
-    default boolean isBoolean() {
-        return CriteriaUtils.isBoolean(getJavaType());
-    }
-
-    @Override
-    default boolean isNumeric() {
-        return CriteriaUtils.isNumeric(getJavaType());
-    }
-
-    @Override
-    default boolean isComparable() {
-        return CriteriaUtils.isComparable(getJavaType());
+    default ExpressionType<T> getExpressionType() {
+        return (ExpressionType<T>) new ClassExpressionType<>(getJavaType());
     }
 
     @Override
     default Predicate isNull() {
-        return new PersistentPropertyUnaryPredicate<>(this, PredicateUnaryOp.IS_NULL);
+        return new UnaryPredicate(this, PredicateUnaryOp.IS_NULL);
     }
 
     @Override
     default Predicate isNotNull() {
-        return new PersistentPropertyUnaryPredicate<>(this, PredicateUnaryOp.IS_NON_NULL);
+        return new UnaryPredicate(this, PredicateUnaryOp.IS_NON_NULL);
     }
 
 }