-
Notifications
You must be signed in to change notification settings - Fork 32
Bugfix - JSON connector doesnt retain unicode characters during load #509
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
Closed
Closed
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
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
87 changes: 87 additions & 0 deletions
87
.../test/java/com/datastax/oss/dsbulk/codecs/text/json/JsonNodeToStringCodecUnicodeTest.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,87 @@ | ||
| /* | ||
| * Copyright DataStax, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package com.datastax.oss.dsbulk.codecs.text.json; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| import com.datastax.oss.driver.api.core.type.codec.TypeCodecs; | ||
| import com.fasterxml.jackson.databind.JsonNode; | ||
| import com.fasterxml.jackson.databind.node.TextNode; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import java.util.Collections; | ||
|
|
||
| /** | ||
| * Test for issue #508: JSON connector should preserve unicode escape sequences. | ||
| */ | ||
| class JsonNodeToStringCodecUnicodeTest { | ||
|
|
||
| @Test | ||
| void should_preserve_unicode_escape_sequences_in_text_nodes() { | ||
| // Create a string with unicode escape sequences | ||
| String testString = "\\u001a\\u001aL\\\\"; // The problematic string from the issue #508 | ||
|
|
||
| // Create a JSON node with the test string | ||
| JsonNode node = new TextNode(testString); | ||
|
|
||
| // Create the codec that would handle the string conversion | ||
| JsonNodeToStringCodec codec = new JsonNodeToStringCodec( | ||
| TypeCodecs.TEXT, // Using the proper inner codec | ||
| JsonCodecUtils.getObjectMapper(), | ||
| Collections.emptyList() // null strings | ||
| ); | ||
|
|
||
| // Convert the node to a string | ||
| String result = codec.externalToInternal(node); | ||
|
|
||
| // Check if the conversion preserves the original string with escape sequences | ||
| assertThat(result).isEqualTo(testString); | ||
| } | ||
|
|
||
| @Test | ||
| void should_handle_regular_text_properly() { | ||
| // Regular text without escape sequences | ||
| String testString = "This is a regular string"; | ||
|
|
||
| JsonNode node = new TextNode(testString); | ||
|
|
||
| JsonNodeToStringCodec codec = new JsonNodeToStringCodec( | ||
| TypeCodecs.TEXT, | ||
| JsonCodecUtils.getObjectMapper(), | ||
| Collections.emptyList() | ||
| ); | ||
|
|
||
| String result = codec.externalToInternal(node); | ||
| assertThat(result).isEqualTo(testString); | ||
| } | ||
|
|
||
| @Test | ||
| void should_handle_mixed_content_properly() { | ||
| // Text with both regular characters and unicode escape sequences | ||
| String testString = "Text with \\u001a unicode \\u001aL\\\\ escapes"; | ||
|
|
||
| JsonNode node = new TextNode(testString); | ||
|
|
||
| JsonNodeToStringCodec codec = new JsonNodeToStringCodec( | ||
| TypeCodecs.TEXT, | ||
| JsonCodecUtils.getObjectMapper(), | ||
| Collections.emptyList() | ||
| ); | ||
|
|
||
| String result = codec.externalToInternal(node); | ||
| assertThat(result).isEqualTo(testString); | ||
| } | ||
| } | ||
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
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.
So rather than creating a new test class for this we should be able to add this to the JsonNodeToStringCodecTest. We already have a should_convert_from_valid_external method which verifies the ability of that codec to handle legit incoming JsonNodes... and IIUC this is just another case of that. Something like the following should do it:
Thing is... if I add that test to 1.x and run it (with no additional modifications, specifically without the changes to JsonNodeToStringCodec also included in this PR) the test already passes. So are we sure there isn't something else going on here?