Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ public String externalToInternal(JsonNode node) {
} catch (JsonProcessingException e) {
throw new IllegalArgumentException("Cannot deserialize node " + node, e);
}
} else if (node.isTextual()) {
// Return the original text value without processing escape sequences for text nodes
// This preserves unicode escape sequences like \u001a instead of converting them to characters
return node.textValue();
} else {
return node.asText();
}
Expand Down
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 {
Copy link
Collaborator

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:

      String unicodeEscapeString = "\\u001a\\u001aL\\\\";
      String mixedContentString = "Text with \\\\u001a unicode \\\\u001aL\\\\\\\\ escapes";
      assertThat(codec)
              .convertsFromExternal(nodeFactory.textNode(unicodeEscapeString))
              .toInternal(unicodeEscapeString)
              .convertsFromExternal(nodeFactory.textNode(mixedContentString))
              .toInternal(mixedContentString);

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?


@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);
}
}
2 changes: 1 addition & 1 deletion distribution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/io.netty.versions.properties</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"/>
</transformers>
</configuration>
</execution>
Expand Down