This is an automated email from the ASF dual-hosted git repository. opwvhk pushed a commit to branch branch-1.12 in repository https://gitbox.apache.org/repos/asf/avro.git
commit 6a0f60cb174d11020344de2afd2fc368d6b307a9 Author: Oscar Westra van Holthe - Kind <[email protected]> AuthorDate: Sat May 3 21:04:20 2025 +0200 Avro 4126 fix generated javadoc comment (#3360) (cherry picked from commit edb293925d0cd29ae9d0f6031f875722a8912e65) --- .../specific/TestRecordWithoutLogicalTypes.java | 2 +- .../test/java/org/apache/avro/specific/int$.java | 22 +++++++++++----------- .../avro/compiler/specific/SpecificCompiler.java | 3 +-- .../compiler/specific/TestSpecificCompiler.java | 2 +- .../src/test/compiler/output-string/Position.java | 2 +- .../avro/examples/baseball/FieldTest.java | 2 +- .../JSpecifyNullSafeAnnotationsFieldsTest.java | 2 +- .../JetBrainsNullSafeAnnotationsFieldsTest.java | 2 +- .../avro/examples/baseball/Player.java | 2 +- .../avro/examples/baseball/Position.java | 2 +- .../avro/examples/baseball/Proto.java | 4 ++-- .../output/AddExtraOptionalGettersTest.java | 2 +- .../src/test/compiler/output/NoSettersTest.java | 2 +- .../output/OptionalGettersAllFieldsTest.java | 2 +- .../output/OptionalGettersNullableFieldsTest.java | 2 +- .../tools/src/test/compiler/output/Player.java | 2 +- .../tools/src/test/compiler/output/Position.java | 2 +- 17 files changed, 28 insertions(+), 29 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 f53f1537ff..c5d9c191c1 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 586d421912..17c2bef477 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 class int$ extends SpecificRecordBase implements SpecificRecord { /** * Return the BinaryMessageEncoder instance used by this class. - * + * * @return the message encoder used by this class */ public static BinaryMessageEncoder<int$> getEncoder() { @@ -37,7 +37,7 @@ public class int$ extends SpecificRecordBase implements SpecificRecord { /** * Return the BinaryMessageDecoder instance used by this class. - * + * * @return the message decoder used by this class */ public static BinaryMessageDecoder<int$> getDecoder() { @@ -47,7 +47,7 @@ public class int$ extends SpecificRecordBase implements SpecificRecord { /** * 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 class int$ extends SpecificRecordBase implements SpecificRecord { /** * 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 class int$ extends SpecificRecordBase implements SpecificRecord { /** * 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 class int$ extends SpecificRecordBase implements SpecificRecord { /** * Creates a new int$ RecordBuilder. - * + * * @return A new int$ RecordBuilder */ public static Builder newBuilder() { @@ -114,7 +114,7 @@ public class int$ extends SpecificRecordBase implements SpecificRecord { /** * 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 class int$ extends SpecificRecordBase implements SpecificRecord { /** * 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 @@ public class int$ extends SpecificRecordBase implements SpecificRecord { /** * Creates a Builder by copying an existing Builder. - * + * * @param other The existing Builder to copy. */ private Builder(Builder other) { @@ -163,7 +163,7 @@ public class int$ extends SpecificRecordBase implements SpecificRecord { /** * 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/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 8ee062c372..04eb11801e 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 @@ -144,8 +144,7 @@ public class SpecificCompiler { 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 40643f6e7b..36ee3b4a95 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 @@ -131,7 +131,7 @@ public class TestSpecificCompiler { boolean compilesWithoutError = cTask.call(); assertTrue(compilesWithoutError); if (!ignoreWarnings) { - assertEquals(0, warnings.size(), "Warnings produced when compiling generated code with -Xlint:all"); + assertEquals(List.of(), warnings, "Warnings produced when compiling generated code with -Xlint:all"); } } diff --git a/lang/java/tools/src/test/compiler/output-string/Position.java b/lang/java/tools/src/test/compiler/output-string/Position.java index a4504bbc4c..120f620941 100644 --- a/lang/java/tools/src/test/compiler/output-string/Position.java +++ b/lang/java/tools/src/test/compiler/output-string/Position.java @@ -1,4 +1,4 @@ -/** +/* * Autogenerated by Avro * * DO NOT EDIT DIRECTLY diff --git a/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/FieldTest.java b/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/FieldTest.java index 8e567f6de7..6e69cd3df4 100644 --- a/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/FieldTest.java +++ b/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/FieldTest.java @@ -1,4 +1,4 @@ -/** +/* * Autogenerated by Avro * * DO NOT EDIT DIRECTLY 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 1fa56857f8..7a352b703d 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 diff --git a/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/JetBrainsNullSafeAnnotationsFieldsTest.java b/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/JetBrainsNullSafeAnnotationsFieldsTest.java index 44db6edcae..5e898c8847 100644 --- a/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/JetBrainsNullSafeAnnotationsFieldsTest.java +++ b/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/JetBrainsNullSafeAnnotationsFieldsTest.java @@ -1,4 +1,4 @@ -/** +/* * Autogenerated by Avro * * DO NOT EDIT DIRECTLY diff --git a/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/Player.java b/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/Player.java index c472f58956..1821e41cbe 100644 --- a/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/Player.java +++ b/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/Player.java @@ -1,4 +1,4 @@ -/** +/* * Autogenerated by Avro * * DO NOT EDIT DIRECTLY diff --git a/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/Position.java b/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/Position.java index 3e6abc502a..b662bcac5a 100644 --- a/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/Position.java +++ b/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/Position.java @@ -1,4 +1,4 @@ -/** +/* * Autogenerated by Avro * * DO NOT EDIT DIRECTLY diff --git a/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/Proto.java b/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/Proto.java index 20463106a1..def7bca42b 100644 --- a/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/Proto.java +++ b/lang/java/tools/src/test/compiler/output-string/avro/examples/baseball/Proto.java @@ -1,4 +1,4 @@ -/** +/* * Autogenerated by Avro * * DO NOT EDIT DIRECTLY @@ -24,4 +24,4 @@ public interface Proto { */ void bar(org.apache.avro.ipc.Callback<java.lang.Void> 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 0d5fd94ea7..d8c5361848 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 4f6914dcff..6e4cea44f8 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 10453c307e..ece62933a8 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 aa55db6007..60c87c2953 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 3fbfd1cfe8..e1f6f91c84 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 3e6abc502a..b662bcac5a 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
