Progress

micronaut-projects · Apr 17, 2024 · 1f36700 · 1f36700
1 parent 271980e
commit 1f36700
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 17 deletions.
diff --git a/data-runtime/src/main/java/io/micronaut/data/runtime/query/internal/DefaultStoredQuery.java b/data-runtime/src/main/java/io/micronaut/data/runtime/query/internal/DefaultStoredQuery.java
@@ -15,12 +15,10 @@
  */
 package io.micronaut.data.runtime.query.internal;
 
-import io.micronaut.context.expressions.ConfigurableExpressionEvaluationContext;
 import io.micronaut.core.annotation.AnnotationMetadata;
 import io.micronaut.core.annotation.AnnotationValue;
 import io.micronaut.core.annotation.Internal;
 import io.micronaut.core.annotation.NonNull;
-import io.micronaut.core.expressions.EvaluatedExpression;
 import io.micronaut.core.reflect.ReflectionUtils;
 import io.micronaut.core.util.ArrayUtils;
 import io.micronaut.core.util.StringUtils;
@@ -37,7 +35,6 @@
 import io.micronaut.data.model.runtime.StoredQuery;
 import io.micronaut.data.operations.HintsCapableRepository;
 import io.micronaut.inject.ExecutableMethod;
-import io.micronaut.inject.annotation.EvaluatedAnnotationValue;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -169,19 +166,8 @@ public DefaultStoredQuery(
             for (AnnotationValue<DataMethodQueryParameter> av : params) {
                 String[] propertyPath = av.stringValues(DataMethodQueryParameter.META_MEMBER_PROPERTY_PATH);
                 Supplier<Object> valueSupplier = null;
-                Object value = av.getValues().get(DataMethodQueryParameter.META_MEMBER_VALUE);
-                if (value instanceof EvaluatedExpression evaluatedExpression) {
-                    // Remove after https://github.com/micronaut-projects/micronaut-core/pull/10720
-                    valueSupplier = new Supplier<Object>() {
-                        @Override
-                        public Object get() {
-                            ConfigurableExpressionEvaluationContext evaluationContext = null;
-                            if (annotation instanceof EvaluatedAnnotationValue<?> evaluatedAnnotationValue) {
-                                evaluationContext = (ConfigurableExpressionEvaluationContext) ReflectionUtils.getField(EvaluatedAnnotationValue.class, "evaluationContext", evaluatedAnnotationValue);
-                            }
-                            return evaluatedExpression.evaluate(evaluationContext);
-                        }
-                    };
+                if (av.getValues().containsKey(DataMethodQueryParameter.META_MEMBER_VALUE)) {
+                    valueSupplier = () -> av.get(DataMethodQueryParameter.META_MEMBER_VALUE, Object.class).orElse(null);
                 }
                 if (propertyPath.length == 0) {
                     propertyPath = av.stringValue(DataMethodQueryParameter.META_MEMBER_PROPERTY)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-micronaut = "4.4.1"
+micronaut = "4.4.2"
 micronaut-platform = "4.3.7"
 micronaut-docs = "2.0.0"
 micronaut-gradle-plugin = "4.3.6"