Move ValueParser into expression package.

Author: mp911de

src/main/java/org/springframework/data/spel/CompositeValueExpression.java renamed to src/main/java/org/springframework/data/expression/CompositeValueExpression.java

@@ -13,10 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.spel;
+package org.springframework.data.expression;
 
 import java.util.List;
 
+import org.springframework.data.spel.ExpressionDependencies;
+
 /**
  * Composite {@link ValueExpression} consisting of multiple placeholder, SpEL, and literal expressions.
  *
@@ -32,6 +34,21 @@ public String getExpressionString() {
 		return raw;
 	}
 
+	@Override
+	public ExpressionDependencies getExpressionDependencies() {
+
+		ExpressionDependencies dependencies = ExpressionDependencies.none();
+
+		for (ValueExpression expression : expressions) {
+			ExpressionDependencies dependency = expression.getExpressionDependencies();
+			if (!dependency.equals(ExpressionDependencies.none())) {
+				dependencies = dependencies.mergeWith(dependency);
+			}
+		}
+
+		return dependencies;
+	}
+
 	@Override
 	public boolean isLiteral() {
 

src/main/java/org/springframework/data/spel/DefaultValueEvaluationContext.java renamed to src/main/java/org/springframework/data/expression/DefaultValueEvaluationContext.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.spel;
+package org.springframework.data.expression;
 
 import org.springframework.core.env.Environment;
 import org.springframework.expression.EvaluationContext;

src/main/java/org/springframework/data/spel/DefaultValueExpressionParser.java renamed to src/main/java/org/springframework/data/expression/DefaultValueExpressionParser.java

@@ -13,11 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.spel;
+package org.springframework.data.expression;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import org.springframework.data.spel.ExpressionDependencies;
+import org.springframework.expression.Expression;
 import org.springframework.expression.ParseException;
 import org.springframework.expression.ParserContext;
 import org.springframework.util.Assert;
@@ -125,8 +127,11 @@ private PlaceholderExpression createPlaceholder(String part) {
 	}
 
 	private ExpressionExpression createExpression(String expression) {
-		return new ExpressionExpression(
-				configuration.getExpressionParser().parseExpression(expression, ParserContext.TEMPLATE_EXPRESSION));
+
+		Expression expr = configuration.getExpressionParser().parseExpression(expression,
+				ParserContext.TEMPLATE_EXPRESSION);
+		ExpressionDependencies dependencies = ExpressionDependencies.discover(expr);
+		return new ExpressionExpression(expr, dependencies);
 	}
 
 	private static int findPlaceholderEndIndex(CharSequence buf, int startIndex) {

src/main/java/org/springframework/data/spel/ExpressionExpression.java renamed to src/main/java/org/springframework/data/expression/ExpressionExpression.java

@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.spel;
+package org.springframework.data.expression;
 
+import org.springframework.data.spel.ExpressionDependencies;
 import org.springframework.expression.EvaluationContext;
 import org.springframework.expression.Expression;
 
@@ -25,13 +26,18 @@
  * @author Mark Paluch
  * @since 3.3
  */
-record ExpressionExpression(Expression expression) implements ValueExpression {
+record ExpressionExpression(Expression expression, ExpressionDependencies dependencies) implements ValueExpression {
 
 	@Override
 	public String getExpressionString() {
 		return expression.getExpressionString();
 	}
 
+	@Override
+	public ExpressionDependencies getExpressionDependencies() {
+		return dependencies();
+	}
+
 	@Override
 	public boolean isLiteral() {
 		return false;

src/main/java/org/springframework/data/spel/LiteralValueExpression.java renamed to src/main/java/org/springframework/data/expression/LiteralValueExpression.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.spel;
+package org.springframework.data.expression;
 
 /**
  * Literal expression returning the underlying expression string upon evaluation.

src/main/java/org/springframework/data/spel/PlaceholderExpression.java renamed to src/main/java/org/springframework/data/expression/PlaceholderExpression.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.spel;
+package org.springframework.data.expression;
 
 import org.springframework.core.env.Environment;
 import org.springframework.expression.EvaluationException;

src/main/java/org/springframework/data/spel/ValueEvaluationContext.java renamed to src/main/java/org/springframework/data/expression/ValueEvaluationContext.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.spel;
+package org.springframework.data.expression;
 
 import org.springframework.core.env.Environment;
 import org.springframework.expression.EvaluationContext;

src/main/java/org/springframework/data/spel/ValueExpression.java renamed to src/main/java/org/springframework/data/expression/ValueExpression.java

@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.spel;
+package org.springframework.data.expression;
 
+import org.springframework.data.spel.ExpressionDependencies;
 import org.springframework.expression.EvaluationException;
 import org.springframework.lang.Nullable;
 
@@ -35,6 +36,15 @@ public interface ValueExpression {
 	 */
 	String getExpressionString();
 
+	/**
+	 * Returns the expression dependencies.
+	 *
+	 * @return the dependencies the underlying expression requires. Can be {@link ExpressionDependencies#none()}.
+	 */
+	default ExpressionDependencies getExpressionDependencies() {
+		return ExpressionDependencies.none();
+	}
+
 	/**
 	 * Returns whether the expression is a literal expression (that doesn't actually require evaluation).
 	 *

src/main/java/org/springframework/data/spel/ValueExpressionParser.java renamed to src/main/java/org/springframework/data/expression/ValueExpressionParser.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.spel;
+package org.springframework.data.expression;
 
 import org.springframework.expression.ParseException;
 

src/main/java/org/springframework/data/spel/ValueParserConfiguration.java renamed to src/main/java/org/springframework/data/expression/ValueParserConfiguration.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.spel;
+package org.springframework.data.expression;
 
 import org.springframework.expression.ExpressionParser;
 

src/main/java/org/springframework/data/expression/package-info.java

@@ -0,0 +1,5 @@
+/**
+ * Value Expression implementation.
+ */
+@org.springframework.lang.NonNullApi
+package org.springframework.data.expression;

src/main/java/org/springframework/data/mapping/model/BasicPersistentEntity.java

@@ -34,10 +34,10 @@
 import org.springframework.data.annotation.Immutable;
 import org.springframework.data.annotation.TypeAlias;
 import org.springframework.data.domain.Persistable;
+import org.springframework.data.expression.ValueEvaluationContext;
 import org.springframework.data.mapping.*;
 import org.springframework.data.spel.EvaluationContextProvider;
 import org.springframework.data.spel.ExpressionDependencies;
-import org.springframework.data.spel.ValueEvaluationContext;
 import org.springframework.data.support.IsNewStrategy;
 import org.springframework.data.support.PersistableIsNewStrategy;
 import org.springframework.data.util.Lazy;

src/main/java/org/springframework/data/spel/package-info.java

@@ -1,5 +1,5 @@
 /**
- * SpEL and Value Expression implementations.
+ * SpEL support.
  */
 @org.springframework.lang.NonNullApi
 package org.springframework.data.spel;

src/test/java/org/springframework/data/spel/ValueEvaluationUnitTests.java renamed to src/test/java/org/springframework/data/expression/ValueEvaluationUnitTests.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.data.spel;
+package org.springframework.data.expression;
 
 import static org.assertj.core.api.Assertions.*;
 
@@ -32,7 +32,7 @@
 import org.springframework.expression.spel.support.StandardEvaluationContext;
 
 /**
- * Unit tests for {@link org.springframework.data.spel.ValueExpression} and its parsing.
+ * Unit tests for {@link ValueExpression} and its parsing.
  *
  * @author Christoph Strobl
  * @author Mark Paluch