FMWK-255 Add qualifier builders #644
Merged
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
…eturn immutable map in BaseQualifierBuilder
roimenashe
reviewed
Oct 23, 2023
| .setQualifiers(qbIs1, qbIs2) | ||
| )), | ||
| Person.class | ||
| new Query(new AerospikeCriteria(forMultipleQualifiers(AND, qbIs1, qbIs2))), Person.class |
There was a problem hiding this comment.
I wouldn't import static, I would use Qualifier.forMultipleQualifiers and FilterOperation.AND just for better readability
roimenashe
reviewed
Oct 23, 2023
| * @param qualifiers 2 or more qualifiers to be connected | ||
| * @return Parent qualifier | ||
| */ | ||
| public static Qualifier forMultipleQualifiers(FilterOperation logicalOp, Qualifier... qualifiers) { |
There was a problem hiding this comment.
why the "for" prefix? why not just multipleQualifiers?
There was a problem hiding this comment.
public static Qualifier or(Qualifier qualifier, Qualifier... qualifiers)
public static Qualifier and(Qualifier qualifier, Qualifier... qualifiers)There was a problem hiding this comment.
Initially it was the idea, then combined the two methods because in some places we get OR/AND as a parameter.
Agree that it looks better overall, updating
reugn
reviewed
Oct 23, 2023
| * @param qualifiers 2 or more qualifiers to be connected | ||
| * @return Parent qualifier | ||
| */ | ||
| public static Qualifier forMultipleQualifiers(FilterOperation logicalOp, Qualifier... qualifiers) { |
There was a problem hiding this comment.
public static Qualifier or(Qualifier qualifier, Qualifier... qualifiers)
public static Qualifier and(Qualifier qualifier, Qualifier... qualifiers)| if (property.isIdProperty()) { | ||
| if (value1 instanceof Collection<?>) { | ||
| return new AerospikeCriteria(forIds(((Collection<?>) value1).toArray(String[]::new))); | ||
| } else { |
| .setQualifiers(base, criteria) | ||
| ); | ||
| return new AerospikeCriteria(forMultipleQualifiers(OR, base, criteria)); | ||
|
|
| @@ -108,7 +117,15 @@ public boolean hasQualifiers() { | |||
| } | |||
|
|
|||
| public boolean hasId() { | |||
| return internalMap.get(FIELD) != null && internalMap.get(FIELD).equals(ID_VALUE); | |||
| return internalMap.get(SINGLE_ID_FIELD) != null || internalMap.get(MULTIPLE_IDS_FIELD) != null ; | |||
There was a problem hiding this comment.
Suggested change
| return internalMap.get(SINGLE_ID_FIELD) != null || internalMap.get(MULTIPLE_IDS_FIELD) != null ; | |
| return internalMap.get(SINGLE_ID_FIELD) != null || internalMap.get(MULTIPLE_IDS_FIELD) != null; |
roimenashe
reviewed
Oct 23, 2023
| @@ -381,28 +431,50 @@ protected void validate() { | |||
| } | |||
|
|
|||
| /** | |||
| * Create qualifier "ID is equal to the given string" | |||
| * Create a qualifier "ID is equal to the given string" | |||
| * | |||
| * @param id String value | |||
| * @return Single id qualifier | |||
| */ | |||
| public static Qualifier forId(String id) { | |||
There was a problem hiding this comment.
Same here I think, not sure about the "for" prefix maybe IdEquals for single id comparison and IdIn() for multiple ids comparison? lets talk about it tomorrow
reugn
approved these changes
Oct 23, 2023
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.
Add builder for parent qualifier containing other qualifiers, add builder for id qualifier (to have a dedicated map key), return immutable map in BaseQualifierBuilder, add some refactoring and cleanup.