From 2d108188353490ad79e6153080bf7f1f442420af Mon Sep 17 00:00:00 2001 From: Kousuke Saruta Date: Fri, 19 Jan 2024 16:21:31 +0900 Subject: [PATCH] AVRO-3880: [Java][Build] Upgrade maven-antrun-plugin to 3.1.0 (#2542) * AVRO-3880: [Java][Build] Upgrade maven-antrun-plugin to 3.1.0 * Apply spotless --------- Co-authored-by: Martin Grigorov --- lang/java/pom.xml | 6 ++ lang/java/protobuf/pom.xml | 4 +- .../avro/protobuf/multiplefiles/Foo.java | 43 ++++++++++-- .../apache/avro/protobuf/multiplefiles/M.java | 25 +++++++ .../org/apache/avro/protobuf/noopt/Test.java | 68 +++++++++++++++++-- 5 files changed, 132 insertions(+), 14 deletions(-) diff --git a/lang/java/pom.xml b/lang/java/pom.xml index 38a3f23558b..dc4c8546838 100644 --- a/lang/java/pom.xml +++ b/lang/java/pom.xml @@ -68,6 +68,7 @@ 3.1.0 3.0.3 7.0.13 + 3.1.0 @@ -435,6 +436,11 @@ + + org.apache.maven.plugins + maven-antrun-plugin + ${maven-antrun-plugin.version} + diff --git a/lang/java/protobuf/pom.xml b/lang/java/protobuf/pom.xml index 0a04f8f96c6..aa657b7a0ee 100644 --- a/lang/java/protobuf/pom.xml +++ b/lang/java/protobuf/pom.xml @@ -55,7 +55,7 @@ generate-test-sources - + @@ -65,7 +65,7 @@ - + run diff --git a/lang/java/protobuf/src/test/java/org/apache/avro/protobuf/multiplefiles/Foo.java b/lang/java/protobuf/src/test/java/org/apache/avro/protobuf/multiplefiles/Foo.java index 58401507178..b7289422987 100644 --- a/lang/java/protobuf/src/test/java/org/apache/avro/protobuf/multiplefiles/Foo.java +++ b/lang/java/protobuf/src/test/java/org/apache/avro/protobuf/multiplefiles/Foo.java @@ -59,12 +59,6 @@ private Foo(com.google.protobuf.CodedInputStream input, com.google.protobuf.Exte case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 8: { bitField0_ |= 0x00000001; int32_ = input.readInt32(); @@ -143,6 +137,7 @@ private Foo(com.google.protobuf.CodedInputStream input, com.google.protobuf.Exte } case 128: { int rawValue = input.readEnum(); + @SuppressWarnings("deprecation") org.apache.avro.protobuf.multiplefiles.A value = org.apache.avro.protobuf.multiplefiles.A.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(16, rawValue); @@ -188,6 +183,7 @@ private Foo(com.google.protobuf.CodedInputStream input, com.google.protobuf.Exte } case 152: { int rawValue = input.readEnum(); + @SuppressWarnings("deprecation") org.apache.avro.protobuf.multiplefiles.A value = org.apache.avro.protobuf.multiplefiles.A.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(19, rawValue); @@ -205,6 +201,7 @@ private Foo(com.google.protobuf.CodedInputStream input, com.google.protobuf.Exte int oldLimit = input.pushLimit(length); while (input.getBytesUntilLimit() > 0) { int rawValue = input.readEnum(); + @SuppressWarnings("deprecation") org.apache.avro.protobuf.multiplefiles.A value = org.apache.avro.protobuf.multiplefiles.A.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(19, rawValue); @@ -240,6 +237,12 @@ private Foo(com.google.protobuf.CodedInputStream input, com.google.protobuf.Exte bitField0_ |= 0x00020000; break; } + default: { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -265,6 +268,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.apache.avro.protobuf.multiplefiles.TestMultipleFiles.internal_static_org_apache_avro_protobuf_multiplefiles_Foo_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.apache.avro.protobuf.multiplefiles.TestMultipleFiles.internal_static_org_apache_avro_protobuf_multiplefiles_Foo_fieldAccessorTable .ensureFieldAccessorsInitialized(org.apache.avro.protobuf.multiplefiles.Foo.class, @@ -573,6 +577,7 @@ public boolean hasEnum() { * optional .org.apache.avro.protobuf.multiplefiles.A enum = 16 [default = Z]; */ public org.apache.avro.protobuf.multiplefiles.A getEnum() { + @SuppressWarnings("deprecation") org.apache.avro.protobuf.multiplefiles.A result = org.apache.avro.protobuf.multiplefiles.A.valueOf(enum_); return result == null ? org.apache.avro.protobuf.multiplefiles.A.Z : result; } @@ -655,6 +660,7 @@ public org.apache.avro.protobuf.multiplefiles.FooOrBuilder getFooArrayOrBuilder( private java.util.List syms_; private static final com.google.protobuf.Internal.ListAdapter.Converter syms_converter_ = new com.google.protobuf.Internal.ListAdapter.Converter() { public org.apache.avro.protobuf.multiplefiles.A convert(java.lang.Integer from) { + @SuppressWarnings("deprecation") org.apache.avro.protobuf.multiplefiles.A result = org.apache.avro.protobuf.multiplefiles.A.valueOf(from); return result == null ? org.apache.avro.protobuf.multiplefiles.A.X : result; } @@ -756,6 +762,7 @@ public com.google.protobuf.TimestampOrBuilder getTimestampOrBuilder() { private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) @@ -783,6 +790,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) == 0x00000001)) { output.writeInt32(1, int32_); @@ -850,6 +858,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) @@ -1185,6 +1194,7 @@ public static org.apache.avro.protobuf.multiplefiles.Foo parseFrom(com.google.pr return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } @@ -1197,6 +1207,7 @@ public static Builder newBuilder(org.apache.avro.protobuf.multiplefiles.Foo prot return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } @@ -1217,6 +1228,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.apache.avro.protobuf.multiplefiles.TestMultipleFiles.internal_static_org_apache_avro_protobuf_multiplefiles_Foo_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.apache.avro.protobuf.multiplefiles.TestMultipleFiles.internal_static_org_apache_avro_protobuf_multiplefiles_Foo_fieldAccessorTable .ensureFieldAccessorsInitialized(org.apache.avro.protobuf.multiplefiles.Foo.class, @@ -1241,6 +1253,7 @@ private void maybeForceBuilderInitialization() { } } + @java.lang.Override public Builder clear() { super.clear(); int32_ = 0; @@ -1300,14 +1313,17 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.apache.avro.protobuf.multiplefiles.TestMultipleFiles.internal_static_org_apache_avro_protobuf_multiplefiles_Foo_descriptor; } + @java.lang.Override public org.apache.avro.protobuf.multiplefiles.Foo getDefaultInstanceForType() { return org.apache.avro.protobuf.multiplefiles.Foo.getDefaultInstance(); } + @java.lang.Override public org.apache.avro.protobuf.multiplefiles.Foo build() { org.apache.avro.protobuf.multiplefiles.Foo result = buildPartial(); if (!result.isInitialized()) { @@ -1316,6 +1332,7 @@ public org.apache.avro.protobuf.multiplefiles.Foo build() { return result; } + @java.lang.Override public org.apache.avro.protobuf.multiplefiles.Foo buildPartial() { org.apache.avro.protobuf.multiplefiles.Foo result = new org.apache.avro.protobuf.multiplefiles.Foo(this); int from_bitField0_ = bitField0_; @@ -1424,31 +1441,38 @@ public org.apache.avro.protobuf.multiplefiles.Foo buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField(com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField(com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.apache.avro.protobuf.multiplefiles.Foo) { return mergeFrom((org.apache.avro.protobuf.multiplefiles.Foo) other); @@ -1567,6 +1591,7 @@ public Builder mergeFrom(org.apache.avro.protobuf.multiplefiles.Foo other) { return this; } + @java.lang.Override public final boolean isInitialized() { if (!hasInt32()) { return false; @@ -1584,6 +1609,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { org.apache.avro.protobuf.multiplefiles.Foo parsedMessage = null; @@ -2214,6 +2240,7 @@ public boolean hasEnum() { * optional .org.apache.avro.protobuf.multiplefiles.A enum = 16 [default = Z]; */ public org.apache.avro.protobuf.multiplefiles.A getEnum() { + @SuppressWarnings("deprecation") org.apache.avro.protobuf.multiplefiles.A result = org.apache.avro.protobuf.multiplefiles.A.valueOf(enum_); return result == null ? org.apache.avro.protobuf.multiplefiles.A.Z : result; } @@ -2963,10 +2990,12 @@ private com.google.protobuf.SingleFieldBuilderV3 PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public Foo parsePartialFrom(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -3002,6 +3032,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public org.apache.avro.protobuf.multiplefiles.Foo getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/lang/java/protobuf/src/test/java/org/apache/avro/protobuf/multiplefiles/M.java b/lang/java/protobuf/src/test/java/org/apache/avro/protobuf/multiplefiles/M.java index 4f2ae42f053..13e41158039 100644 --- a/lang/java/protobuf/src/test/java/org/apache/avro/protobuf/multiplefiles/M.java +++ b/lang/java/protobuf/src/test/java/org/apache/avro/protobuf/multiplefiles/M.java @@ -65,6 +65,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.apache.avro.protobuf.multiplefiles.TestMultipleFiles.internal_static_org_apache_avro_protobuf_multiplefiles_M_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.apache.avro.protobuf.multiplefiles.TestMultipleFiles.internal_static_org_apache_avro_protobuf_multiplefiles_M_fieldAccessorTable .ensureFieldAccessorsInitialized(org.apache.avro.protobuf.multiplefiles.M.class, @@ -148,6 +149,7 @@ private N(int value) { private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) @@ -159,10 +161,12 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) @@ -264,6 +268,7 @@ public static org.apache.avro.protobuf.multiplefiles.M parseFrom(com.google.prot return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } @@ -276,6 +281,7 @@ public static Builder newBuilder(org.apache.avro.protobuf.multiplefiles.M protot return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } @@ -300,6 +306,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.apache.avro.protobuf.multiplefiles.TestMultipleFiles.internal_static_org_apache_avro_protobuf_multiplefiles_M_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.apache.avro.protobuf.multiplefiles.TestMultipleFiles.internal_static_org_apache_avro_protobuf_multiplefiles_M_fieldAccessorTable .ensureFieldAccessorsInitialized(org.apache.avro.protobuf.multiplefiles.M.class, @@ -321,19 +328,23 @@ private void maybeForceBuilderInitialization() { } } + @java.lang.Override public Builder clear() { super.clear(); return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.apache.avro.protobuf.multiplefiles.TestMultipleFiles.internal_static_org_apache_avro_protobuf_multiplefiles_M_descriptor; } + @java.lang.Override public org.apache.avro.protobuf.multiplefiles.M getDefaultInstanceForType() { return org.apache.avro.protobuf.multiplefiles.M.getDefaultInstance(); } + @java.lang.Override public org.apache.avro.protobuf.multiplefiles.M build() { org.apache.avro.protobuf.multiplefiles.M result = buildPartial(); if (!result.isInitialized()) { @@ -342,37 +353,45 @@ public org.apache.avro.protobuf.multiplefiles.M build() { return result; } + @java.lang.Override public org.apache.avro.protobuf.multiplefiles.M buildPartial() { org.apache.avro.protobuf.multiplefiles.M result = new org.apache.avro.protobuf.multiplefiles.M(this); onBuilt(); return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField(com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField(com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.apache.avro.protobuf.multiplefiles.M) { return mergeFrom((org.apache.avro.protobuf.multiplefiles.M) other); @@ -390,10 +409,12 @@ public Builder mergeFrom(org.apache.avro.protobuf.multiplefiles.M other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { org.apache.avro.protobuf.multiplefiles.M parsedMessage = null; @@ -410,10 +431,12 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, return this; } + @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); } @@ -433,6 +456,7 @@ public static org.apache.avro.protobuf.multiplefiles.M getDefaultInstance() { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public M parsePartialFrom(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -449,6 +473,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public org.apache.avro.protobuf.multiplefiles.M getDefaultInstanceForType() { return DEFAULT_INSTANCE; } diff --git a/lang/java/protobuf/src/test/java/org/apache/avro/protobuf/noopt/Test.java b/lang/java/protobuf/src/test/java/org/apache/avro/protobuf/noopt/Test.java index 8255719d88e..3483a453ccd 100644 --- a/lang/java/protobuf/src/test/java/org/apache/avro/protobuf/noopt/Test.java +++ b/lang/java/protobuf/src/test/java/org/apache/avro/protobuf/noopt/Test.java @@ -468,12 +468,6 @@ private Foo(com.google.protobuf.CodedInputStream input, com.google.protobuf.Exte case 0: done = true; break; - default: { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } case 8: { bitField0_ |= 0x00000001; int32_ = input.readInt32(); @@ -552,6 +546,7 @@ private Foo(com.google.protobuf.CodedInputStream input, com.google.protobuf.Exte } case 128: { int rawValue = input.readEnum(); + @SuppressWarnings("deprecation") org.apache.avro.protobuf.noopt.Test.A value = org.apache.avro.protobuf.noopt.Test.A.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(16, rawValue); @@ -597,6 +592,7 @@ private Foo(com.google.protobuf.CodedInputStream input, com.google.protobuf.Exte } case 152: { int rawValue = input.readEnum(); + @SuppressWarnings("deprecation") org.apache.avro.protobuf.noopt.Test.A value = org.apache.avro.protobuf.noopt.Test.A.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(19, rawValue); @@ -614,6 +610,7 @@ private Foo(com.google.protobuf.CodedInputStream input, com.google.protobuf.Exte int oldLimit = input.pushLimit(length); while (input.getBytesUntilLimit() > 0) { int rawValue = input.readEnum(); + @SuppressWarnings("deprecation") org.apache.avro.protobuf.noopt.Test.A value = org.apache.avro.protobuf.noopt.Test.A.valueOf(rawValue); if (value == null) { unknownFields.mergeVarintField(19, rawValue); @@ -649,6 +646,12 @@ private Foo(com.google.protobuf.CodedInputStream input, com.google.protobuf.Exte bitField0_ |= 0x00020000; break; } + default: { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -674,6 +677,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.apache.avro.protobuf.noopt.Test.internal_static_org_apache_avro_protobuf_noopt_Foo_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.apache.avro.protobuf.noopt.Test.internal_static_org_apache_avro_protobuf_noopt_Foo_fieldAccessorTable .ensureFieldAccessorsInitialized(org.apache.avro.protobuf.noopt.Test.Foo.class, @@ -982,6 +986,7 @@ public boolean hasEnum() { * optional .org.apache.avro.protobuf.noopt.A enum = 16 [default = Z]; */ public org.apache.avro.protobuf.noopt.Test.A getEnum() { + @SuppressWarnings("deprecation") org.apache.avro.protobuf.noopt.Test.A result = org.apache.avro.protobuf.noopt.Test.A.valueOf(enum_); return result == null ? org.apache.avro.protobuf.noopt.Test.A.Z : result; } @@ -1064,6 +1069,7 @@ public org.apache.avro.protobuf.noopt.Test.FooOrBuilder getFooArrayOrBuilder(int private java.util.List syms_; private static final com.google.protobuf.Internal.ListAdapter.Converter syms_converter_ = new com.google.protobuf.Internal.ListAdapter.Converter() { public org.apache.avro.protobuf.noopt.Test.A convert(java.lang.Integer from) { + @SuppressWarnings("deprecation") org.apache.avro.protobuf.noopt.Test.A result = org.apache.avro.protobuf.noopt.Test.A.valueOf(from); return result == null ? org.apache.avro.protobuf.noopt.Test.A.X : result; } @@ -1165,6 +1171,7 @@ public com.google.protobuf.TimestampOrBuilder getTimestampOrBuilder() { private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) @@ -1192,6 +1199,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (((bitField0_ & 0x00000001) == 0x00000001)) { output.writeInt32(1, int32_); @@ -1259,6 +1267,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) @@ -1594,6 +1603,7 @@ public static org.apache.avro.protobuf.noopt.Test.Foo parseFrom(com.google.proto return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } @@ -1606,6 +1616,7 @@ public static Builder newBuilder(org.apache.avro.protobuf.noopt.Test.Foo prototy return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } @@ -1626,6 +1637,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.apache.avro.protobuf.noopt.Test.internal_static_org_apache_avro_protobuf_noopt_Foo_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.apache.avro.protobuf.noopt.Test.internal_static_org_apache_avro_protobuf_noopt_Foo_fieldAccessorTable .ensureFieldAccessorsInitialized(org.apache.avro.protobuf.noopt.Test.Foo.class, @@ -1650,6 +1662,7 @@ private void maybeForceBuilderInitialization() { } } + @java.lang.Override public Builder clear() { super.clear(); int32_ = 0; @@ -1709,14 +1722,17 @@ public Builder clear() { return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.apache.avro.protobuf.noopt.Test.internal_static_org_apache_avro_protobuf_noopt_Foo_descriptor; } + @java.lang.Override public org.apache.avro.protobuf.noopt.Test.Foo getDefaultInstanceForType() { return org.apache.avro.protobuf.noopt.Test.Foo.getDefaultInstance(); } + @java.lang.Override public org.apache.avro.protobuf.noopt.Test.Foo build() { org.apache.avro.protobuf.noopt.Test.Foo result = buildPartial(); if (!result.isInitialized()) { @@ -1725,6 +1741,7 @@ public org.apache.avro.protobuf.noopt.Test.Foo build() { return result; } + @java.lang.Override public org.apache.avro.protobuf.noopt.Test.Foo buildPartial() { org.apache.avro.protobuf.noopt.Test.Foo result = new org.apache.avro.protobuf.noopt.Test.Foo(this); int from_bitField0_ = bitField0_; @@ -1833,31 +1850,38 @@ public org.apache.avro.protobuf.noopt.Test.Foo buildPartial() { return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField(com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField(com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.apache.avro.protobuf.noopt.Test.Foo) { return mergeFrom((org.apache.avro.protobuf.noopt.Test.Foo) other); @@ -1977,6 +2001,7 @@ public Builder mergeFrom(org.apache.avro.protobuf.noopt.Test.Foo other) { return this; } + @java.lang.Override public final boolean isInitialized() { if (!hasInt32()) { return false; @@ -1994,6 +2019,7 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { org.apache.avro.protobuf.noopt.Test.Foo parsedMessage = null; @@ -2624,6 +2650,7 @@ public boolean hasEnum() { * optional .org.apache.avro.protobuf.noopt.A enum = 16 [default = Z]; */ public org.apache.avro.protobuf.noopt.Test.A getEnum() { + @SuppressWarnings("deprecation") org.apache.avro.protobuf.noopt.Test.A result = org.apache.avro.protobuf.noopt.Test.A.valueOf(enum_); return result == null ? org.apache.avro.protobuf.noopt.Test.A.Z : result; } @@ -3373,10 +3400,12 @@ private com.google.protobuf.SingleFieldBuilderV3 PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public Foo parsePartialFrom(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -3412,6 +3442,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public org.apache.avro.protobuf.noopt.Test.Foo getDefaultInstanceForType() { return DEFAULT_INSTANCE; } @@ -3485,6 +3516,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.apache.avro.protobuf.noopt.Test.internal_static_org_apache_avro_protobuf_noopt_M_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.apache.avro.protobuf.noopt.Test.internal_static_org_apache_avro_protobuf_noopt_M_fieldAccessorTable .ensureFieldAccessorsInitialized(org.apache.avro.protobuf.noopt.Test.M.class, @@ -3568,6 +3600,7 @@ private N(int value) { private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; if (isInitialized == 1) @@ -3579,10 +3612,12 @@ public final boolean isInitialized() { return true; } + @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { unknownFields.writeTo(output); } + @java.lang.Override public int getSerializedSize() { int size = memoizedSize; if (size != -1) @@ -3684,6 +3719,7 @@ public static org.apache.avro.protobuf.noopt.Test.M parseFrom(com.google.protobu return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input, extensionRegistry); } + @java.lang.Override public Builder newBuilderForType() { return newBuilder(); } @@ -3696,6 +3732,7 @@ public static Builder newBuilder(org.apache.avro.protobuf.noopt.Test.M prototype return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } @@ -3720,6 +3757,7 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.apache.avro.protobuf.noopt.Test.internal_static_org_apache_avro_protobuf_noopt_M_descriptor; } + @java.lang.Override protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.apache.avro.protobuf.noopt.Test.internal_static_org_apache_avro_protobuf_noopt_M_fieldAccessorTable .ensureFieldAccessorsInitialized(org.apache.avro.protobuf.noopt.Test.M.class, @@ -3741,19 +3779,23 @@ private void maybeForceBuilderInitialization() { } } + @java.lang.Override public Builder clear() { super.clear(); return this; } + @java.lang.Override public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.apache.avro.protobuf.noopt.Test.internal_static_org_apache_avro_protobuf_noopt_M_descriptor; } + @java.lang.Override public org.apache.avro.protobuf.noopt.Test.M getDefaultInstanceForType() { return org.apache.avro.protobuf.noopt.Test.M.getDefaultInstance(); } + @java.lang.Override public org.apache.avro.protobuf.noopt.Test.M build() { org.apache.avro.protobuf.noopt.Test.M result = buildPartial(); if (!result.isInitialized()) { @@ -3762,37 +3804,45 @@ public org.apache.avro.protobuf.noopt.Test.M build() { return result; } + @java.lang.Override public org.apache.avro.protobuf.noopt.Test.M buildPartial() { org.apache.avro.protobuf.noopt.Test.M result = new org.apache.avro.protobuf.noopt.Test.M(this); onBuilt(); return result; } + @java.lang.Override public Builder clone() { return (Builder) super.clone(); } + @java.lang.Override public Builder setField(com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.setField(field, value); } + @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { return (Builder) super.clearField(field); } + @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { return (Builder) super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField(com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { return (Builder) super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField(com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return (Builder) super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.apache.avro.protobuf.noopt.Test.M) { return mergeFrom((org.apache.avro.protobuf.noopt.Test.M) other); @@ -3810,10 +3860,12 @@ public Builder mergeFrom(org.apache.avro.protobuf.noopt.Test.M other) { return this; } + @java.lang.Override public final boolean isInitialized() { return true; } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { org.apache.avro.protobuf.noopt.Test.M parsedMessage = null; @@ -3830,10 +3882,12 @@ public Builder mergeFrom(com.google.protobuf.CodedInputStream input, return this; } + @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { return super.setUnknownFields(unknownFields); } + @java.lang.Override public final Builder mergeUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { return super.mergeUnknownFields(unknownFields); } @@ -3853,6 +3907,7 @@ public static org.apache.avro.protobuf.noopt.Test.M getDefaultInstance() { @java.lang.Deprecated public static final com.google.protobuf.Parser PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override public M parsePartialFrom(com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { @@ -3869,6 +3924,7 @@ public com.google.protobuf.Parser getParserForType() { return PARSER; } + @java.lang.Override public org.apache.avro.protobuf.noopt.Test.M getDefaultInstanceForType() { return DEFAULT_INSTANCE; }