-
-
Notifications
You must be signed in to change notification settings - Fork 831
Implement new JsonFactory.builder().errorReportConfiguration()
#1072
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
cowtowncoder
merged 6 commits into
FasterXML:2.16
from
JooHyukKim:1043-4-JsonFactory-builder
Aug 3, 2023
Merged
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
075e98b
Add new JsonFactory.builder
JooHyukKim d050976
Update JsonFactory.java
JooHyukKim 5358aca
Remove unrelated change
JooHyukKim c1dedc6
Update ErrorReportConfigurationMaxRawContentLengthTest.java
JooHyukKim c664971
Merge tests into one
JooHyukKim ddb00d5
Fix minor test failure
JooHyukKim File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
132 changes: 132 additions & 0 deletions
132
...test/java/com/fasterxml/jackson/core/ErrorReportConfigurationMaxErrorTokenLengthTest.java
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,132 @@ | ||
| package com.fasterxml.jackson.core; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| /** | ||
| * Unit tests for class {@link ErrorReportConfiguration#getMaxErrorTokenLength()}. | ||
| */ | ||
| public class ErrorReportConfigurationMaxErrorTokenLengthTest extends BaseTest | ||
| { | ||
|
|
||
| // Should be 256 | ||
| public final static int DEFAULT_LENGTH = ErrorReportConfiguration.DEFAULT_MAX_ERROR_TOKEN_LENGTH; | ||
|
|
||
| /* | ||
| /********************************************************** | ||
| /* Unit Tests | ||
| /********************************************************** | ||
| */ | ||
|
|
||
| public void testExpectedTokenLengthWithConfigurations() | ||
| throws Exception | ||
| { | ||
| // default | ||
| _verifyErrorTokenLength(263, | ||
| ErrorReportConfiguration.builder().build()); | ||
|
|
||
| // default | ||
| _verifyErrorTokenLength(263, | ||
| ErrorReportConfiguration.defaults()); | ||
|
|
||
| // shorter | ||
| _verifyErrorTokenLength(63, | ||
| ErrorReportConfiguration.builder() | ||
| .maxErrorTokenLength(DEFAULT_LENGTH - 200).build()); | ||
|
|
||
| // longer | ||
| _verifyErrorTokenLength(463, | ||
| ErrorReportConfiguration.builder() | ||
| .maxErrorTokenLength(DEFAULT_LENGTH + 200).build()); | ||
|
|
||
| // zero | ||
| _verifyErrorTokenLength(9, | ||
| ErrorReportConfiguration.builder() | ||
| .maxErrorTokenLength(0).build()); | ||
|
|
||
| // negative value fails | ||
| try { | ||
| _verifyErrorTokenLength(9, | ||
| ErrorReportConfiguration.builder() | ||
| .maxErrorTokenLength(-1).build()); | ||
| } catch (IllegalArgumentException e) { | ||
| _verifyIllegalArgumentExceptionMessage(e.getMessage()); | ||
| } | ||
|
|
||
| // null is not allowed | ||
| try { | ||
| _verifyErrorTokenLength(263, | ||
| null); | ||
| } catch (NullPointerException e) { | ||
| // no-op | ||
| } | ||
| } | ||
|
|
||
| public void testNegativeBuilderConfiguration() | ||
| { | ||
| // Zero should be ok | ||
| ErrorReportConfiguration.builder().maxErrorTokenLength(0).build(); | ||
|
|
||
| // But not -1 | ||
| try { | ||
| ErrorReportConfiguration.builder().maxErrorTokenLength(-1).build(); | ||
| fail(); | ||
| } catch (IllegalArgumentException e) { | ||
| _verifyIllegalArgumentExceptionMessage(e.getMessage()); | ||
| } | ||
| } | ||
|
|
||
| public void testNullSetterThrowsException() { | ||
| try { | ||
| newStreamFactory().setErrorReportConfiguration(null); | ||
| fail(); | ||
| } catch (NullPointerException npe) { | ||
| assertThat(npe).hasMessage("Cannot pass null ErrorReportConfiguration"); | ||
| } | ||
| } | ||
|
|
||
| /* | ||
| /********************************************************** | ||
| /* Internal helper methods | ||
| /********************************************************** | ||
| */ | ||
|
|
||
| private void _verifyIllegalArgumentExceptionMessage(String message) { | ||
| assertThat(message) | ||
| .contains("Value of maxErrorTokenLength") | ||
| .contains("cannot be negative"); | ||
| } | ||
|
|
||
| private void _verifyErrorTokenLength(int expectedTokenLen, ErrorReportConfiguration errorReportConfiguration) | ||
| throws Exception | ||
| { | ||
| JsonFactory jf3 = streamFactoryBuilder() | ||
| .errorReportConfiguration(errorReportConfiguration) | ||
| .build(); | ||
| _testWithMaxErrorTokenLength(expectedTokenLen, | ||
| // creating arbitrary number so that token reaches max len, but not over-do it | ||
| 50 * DEFAULT_LENGTH, jf3); | ||
| } | ||
|
|
||
| private void _testWithMaxErrorTokenLength(int expectedSize, int tokenLen, JsonFactory factory) | ||
| throws Exception | ||
| { | ||
| String inputWithDynamicLength = _buildBrokenJsonOfLength(tokenLen); | ||
| try (JsonParser parser = factory.createParser(inputWithDynamicLength)) { | ||
| parser.nextToken(); | ||
| parser.nextToken(); | ||
| } catch (JsonProcessingException e) { | ||
| assertThat(e.getLocation()._totalChars).isEqualTo(expectedSize); | ||
| assertThat(e.getMessage()).contains("Unrecognized token"); | ||
| } | ||
| } | ||
|
|
||
| private String _buildBrokenJsonOfLength(int len) | ||
| { | ||
| StringBuilder sb = new StringBuilder("{\"key\":"); | ||
| for (int i = 0; i < len; i++) { | ||
| sb.append("a"); | ||
| } | ||
| sb.append("!}"); | ||
| return sb.toString(); | ||
| } | ||
| } | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
How about combine various tests related to
ErrorReportConfiguration, instead of separate test classes? Or at least these two.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes for sure 👍🏻