From e81c752235727b166e167701477eea2551a9f44b Mon Sep 17 00:00:00 2001 From: Christophe Le Saec Date: Wed, 19 Jul 2023 08:45:45 +0200 Subject: [PATCH] AVRO-2236: fix test from code scanning --- .../org/apache/avro/TestSchemaValidateDefault.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/lang/java/avro/src/test/java/org/apache/avro/TestSchemaValidateDefault.java b/lang/java/avro/src/test/java/org/apache/avro/TestSchemaValidateDefault.java index 2eaac30ba4b..a86519c7560 100644 --- a/lang/java/avro/src/test/java/org/apache/avro/TestSchemaValidateDefault.java +++ b/lang/java/avro/src/test/java/org/apache/avro/TestSchemaValidateDefault.java @@ -40,15 +40,9 @@ public class TestSchemaValidateDefault { @Test public void valueReadWithCorrectDefaultValue() throws IOException { - Schema schm = ReflectData.get().getSchema(ExampleRecord.class); ExampleRecord writtenValue = new ExampleRecord(new ComplexValue(42L), new ComplexValue(666L)); byte[] bytes = getSerializer(ExampleRecord.SCHEMA_WITH_ONE_FIELD).apply(writtenValue); - // Function deserializer = - // getDeserializer(ExampleRecord.class, ExampleRecord.SCHEMA_WITH_TWO_FIELDS, - // ExampleRecord.SCHEMA_WITH_ONE_FIELD); - // ExampleRecord deserializedValue = deserializer.apply(bytes); - ReflectDatumReader reader = new ReflectDatumReader<>(ExampleRecord.SCHEMA_WITH_ONE_FIELD, ExampleRecord.SCHEMA_WITH_TWO_FIELDS, ReflectData.get()); Decoder decoder = DecoderFactory.get().jsonDecoder(ExampleRecord.SCHEMA_WITH_ONE_FIELD, @@ -83,13 +77,14 @@ public static Function getDeserializer(Class readClass, Schema Objects.requireNonNull(writerSchema, "writerSchema must not be null"); ReflectDatumReader reader = new ReflectDatumReader<>(writerSchema, readerSchema, new ReflectData()); - return bytes -> { + return (byte[] bytes) -> { try { Decoder decoder = DecoderFactory.get().jsonDecoder(writerSchema, new ByteArrayInputStream(bytes)); T readValue = reader.read(null, decoder); return readValue; } catch (IOException e) { - throw new IllegalStateException(String.format("Avro failed to decode %s to %s", bytes, readClass), e); + throw new IllegalStateException(String.format("Avro failed to decode %s to %s", new String(bytes), readClass), + e); } }; } @@ -123,7 +118,6 @@ public static class ExampleRecord { public static final Schema SCHEMA_WITH_TWO_FIELDS; static { - Schema schm = ReflectData.get().getSchema(ExampleRecord.class); SCHEMA_WITH_ONE_FIELD = SchemaBuilder.record("org.apache.avro.TestSchemaValidateDefault.ExampleRecord").fields() .name("value1").type(TestSchemaValidateDefault.SCHEMA).noDefault().endRecord();