feat: contains and containsItems [DHIS2-16211] #50
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.
This PR adds two expression functions:
contains(expr, ...) returns true if the first expr contains each of the following expressions as a substring.
containsItems(expr, ...) returns true if the first expr is split into tokens separated by commas, and each of the following expressions exactly matches one of the tokens.
See DHIS2-16211 for more details and examples.
@jbee Note that in ExpressionGrammar.kt the grammar is defined as:
I wanted to require two expression arguments and then have optional additional expressions. But this seemed to result in no expressions required, essentially the equivalent of:
As a result, these functions can be called with no arguments. Then when ExpressionFunctions
contains(values: List<String?>)
andcontainsItems(values: List<String?>)
refer tovalues[0]
they generate anIndexOutOfBoundsException
, as is tested for inContainsTest
andContainsItemsTest
. I did not try to fix this because I didn't know how you would want to address the problem.