Skip to content

KAFKA-398 - SimplifiedJson.java edit for handling binary UUID to Hex-string #151

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

KAFKA-398 - SimplifiedJson.java edit for handling binary UUID to Hex-string #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions src/integrationTest/java/com/mongodb/kafka/connect/FullDocumentRoundTripIntegrationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ void tearDown() {
+ " \"B\": {\"$date\": {\"$numberLong\": \"1577863627000\"}},"
+ " \"C\": {\"$numberDecimal\": \"12345.6789\"}},"
+ " \"myArray\": [{\"$numberInt\": \"1\"}, {\"$numberInt\": \"2\"}, {\"$numberInt\": \"3\"}],"
+ " \"myUuid\": {\"$binary\": {\"base64\": \"v7ESnpXpQ1iQNHXUWz4qcw==\", \"subType\": \"04\"}},"
+ " \"myBytes\": {\"$binary\": {\"base64\": \"S2Fma2Egcm9ja3Mh\", \"subType\": \"00\"}},"
+ " \"myDate\": {\"$date\": {\"$numberLong\": \"1234567890\"}},"
+ " \"myDecimal\": {\"$numberDecimal\": \"12345.6789\"}"
Expand All @@ -100,6 +101,7 @@ void tearDown() {
+ "\"myDouble\": 20.21, "
+ "\"mySubDoc\": {\"A\": \"S2Fma2Egcm9ja3Mh\", \"B\": \"2020-01-01T07:27:07Z\", \"C\": \"12345.6789\"}, "
+ "\"myArray\": [1, 2, 3], "
+ "\"myUuid\": \"bfb1129e-95e9-4358-9034-75d45b3e2a73\", "
+ "\"myBytes\": \"S2Fma2Egcm9ja3Mh\", "
+ "\"myDate\": \"1970-01-15T06:56:07.89Z\", "
+ "\"myDecimal\": \"12345.6789\"}";
Expand All @@ -122,6 +124,7 @@ void tearDown() {
+ " }"
+ " }, "
+ " {\"name\": \"myArray\", \"type\": {\"type\" : \"array\", \"items\" : \"int\"}}, "
+ " {\"name\": \"myUuid\", \"type\": \"string\"}, "
+ " {\"name\": \"myBytes\", \"type\": \"string\"}, "
+ " {\"name\": \"myDate\", \"type\": \"string\"}, "
+ " {\"name\": \"myDecimal\", \"type\": \"string\"}"
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/mongodb/kafka/connect/source/MongoSourceConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ public class MongoSourceConfig extends AbstractConfig {
+ " * com.mongodb.kafka.connect.source.json.formatter.DefaultJson: The legacy strict json formatter.\n"
+ " * com.mongodb.kafka.connect.source.json.formatter.ExtendedJson: The fully type safe extended json formatter.\n"
+ " * com.mongodb.kafka.connect.source.json.formatter.SimplifiedJson: Simplified Json, "
+ "with ObjectId, Decimals, Dates and Binary values represented as strings.\n\n"
+ "with ObjectId, UUIDs, Decimals, Dates and Binary values represented as strings.\n\n"
+ "Users can provide their own implementation of the com.mongodb.kafka.connect.source.json.formatter.";

public static final String OUTPUT_SCHEMA_KEY_CONFIG = "output.schema.key";
Expand Down
10 changes: 8 additions & 2 deletions src/main/java/com/mongodb/kafka/connect/source/json/formatter/SimplifiedJson.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.time.format.DateTimeFormatter;
import java.util.Base64;

import org.bson.BsonBinarySubType;
import org.bson.json.JsonMode;
import org.bson.json.JsonWriterSettings;

Expand All @@ -32,8 +33,13 @@ public JsonWriterSettings getJsonWriterSettings() {
return JsonWriterSettings.builder()
.outputMode(JsonMode.RELAXED)
.binaryConverter(
(value, writer) ->
writer.writeString(Base64.getEncoder().encodeToString(value.getData())))
(value, writer) -> {
if (BsonBinarySubType.UUID_STANDARD.getValue() == value.getType()) {
writer.writeString(value.asUuid().toString());
} else {
writer.writeString(Base64.getEncoder().encodeToString(value.getData()));
}
})
.dateTimeConverter(
(value, writer) -> {
ZonedDateTime zonedDateTime = Instant.ofEpochMilli(value).atZone(ZoneOffset.UTC);
Expand Down
3 changes: 3 additions & 0 deletions .../java/com/mongodb/kafka/connect/source/json/formatter/JsonWriterSettingsProviderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ public class JsonWriterSettingsProviderTest {
+ " 'B': {'$date': {'$numberLong': '1577863627000'}}, 'C': {'$numberDecimal': '12345.6789'}}, "
+ "'myArray': [{'$binary': {'base64': 'S2Fma2Egcm9ja3Mh', 'subType': '00'}}, "
+ " {'$date': {'$numberLong': '1577863627000'}}, {'$numberDecimal': '12345.6789'}], "
+ "'myUuid': {'$binary': {'base64': 'v7ESnpXpQ1iQNHXUWz4qcw==', 'subType': '04'}}, "
+ "'myBytes': {'$binary': {'base64': 'S2Fma2Egcm9ja3Mh', 'subType': '00'}}, "
+ "'myDate': {'$date': {'$numberLong': '1577863627000'}}, "
+ "'myDecimal': {'$numberDecimal': '12345.6789'}}");
Expand All @@ -51,6 +52,7 @@ public class JsonWriterSettingsProviderTest {
+ " 'B': {'$date': {'$numberLong': '1577863627000'}}, 'C': {'$numberDecimal': '12345.6789'}}, "
+ "'myArray': [{'$binary': {'base64': 'S2Fma2Egcm9ja3Mh', 'subType': '00'}}, "
+ " {'$date': {'$numberLong': '1577863627000'}}, {'$numberDecimal': '12345.6789'}], "
+ "'myUuid': {'$binary': {'base64': 'v7ESnpXpQ1iQNHXUWz4qcw==', 'subType': '04'}}, "
+ "'myBytes': {'$binary': {'base64': 'S2Fma2Egcm9ja3Mh', 'subType': '00'}}, "
+ "'myDate': {'$date': {'$numberLong': '1577863627000'}}, "
+ "'myDecimal': {'$numberDecimal': '12345.6789'}}");
Expand All @@ -63,6 +65,7 @@ public class JsonWriterSettingsProviderTest {
+ "myDouble: 20.21, "
+ "mySubDoc: {A: 'S2Fma2Egcm9ja3Mh', B: '2020-01-01T07:27:07Z', C: '12345.6789'},"
+ "myArray: ['S2Fma2Egcm9ja3Mh', '2020-01-01T07:27:07Z', '12345.6789'],"
+ "myUuid: 'bfb1129e-95e9-4358-9034-75d45b3e2a73', "
+ "myBytes: 'S2Fma2Egcm9ja3Mh', "
+ "myDate: '2020-01-01T07:27:07Z', "
+ "myDecimal: '12345.6789'}");
Expand Down
4 changes: 3 additions & 1 deletion src/test/java/com/mongodb/kafka/connect/source/producer/SchemaAndValueProducerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,9 @@ static String getLsidId(final boolean simplified) {

static String getLsidId(final boolean simplified, final boolean quoted) {
return simplified
? quoted ? "\"c//SZESzTGmQ6OfR38A11A==\"" : "c//SZESzTGmQ6OfR38A11A=="
? quoted
? "\"73ffd264-44b3-4c69-90e8-e7d1dfc035d4\""
: "73ffd264-44b3-4c69-90e8-e7d1dfc035d4"
: "{\"$binary\": {\"base64\": \"c//SZESzTGmQ6OfR38A11A==\", \"subType\": \"04\"}}";
}

Expand Down