From b20fd7505a221f6da24e06bdd9731146a5d2d940 Mon Sep 17 00:00:00 2001 From: Oscar Westra van Holthe - Kind Date: Fri, 18 Apr 2025 08:46:54 +0200 Subject: [PATCH 1/5] AVRO-4126: "Autogenerated" should be comment --- .../compiler/specific/SpecificCompiler.java | 49 +++++++++---------- .../specific/TestSpecificCompiler.java | 20 ++++---- .../test/compiler/output-string/Position.java | 2 +- .../avro/examples/baseball/FieldTest.java | 2 +- .../avro/examples/baseball/Player.java | 2 +- .../avro/examples/baseball/Position.java | 2 +- .../avro/examples/baseball/Proto.java | 4 +- .../output/AddExtraOptionalGettersTest.java | 2 +- .../test/compiler/output/NoSettersTest.java | 2 +- .../output/OptionalGettersAllFieldsTest.java | 2 +- .../OptionalGettersNullableFieldsTest.java | 2 +- .../src/test/compiler/output/Player.java | 2 +- .../src/test/compiler/output/Position.java | 2 +- 13 files changed, 46 insertions(+), 47 deletions(-) diff --git a/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SpecificCompiler.java b/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SpecificCompiler.java index cad00e943f2..ef7ce7736d6 100644 --- a/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SpecificCompiler.java +++ b/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SpecificCompiler.java @@ -17,29 +17,6 @@ */ package org.apache.avro.compiler.specific; -import static java.nio.charset.StandardCharsets.UTF_8; - -import org.apache.avro.Conversion; -import org.apache.avro.Conversions; -import org.apache.avro.JsonProperties; -import org.apache.avro.LogicalType; -import org.apache.avro.LogicalTypes; -import org.apache.avro.Protocol; -import org.apache.avro.Protocol.Message; -import org.apache.avro.Schema; -import org.apache.avro.Schema.Field; -import org.apache.avro.SchemaNormalization; -import org.apache.avro.SchemaParser; -import org.apache.avro.data.TimeConversions; -import org.apache.avro.generic.GenericData; -import org.apache.avro.generic.GenericData.StringType; -import org.apache.avro.specific.SpecificData; -import org.apache.velocity.Template; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.VelocityEngine; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -63,6 +40,29 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import static java.nio.charset.StandardCharsets.UTF_8; + +import org.apache.avro.Conversion; +import org.apache.avro.Conversions; +import org.apache.avro.JsonProperties; +import org.apache.avro.LogicalType; +import org.apache.avro.LogicalTypes; +import org.apache.avro.Protocol; +import org.apache.avro.Protocol.Message; +import org.apache.avro.Schema; +import org.apache.avro.Schema.Field; +import org.apache.avro.SchemaNormalization; +import org.apache.avro.SchemaParser; +import org.apache.avro.data.TimeConversions; +import org.apache.avro.generic.GenericData; +import org.apache.avro.generic.GenericData.StringType; +import org.apache.avro.specific.SpecificData; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.VelocityEngine; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * Generate specific Java interfaces and classes for protocols and schemas. *

@@ -142,8 +142,7 @@ public boolean isCreateAllArgsConstructor() { return createAllArgsConstructor; } - private static final String FILE_HEADER = "/**\n" + " * Autogenerated by Avro\n" + " *\n" - + " * DO NOT EDIT DIRECTLY\n" + " */\n"; + private static final String FILE_HEADER = "/*\n * Autogenerated by Avro\n *\n * DO NOT EDIT DIRECTLY\n */\n"; public SpecificCompiler(Protocol protocol) { this(); diff --git a/lang/java/compiler/src/test/java/org/apache/avro/compiler/specific/TestSpecificCompiler.java b/lang/java/compiler/src/test/java/org/apache/avro/compiler/specific/TestSpecificCompiler.java index 19d63d033c7..eb98a618ed7 100644 --- a/lang/java/compiler/src/test/java/org/apache/avro/compiler/specific/TestSpecificCompiler.java +++ b/lang/java/compiler/src/test/java/org/apache/avro/compiler/specific/TestSpecificCompiler.java @@ -17,15 +17,6 @@ */ package org.apache.avro.compiler.specific; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.hasItem; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - import org.apache.avro.AvroTypeException; import org.apache.avro.LogicalType; import org.apache.avro.LogicalTypes; @@ -63,6 +54,15 @@ import javax.tools.StandardJavaFileManager; import javax.tools.ToolProvider; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestSpecificCompiler { private static final Logger LOG = LoggerFactory.getLogger(TestSpecificCompiler.class); @@ -133,7 +133,7 @@ static void assertCompilesWithJavaCompiler(File dstDir, Collection callback) throws java.io.IOException; } -} \ No newline at end of file +} diff --git a/lang/java/tools/src/test/compiler/output/AddExtraOptionalGettersTest.java b/lang/java/tools/src/test/compiler/output/AddExtraOptionalGettersTest.java index 0d5fd94ea73..d8c53618488 100644 --- a/lang/java/tools/src/test/compiler/output/AddExtraOptionalGettersTest.java +++ b/lang/java/tools/src/test/compiler/output/AddExtraOptionalGettersTest.java @@ -1,4 +1,4 @@ -/** +/* * Autogenerated by Avro * * DO NOT EDIT DIRECTLY diff --git a/lang/java/tools/src/test/compiler/output/NoSettersTest.java b/lang/java/tools/src/test/compiler/output/NoSettersTest.java index 4f6914dcff0..6e4cea44f8e 100644 --- a/lang/java/tools/src/test/compiler/output/NoSettersTest.java +++ b/lang/java/tools/src/test/compiler/output/NoSettersTest.java @@ -1,4 +1,4 @@ -/** +/* * Autogenerated by Avro * * DO NOT EDIT DIRECTLY diff --git a/lang/java/tools/src/test/compiler/output/OptionalGettersAllFieldsTest.java b/lang/java/tools/src/test/compiler/output/OptionalGettersAllFieldsTest.java index 10453c307e5..ece62933a80 100644 --- a/lang/java/tools/src/test/compiler/output/OptionalGettersAllFieldsTest.java +++ b/lang/java/tools/src/test/compiler/output/OptionalGettersAllFieldsTest.java @@ -1,4 +1,4 @@ -/** +/* * Autogenerated by Avro * * DO NOT EDIT DIRECTLY diff --git a/lang/java/tools/src/test/compiler/output/OptionalGettersNullableFieldsTest.java b/lang/java/tools/src/test/compiler/output/OptionalGettersNullableFieldsTest.java index aa55db60075..60c87c2953c 100644 --- a/lang/java/tools/src/test/compiler/output/OptionalGettersNullableFieldsTest.java +++ b/lang/java/tools/src/test/compiler/output/OptionalGettersNullableFieldsTest.java @@ -1,4 +1,4 @@ -/** +/* * Autogenerated by Avro * * DO NOT EDIT DIRECTLY diff --git a/lang/java/tools/src/test/compiler/output/Player.java b/lang/java/tools/src/test/compiler/output/Player.java index 3fbfd1cfe88..e1f6f91c84d 100644 --- a/lang/java/tools/src/test/compiler/output/Player.java +++ b/lang/java/tools/src/test/compiler/output/Player.java @@ -1,4 +1,4 @@ -/** +/* * Autogenerated by Avro * * DO NOT EDIT DIRECTLY diff --git a/lang/java/tools/src/test/compiler/output/Position.java b/lang/java/tools/src/test/compiler/output/Position.java index 3e6abc502ae..b662bcac5a7 100644 --- a/lang/java/tools/src/test/compiler/output/Position.java +++ b/lang/java/tools/src/test/compiler/output/Position.java @@ -1,4 +1,4 @@ -/** +/* * Autogenerated by Avro * * DO NOT EDIT DIRECTLY From b5d23586d436886597f0c10381806b104855d4df Mon Sep 17 00:00:00 2001 From: Oscar Westra van Holthe - Kind Date: Fri, 18 Apr 2025 08:46:54 +0200 Subject: [PATCH 2/5] AVRO-4126: "Autogenerated" should be comment --- .../compiler/specific/SpecificCompiler.java | 49 +++++++++---------- .../specific/TestSpecificCompiler.java | 20 ++++---- .../test/compiler/output-string/Position.java | 2 +- .../avro/examples/baseball/FieldTest.java | 2 +- .../avro/examples/baseball/Player.java | 2 +- .../avro/examples/baseball/Position.java | 2 +- .../avro/examples/baseball/Proto.java | 4 +- .../output/AddExtraOptionalGettersTest.java | 2 +- .../test/compiler/output/NoSettersTest.java | 2 +- .../output/OptionalGettersAllFieldsTest.java | 2 +- .../OptionalGettersNullableFieldsTest.java | 2 +- .../src/test/compiler/output/Player.java | 2 +- .../src/test/compiler/output/Position.java | 2 +- 13 files changed, 46 insertions(+), 47 deletions(-) diff --git a/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SpecificCompiler.java b/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SpecificCompiler.java index cad00e943f2..ef7ce7736d6 100644 --- a/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SpecificCompiler.java +++ b/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SpecificCompiler.java @@ -17,29 +17,6 @@ */ package org.apache.avro.compiler.specific; -import static java.nio.charset.StandardCharsets.UTF_8; - -import org.apache.avro.Conversion; -import org.apache.avro.Conversions; -import org.apache.avro.JsonProperties; -import org.apache.avro.LogicalType; -import org.apache.avro.LogicalTypes; -import org.apache.avro.Protocol; -import org.apache.avro.Protocol.Message; -import org.apache.avro.Schema; -import org.apache.avro.Schema.Field; -import org.apache.avro.SchemaNormalization; -import org.apache.avro.SchemaParser; -import org.apache.avro.data.TimeConversions; -import org.apache.avro.generic.GenericData; -import org.apache.avro.generic.GenericData.StringType; -import org.apache.avro.specific.SpecificData; -import org.apache.velocity.Template; -import org.apache.velocity.VelocityContext; -import org.apache.velocity.app.VelocityEngine; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import java.io.File; import java.io.FileOutputStream; import java.io.IOException; @@ -63,6 +40,29 @@ import java.util.stream.Collectors; import java.util.stream.Stream; +import static java.nio.charset.StandardCharsets.UTF_8; + +import org.apache.avro.Conversion; +import org.apache.avro.Conversions; +import org.apache.avro.JsonProperties; +import org.apache.avro.LogicalType; +import org.apache.avro.LogicalTypes; +import org.apache.avro.Protocol; +import org.apache.avro.Protocol.Message; +import org.apache.avro.Schema; +import org.apache.avro.Schema.Field; +import org.apache.avro.SchemaNormalization; +import org.apache.avro.SchemaParser; +import org.apache.avro.data.TimeConversions; +import org.apache.avro.generic.GenericData; +import org.apache.avro.generic.GenericData.StringType; +import org.apache.avro.specific.SpecificData; +import org.apache.velocity.Template; +import org.apache.velocity.VelocityContext; +import org.apache.velocity.app.VelocityEngine; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * Generate specific Java interfaces and classes for protocols and schemas. *

@@ -142,8 +142,7 @@ public boolean isCreateAllArgsConstructor() { return createAllArgsConstructor; } - private static final String FILE_HEADER = "/**\n" + " * Autogenerated by Avro\n" + " *\n" - + " * DO NOT EDIT DIRECTLY\n" + " */\n"; + private static final String FILE_HEADER = "/*\n * Autogenerated by Avro\n *\n * DO NOT EDIT DIRECTLY\n */\n"; public SpecificCompiler(Protocol protocol) { this(); diff --git a/lang/java/compiler/src/test/java/org/apache/avro/compiler/specific/TestSpecificCompiler.java b/lang/java/compiler/src/test/java/org/apache/avro/compiler/specific/TestSpecificCompiler.java index 19d63d033c7..eb98a618ed7 100644 --- a/lang/java/compiler/src/test/java/org/apache/avro/compiler/specific/TestSpecificCompiler.java +++ b/lang/java/compiler/src/test/java/org/apache/avro/compiler/specific/TestSpecificCompiler.java @@ -17,15 +17,6 @@ */ package org.apache.avro.compiler.specific; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.hasItem; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - import org.apache.avro.AvroTypeException; import org.apache.avro.LogicalType; import org.apache.avro.LogicalTypes; @@ -63,6 +54,15 @@ import javax.tools.StandardJavaFileManager; import javax.tools.ToolProvider; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + public class TestSpecificCompiler { private static final Logger LOG = LoggerFactory.getLogger(TestSpecificCompiler.class); @@ -133,7 +133,7 @@ static void assertCompilesWithJavaCompiler(File dstDir, Collection callback) throws java.io.IOException; } -} \ No newline at end of file +} diff --git a/lang/java/tools/src/test/compiler/output/AddExtraOptionalGettersTest.java b/lang/java/tools/src/test/compiler/output/AddExtraOptionalGettersTest.java index 0d5fd94ea73..d8c53618488 100644 --- a/lang/java/tools/src/test/compiler/output/AddExtraOptionalGettersTest.java +++ b/lang/java/tools/src/test/compiler/output/AddExtraOptionalGettersTest.java @@ -1,4 +1,4 @@ -/** +/* * Autogenerated by Avro * * DO NOT EDIT DIRECTLY diff --git a/lang/java/tools/src/test/compiler/output/NoSettersTest.java b/lang/java/tools/src/test/compiler/output/NoSettersTest.java index 4f6914dcff0..6e4cea44f8e 100644 --- a/lang/java/tools/src/test/compiler/output/NoSettersTest.java +++ b/lang/java/tools/src/test/compiler/output/NoSettersTest.java @@ -1,4 +1,4 @@ -/** +/* * Autogenerated by Avro * * DO NOT EDIT DIRECTLY diff --git a/lang/java/tools/src/test/compiler/output/OptionalGettersAllFieldsTest.java b/lang/java/tools/src/test/compiler/output/OptionalGettersAllFieldsTest.java index 10453c307e5..ece62933a80 100644 --- a/lang/java/tools/src/test/compiler/output/OptionalGettersAllFieldsTest.java +++ b/lang/java/tools/src/test/compiler/output/OptionalGettersAllFieldsTest.java @@ -1,4 +1,4 @@ -/** +/* * Autogenerated by Avro * * DO NOT EDIT DIRECTLY diff --git a/lang/java/tools/src/test/compiler/output/OptionalGettersNullableFieldsTest.java b/lang/java/tools/src/test/compiler/output/OptionalGettersNullableFieldsTest.java index aa55db60075..60c87c2953c 100644 --- a/lang/java/tools/src/test/compiler/output/OptionalGettersNullableFieldsTest.java +++ b/lang/java/tools/src/test/compiler/output/OptionalGettersNullableFieldsTest.java @@ -1,4 +1,4 @@ -/** +/* * Autogenerated by Avro * * DO NOT EDIT DIRECTLY diff --git a/lang/java/tools/src/test/compiler/output/Player.java b/lang/java/tools/src/test/compiler/output/Player.java index 3fbfd1cfe88..e1f6f91c84d 100644 --- a/lang/java/tools/src/test/compiler/output/Player.java +++ b/lang/java/tools/src/test/compiler/output/Player.java @@ -1,4 +1,4 @@ -/** +/* * Autogenerated by Avro * * DO NOT EDIT DIRECTLY diff --git a/lang/java/tools/src/test/compiler/output/Position.java b/lang/java/tools/src/test/compiler/output/Position.java index 3e6abc502ae..b662bcac5a7 100644 --- a/lang/java/tools/src/test/compiler/output/Position.java +++ b/lang/java/tools/src/test/compiler/output/Position.java @@ -1,4 +1,4 @@ -/** +/* * Autogenerated by Avro * * DO NOT EDIT DIRECTLY From a9ea3359120e3740608dc4ad20b802cc297bb6cd Mon Sep 17 00:00:00 2001 From: Oscar Westra van Holthe - Kind Date: Fri, 18 Apr 2025 15:53:55 +0200 Subject: [PATCH 3/5] AVRO-4126: Undo change to imports --- .../compiler/specific/SpecificCompiler.java | 46 +++++++++---------- .../specific/TestSpecificCompiler.java | 18 ++++---- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SpecificCompiler.java b/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SpecificCompiler.java index ef7ce7736d6..a969244cb66 100644 --- a/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SpecificCompiler.java +++ b/lang/java/compiler/src/main/java/org/apache/avro/compiler/specific/SpecificCompiler.java @@ -17,29 +17,6 @@ */ package org.apache.avro.compiler.specific; -import java.io.File; -import java.io.FileOutputStream; -import java.io.IOException; -import java.io.OutputStreamWriter; -import java.io.StringWriter; -import java.io.Writer; -import java.lang.reflect.InvocationTargetException; -import java.nio.file.Files; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.regex.Pattern; -import java.util.stream.Collectors; -import java.util.stream.Stream; - import static java.nio.charset.StandardCharsets.UTF_8; import org.apache.avro.Conversion; @@ -63,6 +40,29 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.File; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.OutputStreamWriter; +import java.io.StringWriter; +import java.io.Writer; +import java.lang.reflect.InvocationTargetException; +import java.nio.file.Files; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.regex.Pattern; +import java.util.stream.Collectors; +import java.util.stream.Stream; + /** * Generate specific Java interfaces and classes for protocols and schemas. *

diff --git a/lang/java/compiler/src/test/java/org/apache/avro/compiler/specific/TestSpecificCompiler.java b/lang/java/compiler/src/test/java/org/apache/avro/compiler/specific/TestSpecificCompiler.java index eb98a618ed7..e0f5cfb0fa9 100644 --- a/lang/java/compiler/src/test/java/org/apache/avro/compiler/specific/TestSpecificCompiler.java +++ b/lang/java/compiler/src/test/java/org/apache/avro/compiler/specific/TestSpecificCompiler.java @@ -17,6 +17,15 @@ */ package org.apache.avro.compiler.specific; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.CoreMatchers.hasItem; +import static org.hamcrest.CoreMatchers.not; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.avro.AvroTypeException; import org.apache.avro.LogicalType; import org.apache.avro.LogicalTypes; @@ -54,15 +63,6 @@ import javax.tools.StandardJavaFileManager; import javax.tools.ToolProvider; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.hamcrest.CoreMatchers.hasItem; -import static org.hamcrest.CoreMatchers.not; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertFalse; -import static org.junit.jupiter.api.Assertions.assertThrows; -import static org.junit.jupiter.api.Assertions.assertTrue; - public class TestSpecificCompiler { private static final Logger LOG = LoggerFactory.getLogger(TestSpecificCompiler.class); From 098f7ab90493a49c23d4ede883f3bf76d5e4c041 Mon Sep 17 00:00:00 2001 From: Oscar Westra van Holthe - Kind Date: Fri, 18 Apr 2025 16:52:53 +0200 Subject: [PATCH 4/5] AVRO-4126: Missing files --- .../TestRecordWithoutLogicalTypes.java | 2 +- .../java/org/apache/avro/specific/int$.java | 22 +++++++++---------- .../NullSafeAnnotationsFieldsTest.java | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/lang/java/avro/src/test/java/org/apache/avro/specific/TestRecordWithoutLogicalTypes.java b/lang/java/avro/src/test/java/org/apache/avro/specific/TestRecordWithoutLogicalTypes.java index f53f1537ffd..c5d9c191c1f 100644 --- a/lang/java/avro/src/test/java/org/apache/avro/specific/TestRecordWithoutLogicalTypes.java +++ b/lang/java/avro/src/test/java/org/apache/avro/specific/TestRecordWithoutLogicalTypes.java @@ -1,4 +1,4 @@ -/** +/* * Autogenerated by Avro * * DO NOT EDIT DIRECTLY diff --git a/lang/java/avro/src/test/java/org/apache/avro/specific/int$.java b/lang/java/avro/src/test/java/org/apache/avro/specific/int$.java index 586d4219124..17c2bef4770 100644 --- a/lang/java/avro/src/test/java/org/apache/avro/specific/int$.java +++ b/lang/java/avro/src/test/java/org/apache/avro/specific/int$.java @@ -1,4 +1,4 @@ -/** +/* * Autogenerated by Avro * * DO NOT EDIT DIRECTLY @@ -28,7 +28,7 @@ public static org.apache.avro.Schema getClassSchema() { /** * Return the BinaryMessageEncoder instance used by this class. - * + * * @return the message encoder used by this class */ public static BinaryMessageEncoder getEncoder() { @@ -37,7 +37,7 @@ public static org.apache.avro.Schema getClassSchema() { /** * Return the BinaryMessageDecoder instance used by this class. - * + * * @return the message decoder used by this class */ public static BinaryMessageDecoder getDecoder() { @@ -47,7 +47,7 @@ public static org.apache.avro.Schema getClassSchema() { /** * Create a new BinaryMessageDecoder instance for this class that uses the * specified {@link SchemaStore}. - * + * * @param resolver a {@link SchemaStore} used to find schemas by fingerprint * @return a BinaryMessageDecoder instance for this class backed by the given * SchemaStore @@ -58,7 +58,7 @@ public static org.apache.avro.Schema getClassSchema() { /** * Serializes this int to a ByteBuffer. - * + * * @return a buffer holding the serialized data for this instance * @throws java.io.IOException if this instance could not be serialized */ @@ -68,7 +68,7 @@ public java.nio.ByteBuffer toByteBuffer() throws java.io.IOException { /** * Deserializes a int from a ByteBuffer. - * + * * @param b a byte buffer holding serialized data for an instance of this class * @return a int instance decoded from the given buffer * @throws java.io.IOException if the given bytes could not be deserialized into @@ -105,7 +105,7 @@ public void put(int field$, Object value$) { /** * Creates a new int$ RecordBuilder. - * + * * @return A new int$ RecordBuilder */ public static Builder newBuilder() { @@ -114,7 +114,7 @@ public static Builder newBuilder() { /** * Creates a new int$ RecordBuilder by copying an existing Builder. - * + * * @param other The existing builder to copy. * @return A new int$ RecordBuilder */ @@ -128,7 +128,7 @@ public static Builder newBuilder(Builder other) { /** * Creates a new int$ RecordBuilder by copying an existing int$ instance. - * + * * @param other The existing instance to copy. * @return A new int$ RecordBuilder */ @@ -154,7 +154,7 @@ private Builder() { /** * Creates a Builder by copying an existing Builder. - * + * * @param other The existing Builder to copy. */ private Builder(Builder other) { @@ -163,7 +163,7 @@ private Builder(Builder other) { /** * Creates a Builder by copying an existing int$ instance - * + * * @param other The existing instance to copy. */ private Builder(int$ other) { diff --git a/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/NullSafeAnnotationsFieldsTest.java b/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/NullSafeAnnotationsFieldsTest.java index 1da1fcde0e5..773d25e7b6b 100644 --- a/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/NullSafeAnnotationsFieldsTest.java +++ b/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/NullSafeAnnotationsFieldsTest.java @@ -1,4 +1,4 @@ -/** +/* * Autogenerated by Avro * * DO NOT EDIT DIRECTLY From 1a0c35a41d338e30ffcb108ee90370422882b852 Mon Sep 17 00:00:00 2001 From: Oscar Westra van Holthe - Kind Date: Sat, 3 May 2025 20:31:50 +0200 Subject: [PATCH 5/5] AVRO-4126: Add change to new test --- .../baseball/JSpecifyNullSafeAnnotationsFieldsTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/JSpecifyNullSafeAnnotationsFieldsTest.java b/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/JSpecifyNullSafeAnnotationsFieldsTest.java index 1fa56857f8f..7a352b703d3 100644 --- a/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/JSpecifyNullSafeAnnotationsFieldsTest.java +++ b/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/JSpecifyNullSafeAnnotationsFieldsTest.java @@ -1,4 +1,4 @@ -/** +/* * Autogenerated by Avro * * DO NOT EDIT DIRECTLY