FMWK-315 Add query methods validation, refactor creating combined repository queries #701
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
agrgr
commented
Feb 13, 2024
•
agrgr
commented
- Add validation for standard repository query methods
- API change: add a special QueryParam for unambiguous transferring of arguments when using combined queries
- API change: combined queries now require explicitly given arguments (e.g., "findBy...Or..." requires arguments for both parts of the query)
reugn
reviewed
Feb 14, 2024
| Iterator<Object> paramIterator = iterator; | ||
| if (isCombinedQuery && iterator.hasNext()) { | ||
| Object nextParam = iterator.next(); | ||
| if (!(nextParam instanceof CombinedQueryParam)) { |
There was a problem hiding this comment.
if (!(nextParam instanceof CombinedQueryParam) nextQueryParam) ...| qb.setValue3(Value.get(nextParam)); // contains upper limit (inclusive) | ||
| } else { | ||
| if (op == FilterOperation.EQ) { | ||
| throw new IllegalArgumentException("Unsupported arguments '" + value1 + "' and '" + nextParam + |
Comment on lines
641
to
649
| // PropertyPath prev; | ||
| // while (propertyPath.hasNext()) { | ||
| // prev = propertyPath; | ||
| // propertyPath = propertyPath.next(); | ||
| // if (propertyPath == null) { | ||
| // propertyPath = prev; | ||
| // } | ||
| // } | ||
| // return propertyPath; |
|
|
||
| private Qualifier getIdEqualsQualifier(Object value1) { | ||
| Qualifier qualifier; | ||
| if (value1 instanceof String) { |
There was a problem hiding this comment.
The id is handled as Object downstream. Consider having only the public static Qualifier idEquals(Object id) factory method and remove this if-else chain.
There was a problem hiding this comment.
The idEquals() and idIn() methods that require specific type of arguments are public, we can discuss changes within another PR
| } | ||
| return qualifier; | ||
| } | ||
|
|
||
| private Qualifier processCollection(Part part, Object value1, Object value2, Iterator<?> parameters, | ||
| private Qualifier getIdInQualifier(List<?> ids) { | ||
| Qualifier qualifier; |
| private Qualifier processMap2Params(Part part, Object value1, Object value2, List<Object> params, | ||
| FilterOperation op, String fieldName) { | ||
| Object nextParam = params.size() > 0 ? convertIfNecessary(params.get(0)) : null; // nextParam is de facto the |
There was a problem hiding this comment.
Suggested change
| Object nextParam = params.size() > 0 ? convertIfNecessary(params.get(0)) : null; // nextParam is de facto the | |
| Object nextParam = !params.isEmpty() ? convertIfNecessary(params.get(0)) : null; // nextParam is de facto the |
| } | ||
|
|
||
| private boolean queryHasOnlyBothValues(Object value1, Object value2, List<Object> params) { | ||
| return params.size() == 0 && value1 != null && value2 != null; |
There was a problem hiding this comment.
Suggested change
| return params.size() == 0 && value1 != null && value2 != null; | |
| return params.isEmpty() && value1 != null && value2 != null; |
| } | ||
| } | ||
|
|
||
| private void validateSimplePropertyQueryIn(Object value1, Object value2, String queryPartDescription) { |
There was a problem hiding this comment.
- Use
String.formatbuilding exception messages - Normalize line length
| package org.springframework.data.aerospike.query; | ||
|
|
||
| /** | ||
| * This class stores arguments passed to each part of a combined repository query, |
There was a problem hiding this comment.
Add code example with a combined query.
…EQ queries" This reverts commit 7dd1abd.
reugn
approved these changes
Feb 19, 2024
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.