Add support for Value Expressions for Repository Query methods #4683
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Deprecations, missing Override annotations, test fix.
marcingrzejszczak
force-pushed
the
issue/4677
branch
from
9f01de3
to
414ef64
Compare
marcingrzejszczak
force-pushed
the
issue/4677
branch
from
d2c3a9d
to
e219fc9
Compare
|
This will also fix #2764 |
Comment on lines
485
to
523
|
|
||
| return new ValueExpressionEvaluator() { | ||
|
|
||
| @Override | ||
| public <T> T evaluate(String expressionString) { | ||
| ValueExpression expression = valueExpressionDelegate.parse(expressionString); | ||
| ValueEvaluationContext evaluationContext = valueEvaluationContextProvider.getEvaluationContext(accessor.getValues(), | ||
| expression.getExpressionDependencies()); | ||
| return (T) expression.evaluate(evaluationContext); | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| /** | ||
| * Obtain a {@link Mono publisher} emitting the {@link ValueExpressionEvaluator} suitable to evaluate expressions | ||
| * backed by the given dependencies. | ||
| * | ||
| * @param dependencies must not be {@literal null}. | ||
| * @param accessor must not be {@literal null}. | ||
| * @return a {@link Mono} emitting the {@link ValueExpressionEvaluator} when ready. | ||
| * @since 4.3 | ||
| */ | ||
| protected Mono<ValueExpressionEvaluator> getValueExpressionEvaluatorLater(ExpressionDependencies dependencies, | ||
| MongoParameterAccessor accessor) { | ||
|
|
||
| return valueEvaluationContextProvider.getEvaluationContextLater(accessor.getValues(), dependencies) | ||
| .map(evaluationContext -> { | ||
|
|
||
| return new ValueExpressionEvaluator() { | ||
| @Override | ||
| public <T> T evaluate(String expressionString) { | ||
|
|
||
| ValueExpression expression = valueExpressionDelegate.parse(expressionString); | ||
|
|
||
| return (T) expression.evaluate(evaluationContext); | ||
| } | ||
| }; | ||
| }); | ||
| } |
There was a problem hiding this comment.
can we move the inner ValueExpressionEvaluator to a dedicated class that holds the evaluation context, so we can use for both?
| @@ -406,7 +410,7 @@ public void capturingExpressionDependenciesShouldNotThrowParseErrorForSpelOnlyJs | |||
| String json = "?#{ true ? { 'name': #name } : { 'name' : #name + 'trouble' } }"; | |||
|
|
|||
| new ParameterBindingDocumentCodec().captureExpressionDependencies(json, (index) -> args[index], | |||
| new SpelExpressionParser()); | |||
| ValueExpressionParser.create(SpelExpressionParser::new)); | |||
There was a problem hiding this comment.
Might make sense to also add some tests to the binding parser and check if the current test setup is making use of value expressions already.
| @Test // DATAMONGO-1244 | ||
| public void shouldSupportExpressionsInCustomQueriesWithNestedObject() { | ||
|
|
||
| ConvertingParameterAccessor accessor = StubParameterAccessor.getAccessor(converter, true, "param1", "param2"); |
There was a problem hiding this comment.
because the method declares 2 parameters and previously we passed in 3 arguments.
| org.springframework.data.mongodb.core.query.Query query = mongoQuery.createQuery(accessor); | ||
| org.springframework.data.mongodb.core.query.Query reference = new BasicQuery("{'lastname' : 'bar'}"); | ||
|
|
||
| assertThat(query.getQueryObject()).isEqualTo(reference.getQueryObject()); |
There was a problem hiding this comment.
what do we expect when the property is missing and does not have a default?
There was a problem hiding this comment.
IMO it should break (and it does right now, I'll add a test for that)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.