HADOOP-18980. Invalid inputs for getTrimmedStringCollectionSplitByEquals (ADDENDUM) #6546
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
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
steveloughran
requested changes
Feb 15, 2024
| if (!emptyKey && !emptyVal) { | ||
| pairs.put(splitByKeyVal[0], splitByKeyVal[1]); | ||
| } else { | ||
| throw new IllegalArgumentException( |
There was a problem hiding this comment.
use Preconditions.checkArgument(!emptyKey && !emptyVal with its built in string formatting.
| STRING_COLLECTION_SPLIT_EQUALS_INVALID_ARG + " Input: " + str); | ||
| } | ||
| } else { | ||
| throw new IllegalArgumentException( |
There was a problem hiding this comment.
again, make a precondition on L511
| .containsEntry("element.first.key1", "element.first.val1"); | ||
|
|
||
| try { | ||
| StringUtils.getTrimmedStringCollectionSplitByEquals( |
There was a problem hiding this comment.
LambdaTestUtils.intercept(). It's predictable I will insist on that, so save time in future. and it includes a string value check. so all you need is
intercept(IllegalArgumentException.class,
STRING_COLLECTION_SPLIT_EQUALS_INVALID_ARG, () ->
StringUtils.getTrimmedStringCollectionSplitByEquals(
"element.abc.key1="));See: much better. and if the closure doesn't fail, will even include the string value of the result in the exception raised.
There was a problem hiding this comment.
ah yes, that's already an amazing utility
| final Configuration configuration = new Configuration(); | ||
| configuration.set("custom_key", " = element.abc.val1"); | ||
| try { | ||
| S3AUtils.getTrimmedStringCollectionSplitByEquals( |
There was a problem hiding this comment.
intercept(), and again, consider a factored out assertion to call repeatedly
| */ | ||
| @Test | ||
| public void testStringCollectionSplitByEquals2() { | ||
| final Configuration configuration = new Configuration(); |
There was a problem hiding this comment.
use new Configuration(false); ensures no core-site/auth-keys values can interferer
| .hasMessageStartingWith(STRING_COLLECTION_SPLIT_EQUALS_INVALID_ARG); | ||
| } | ||
|
|
||
| configuration.set( |
There was a problem hiding this comment.
pull the expected-to-succeed tests into their own test case.
|
Addressed comments in the latest revision. |
|
💔 -1 overall
This message was automatically generated. |
|
💔 -1 overall
This message was automatically generated. |
|
@steveloughran the PR is ready for another round of review if you have some bandwidth. |
|
@steveloughran a gentle reminder :) |
|
Addressed previous review with the latest revision. |
|
🎊 +1 overall
This message was automatically generated. |
steveloughran
requested changes
Mar 25, 2024
| * Tests for the string utility that will be used by S3A credentials provider. | ||
| */ | ||
| @Test | ||
| public void testStringCollectionSplitByEqualsFailure() throws Exception { |
There was a problem hiding this comment.
this would be better off with a helper method "expectInvalidArgument(value)" and 5 separate test methods. less code, more isolation.
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/StringUtils.java
Show resolved
Hide resolved
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
steveloughran
approved these changes
Mar 26, 2024
|
in trunk; testing cherrypick to 3.4 |
steveloughran
pushed a commit
that referenced
this pull request
Mar 26, 2024
…als (ADDENDUM) (#6546) This is a followup to #6406: HADOOP-18980. S3A credential provider remapping: make extensible It adds extra validation of key-value pairs in a configuration option, with tests. Contributed by Viraj Jasani
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.
Jira: HADOOP-18980