0ct0pu5/kafka-ui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

new conversion tests added

Browse source
This commit is contained in:
iliax 2023-05-11 11:20:40 +04:00
parent c37dd482f5
commit 75fbdbceb0
2 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
kafka-ui-api/src/main/java/com/provectus/kafka/ui/util/jsonschema/JsonAvroConversion.java
View file

@ -154,7 +154,8 @@ public class JsonAvroConversion {
yield processLogicalType(node, avroSchema);
}
assertJsonType(node, JsonNodeType.STRING);
yield ByteBuffer.wrap(node.textValue().getBytes(StandardCharsets.UTF_8));
// logic copied from JsonDecoder::readBytes
yield ByteBuffer.wrap(node.textValue().getBytes(StandardCharsets.ISO_8859_1));
}
case FIXED -> {
if (isLogicalType(avroSchema)) {
@ -237,14 +238,14 @@ public class JsonAvroConversion {
}
//TODO: check with tests
ByteBuffer bytes = (ByteBuffer) obj;
yield new TextNode(new String(bytes.array()));
yield new TextNode(new String(bytes.array(), StandardCharsets.ISO_8859_1));
}
case FIXED -> {
if (isLogicalType(avroSchema)) {
yield processLogicalType(obj, avroSchema);
}
var fixed = (GenericData.Fixed) obj; //TODO: encoding
yield new TextNode(new String(fixed.bytes()));
var fixed = (GenericData.Fixed) obj;
yield new TextNode(new String(fixed.bytes(), StandardCharsets.ISO_8859_1));
}
};
}

12
kafka-ui-api/src/test/java/com/provectus/kafka/ui/util/jsonschema/JsonAvroConversionTest.java
View file

@ -510,10 +510,10 @@ class JsonAvroConversionTest {
GenericData.Record inputRecord = new GenericData.Record(schema);
inputRecord.put("lt_date", LocalDate.of(1991, 8, 14));
inputRecord.put("lt_decimal", new BigDecimal("2.1617413862327545E11"));
inputRecord.put("lt_uuid", UUID.fromString("a37b75ca-097c-5d46-6119-f0637922e908"));
inputRecord.put("lt_decimal", new BigDecimal("2.16"));
inputRecord.put("lt_time_millis", LocalTime.parse("10:15:30.001"));
inputRecord.put("lt_time_micros", LocalTime.parse("10:15:30.123456"));
inputRecord.put("lt_uuid", UUID.fromString("a37b75ca-097c-5d46-6119-f0637922e908"));
inputRecord.put("lt_timestamp_millis", Instant.parse("2007-12-03T10:15:30.123Z"));
inputRecord.put("lt_timestamp_micros", Instant.parse("2007-12-13T10:15:30.123456Z"));
inputRecord.put("lt_local_timestamp_millis", LocalDateTime.parse("2017-12-03T10:15:30.123"));
@ -522,10 +522,10 @@ class JsonAvroConversionTest {
String expectedJson = """
{
"lt_date":"1991-08-14",
"lt_decimal": 2.1617413862327545E11,
"lt_uuid": "a37b75ca-097c-5d46-6119-f0637922e908",
"lt_decimal": 2.16,
"lt_time_millis": "10:15:30.001",
"lt_time_micros": "10:15:30.123456",
"lt_uuid": "a37b75ca-097c-5d46-6119-f0637922e908",
"lt_timestamp_millis": "2007-12-03T10:15:30.123Z",
"lt_timestamp_micros": "2007-12-13T10:15:30.123456Z",
"lt_local_timestamp_millis": "2017-12-03T10:15:30.123",
@ -579,10 +579,10 @@ class JsonAvroConversionTest {
}
@SneakyThrows
private void assertJsonsEqual(String expected, JsonNode actual) {
private void assertJsonsEqual(String expectedJson, JsonNode actual) {
var mapper = new JsonMapper();
assertThat(actual.toPrettyString())
.isEqualTo(mapper.readTree(expected).toPrettyString());
.isEqualTo(mapper.readTree(expectedJson).toPrettyString());
}
}