Add startsWith expression function #4840
Merged
+170
−4
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
graytaylor0
requested review from
chenqi0805,
engechas,
dinujoh,
kkondaka,
KarstenSchnitter,
dlvenable and
oeyh
as code owners
4 tasks
graytaylor0
force-pushed
the
StartsWithFunction
branch
2 times, most recently
from
a7373c5
to
cc96fb9
Compare
dlvenable
requested changes
Aug 16, 2024
| final ExpressionFunction startsWithExpressionFunction = createObjectUnderTest(); | ||
| final String testKey = "test_key"; | ||
|
|
||
| assertThrows(RuntimeException.class, () -> startsWithExpressionFunction.evaluate(List.of("abcd"), testEvent, mock(Function.class))); |
There was a problem hiding this comment.
It would be better to split this test up using arguments provider.
|
|
||
| private Event testEvent; | ||
|
|
||
| @BeforeEach |
| assertThrows(RuntimeException.class, () -> startsWithExpressionFunction.evaluate(List.of("\"abc\"", "/"+testKey), createTestEvent(Map.of(testKey, 1234)), mock(Function.class))); | ||
| } | ||
|
|
||
| private static Stream<Arguments> ValidStartsWithProvider() { |
There was a problem hiding this comment.
Suggested change
| private static Stream<Arguments> ValidStartsWithProvider() { | |
| private static Stream<Arguments> validStartsWithProvider() { |
Give a method name
| final ExpressionFunction objectUnderTest = createObjectUnderTest(); | ||
| assertThat(objectUnderTest.getFunctionName(), equalTo(STARTS_WITH_FUNCTION_NAME)); | ||
|
|
||
| final Object result = objectUnderTest.evaluate(List.of("/" + key, "\"" + prefix + "\""), testEvent, mock(Function.class)); |
There was a problem hiding this comment.
It looks like you are supporting a key for the substring part. Add a unit test for that as well.
| return false; | ||
| } | ||
| if (!(obj instanceof String)) { | ||
| throw new RuntimeException(String.format("startsWith() takes only string type arguments. \"%s\" is not of type string", obj)); |
There was a problem hiding this comment.
Suggested change
| throw new RuntimeException(String.format("startsWith() takes only string type arguments. \"%s\" is not of type string", obj)); | |
| throw new RuntimeException(String.format("startsWith() only operates on string types. The value at \"%s"\ is \"%s\" which is not a string type.", str, obj)); |
This error may be confusing. In this case, startsWith() is given a key and the value is not of type string.
| if (!(arg instanceof String)) { | ||
| throw new RuntimeException(String.format("startsWith() takes only string type arguments. \"%s\" is not of type string", arg)); | ||
| } | ||
| String str = (String) arg; |
There was a problem hiding this comment.
Rename for clarity. Perhaps stringOrKey.
graytaylor0
force-pushed
the
StartsWithFunction
branch
from
cc96fb9
to
a507bdd
Compare
dlvenable
previously approved these changes
Aug 16, 2024
Signed-off-by: Taylor Gray <tylgry@amazon.com>
graytaylor0
force-pushed
the
StartsWithFunction
branch
from
a507bdd
to
a68fb12
Compare
kkondaka
approved these changes
Aug 16, 2024
dlvenable
approved these changes
Aug 16, 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.
Description
Adds a
startsWithfunction to Data Prepper expressions, similar to thecontainsfunction, but for checking if a String has a prefix of some other String.Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.