diff --git a/client-encryption/src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetBytesProto.java b/client-encryption/src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetBytesProto.java index 70529b36a31..31b3a16403b 100644 --- a/client-encryption/src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetBytesProto.java +++ b/client-encryption/src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetBytesProto.java @@ -1,18 +1,19 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: WidgetBytes.proto -// Protobuf Java Version: 4.29.3 +// Protobuf Java Version: 4.31.1 package io.confluent.kafka.schemaregistry.rules; +@com.google.protobuf.Generated public final class WidgetBytesProto { private WidgetBytesProto() {} static { com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", WidgetBytesProto.class.getName()); } @@ -100,8 +101,8 @@ public static final class WidgetBytes extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", WidgetBytes.class.getName()); } @@ -559,7 +560,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(io.confluent.kafka.schemaregistry.rules.WidgetBytesProto.WidgetBytes other) { if (other == io.confluent.kafka.schemaregistry.rules.WidgetBytesProto.WidgetBytes.getDefaultInstance()) return this; - if (other.getName() != com.google.protobuf.ByteString.EMPTY) { + if (!other.getName().isEmpty()) { setName(other.getName()); } if (!other.ssn_.isEmpty()) { @@ -593,7 +594,7 @@ public Builder mergeFrom(io.confluent.kafka.schemaregistry.rules.WidgetBytesProt bitField0_ = (bitField0_ & ~0x00000004); piiArrayBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getPiiArrayFieldBuilder() : null; + internalGetPiiArrayFieldBuilder() : null; } else { piiArrayBuilder_.addAllMessages(other.piiArray_); } @@ -978,7 +979,7 @@ public Builder removePiiArray(int index) { */ public io.confluent.kafka.schemaregistry.rules.WidgetBytesProto.PiiBytes.Builder getPiiArrayBuilder( int index) { - return getPiiArrayFieldBuilder().getBuilder(index); + return internalGetPiiArrayFieldBuilder().getBuilder(index); } /** * repeated .io.confluent.kafka.schemaregistry.rules.PiiBytes pii_array = 3; @@ -1005,7 +1006,7 @@ public io.confluent.kafka.schemaregistry.rules.WidgetBytesProto.PiiBytesOrBuilde * repeated .io.confluent.kafka.schemaregistry.rules.PiiBytes pii_array = 3; */ public io.confluent.kafka.schemaregistry.rules.WidgetBytesProto.PiiBytes.Builder addPiiArrayBuilder() { - return getPiiArrayFieldBuilder().addBuilder( + return internalGetPiiArrayFieldBuilder().addBuilder( io.confluent.kafka.schemaregistry.rules.WidgetBytesProto.PiiBytes.getDefaultInstance()); } /** @@ -1013,7 +1014,7 @@ public io.confluent.kafka.schemaregistry.rules.WidgetBytesProto.PiiBytes.Builder */ public io.confluent.kafka.schemaregistry.rules.WidgetBytesProto.PiiBytes.Builder addPiiArrayBuilder( int index) { - return getPiiArrayFieldBuilder().addBuilder( + return internalGetPiiArrayFieldBuilder().addBuilder( index, io.confluent.kafka.schemaregistry.rules.WidgetBytesProto.PiiBytes.getDefaultInstance()); } /** @@ -1021,11 +1022,11 @@ public io.confluent.kafka.schemaregistry.rules.WidgetBytesProto.PiiBytes.Builder */ public java.util.List getPiiArrayBuilderList() { - return getPiiArrayFieldBuilder().getBuilderList(); + return internalGetPiiArrayFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< io.confluent.kafka.schemaregistry.rules.WidgetBytesProto.PiiBytes, io.confluent.kafka.schemaregistry.rules.WidgetBytesProto.PiiBytes.Builder, io.confluent.kafka.schemaregistry.rules.WidgetBytesProto.PiiBytesOrBuilder> - getPiiArrayFieldBuilder() { + internalGetPiiArrayFieldBuilder() { if (piiArrayBuilder_ == null) { piiArrayBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< io.confluent.kafka.schemaregistry.rules.WidgetBytesProto.PiiBytes, io.confluent.kafka.schemaregistry.rules.WidgetBytesProto.PiiBytes.Builder, io.confluent.kafka.schemaregistry.rules.WidgetBytesProto.PiiBytesOrBuilder>( @@ -1175,8 +1176,8 @@ public static final class PiiBytes extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", PiiBytes.class.getName()); } @@ -1454,7 +1455,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(io.confluent.kafka.schemaregistry.rules.WidgetBytesProto.PiiBytes other) { if (other == io.confluent.kafka.schemaregistry.rules.WidgetBytesProto.PiiBytes.getDefaultInstance()) return this; - if (other.getPii() != com.google.protobuf.ByteString.EMPTY) { + if (!other.getPii().isEmpty()) { setPii(other.getPii()); } this.mergeUnknownFields(other.getUnknownFields()); diff --git a/client-encryption/src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetProto.java b/client-encryption/src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetProto.java index f2126a9990d..03e121797e5 100644 --- a/client-encryption/src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetProto.java +++ b/client-encryption/src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetProto.java @@ -1,18 +1,19 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: Widget.proto -// Protobuf Java Version: 4.29.3 +// Protobuf Java Version: 4.31.1 package io.confluent.kafka.schemaregistry.rules; +@com.google.protobuf.Generated public final class WidgetProto { private WidgetProto() {} static { com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", WidgetProto.class.getName()); } @@ -148,8 +149,8 @@ public static final class Widget extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", Widget.class.getName()); } @@ -817,7 +818,7 @@ public Builder mergeFrom(io.confluent.kafka.schemaregistry.rules.WidgetProto.Wid bitField0_ = (bitField0_ & ~0x00000004); piiArrayBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getPiiArrayFieldBuilder() : null; + internalGetPiiArrayFieldBuilder() : null; } else { piiArrayBuilder_.addAllMessages(other.piiArray_); } @@ -1281,7 +1282,7 @@ public Builder removePiiArray(int index) { */ public io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii.Builder getPiiArrayBuilder( int index) { - return getPiiArrayFieldBuilder().getBuilder(index); + return internalGetPiiArrayFieldBuilder().getBuilder(index); } /** * repeated .io.confluent.kafka.schemaregistry.rules.Pii pii_array = 3; @@ -1308,7 +1309,7 @@ public io.confluent.kafka.schemaregistry.rules.WidgetProto.PiiOrBuilder getPiiAr * repeated .io.confluent.kafka.schemaregistry.rules.Pii pii_array = 3; */ public io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii.Builder addPiiArrayBuilder() { - return getPiiArrayFieldBuilder().addBuilder( + return internalGetPiiArrayFieldBuilder().addBuilder( io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii.getDefaultInstance()); } /** @@ -1316,7 +1317,7 @@ public io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii.Builder addPiiArr */ public io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii.Builder addPiiArrayBuilder( int index) { - return getPiiArrayFieldBuilder().addBuilder( + return internalGetPiiArrayFieldBuilder().addBuilder( index, io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii.getDefaultInstance()); } /** @@ -1324,11 +1325,11 @@ public io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii.Builder addPiiArr */ public java.util.List getPiiArrayBuilderList() { - return getPiiArrayFieldBuilder().getBuilderList(); + return internalGetPiiArrayFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii, io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii.Builder, io.confluent.kafka.schemaregistry.rules.WidgetProto.PiiOrBuilder> - getPiiArrayFieldBuilder() { + internalGetPiiArrayFieldBuilder() { if (piiArrayBuilder_ == null) { piiArrayBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii, io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii.Builder, io.confluent.kafka.schemaregistry.rules.WidgetProto.PiiOrBuilder>( @@ -1639,8 +1640,8 @@ public static final class Pii extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", Pii.class.getName()); } diff --git a/client/src/main/java/io/confluent/kafka/schemaregistry/client/CachedSchemaRegistryClient.java b/client/src/main/java/io/confluent/kafka/schemaregistry/client/CachedSchemaRegistryClient.java index c4276ec3e76..652a69c38f5 100644 --- a/client/src/main/java/io/confluent/kafka/schemaregistry/client/CachedSchemaRegistryClient.java +++ b/client/src/main/java/io/confluent/kafka/schemaregistry/client/CachedSchemaRegistryClient.java @@ -22,6 +22,7 @@ import com.google.common.cache.CacheLoader; import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableMap; +import io.confluent.kafka.schemaregistry.client.rest.entities.SchemaRegistryServerVersion; import io.confluent.kafka.schemaregistry.client.rest.entities.requests.RegisterSchemaRequest; import io.confluent.kafka.schemaregistry.client.rest.entities.requests.RegisterSchemaResponse; import io.confluent.kafka.schemaregistry.utils.QualifiedSubject; @@ -990,6 +991,12 @@ public SchemaRegistryDeployment getSchemaRegistryDeployment() return restService.getSchemaRegistryDeployment(); } + @Override + public SchemaRegistryServerVersion getSchemaRegistryServerVersion() + throws IOException, RestClientException { + return restService.getSchemaRegistryServerVersion(); + } + @Override public Collection getAllSubjects() throws IOException, RestClientException { return restService.getAllSubjects(); diff --git a/client/src/main/java/io/confluent/kafka/schemaregistry/client/SchemaRegistryClient.java b/client/src/main/java/io/confluent/kafka/schemaregistry/client/SchemaRegistryClient.java index b7e62c5229b..43b6b258783 100644 --- a/client/src/main/java/io/confluent/kafka/schemaregistry/client/SchemaRegistryClient.java +++ b/client/src/main/java/io/confluent/kafka/schemaregistry/client/SchemaRegistryClient.java @@ -23,6 +23,7 @@ import io.confluent.kafka.schemaregistry.client.rest.entities.Metadata; import io.confluent.kafka.schemaregistry.client.rest.entities.RuleSet; import io.confluent.kafka.schemaregistry.client.rest.entities.SchemaRegistryDeployment; +import io.confluent.kafka.schemaregistry.client.rest.entities.SchemaRegistryServerVersion; import io.confluent.kafka.schemaregistry.client.rest.entities.requests.RegisterSchemaResponse; import java.io.Closeable; import java.io.IOException; @@ -295,6 +296,11 @@ default SchemaRegistryDeployment getSchemaRegistryDeployment() throw new UnsupportedOperationException(); } + default SchemaRegistryServerVersion getSchemaRegistryServerVersion() + throws IOException, RestClientException { + throw new UnsupportedOperationException(); + } + public Collection getAllSubjects() throws IOException, RestClientException; default Collection getAllSubjects(boolean lookupDeletedSubject) throws IOException, diff --git a/client/src/test/java/io/confluent/kafka/schemaregistry/client/CachedSchemaRegistryClientTest.java b/client/src/test/java/io/confluent/kafka/schemaregistry/client/CachedSchemaRegistryClientTest.java index d65062db8eb..562fc20190b 100644 --- a/client/src/test/java/io/confluent/kafka/schemaregistry/client/CachedSchemaRegistryClientTest.java +++ b/client/src/test/java/io/confluent/kafka/schemaregistry/client/CachedSchemaRegistryClientTest.java @@ -22,6 +22,9 @@ import io.confluent.kafka.schemaregistry.client.rest.entities.RuleSet; import io.confluent.kafka.schemaregistry.client.rest.entities.requests.RegisterSchemaRequest; import io.confluent.kafka.schemaregistry.client.rest.entities.requests.RegisterSchemaResponse; +import io.confluent.kafka.schemaregistry.client.rest.entities.SchemaRegistryDeployment; +import io.confluent.kafka.schemaregistry.client.rest.entities.SchemaRegistryServerVersion; +import java.util.ArrayList; import org.junit.Before; import org.junit.Test; @@ -888,6 +891,44 @@ public void testMissingSchemaCache() throws Exception { client.getId(SUBJECT_0, AVRO_SCHEMA_0); } + @Test + public void testGetSchemaRegistryDeployment() throws Exception { + List deploymentAttributes = new ArrayList<>(Collections.singleton("deploymentScope:opensource")); + SchemaRegistryDeployment expectedDeployment = new SchemaRegistryDeployment(deploymentAttributes); + + expect(restService.getSchemaRegistryDeployment()) + .andReturn(expectedDeployment); + + replay(restService); + + SchemaRegistryDeployment deployment = client.getSchemaRegistryDeployment(); + + assertNotNull(deployment); + assertEquals(expectedDeployment.getAttributes(), deployment.getAttributes()); + + verify(restService); + } + + @Test + public void testGetSchemaRegistryServerVersion() throws Exception { + String version = "7.5.0"; + String commitId = "abc123def456"; + SchemaRegistryServerVersion expectedVersion = new SchemaRegistryServerVersion(version, commitId); + + expect(restService.getSchemaRegistryServerVersion()) + .andReturn(expectedVersion); + + replay(restService); + + SchemaRegistryServerVersion serverVersion = client.getSchemaRegistryServerVersion(); + + assertNotNull(serverVersion); + assertEquals(version, serverVersion.getVersion()); + assertEquals(commitId, serverVersion.getCommitId()); + + verify(restService); + } + private static AvroSchema avroSchema(final int i) { return new AvroSchema(avroSchemaString(i)); diff --git a/core/src/main/java/io/confluent/kafka/schemaregistry/rest/client/LocalSchemaRegistryClient.java b/core/src/main/java/io/confluent/kafka/schemaregistry/rest/client/LocalSchemaRegistryClient.java index da081e19e30..2674b550df0 100644 --- a/core/src/main/java/io/confluent/kafka/schemaregistry/rest/client/LocalSchemaRegistryClient.java +++ b/core/src/main/java/io/confluent/kafka/schemaregistry/rest/client/LocalSchemaRegistryClient.java @@ -29,6 +29,7 @@ import io.confluent.kafka.schemaregistry.client.rest.entities.Schema; import io.confluent.kafka.schemaregistry.client.rest.entities.SchemaReference; import io.confluent.kafka.schemaregistry.client.rest.entities.SchemaRegistryDeployment; +import io.confluent.kafka.schemaregistry.client.rest.entities.SchemaRegistryServerVersion; import io.confluent.kafka.schemaregistry.client.rest.entities.SchemaString; import io.confluent.kafka.schemaregistry.client.rest.entities.ExtendedSchema; import io.confluent.kafka.schemaregistry.client.rest.entities.SubjectVersion; @@ -52,6 +53,7 @@ import io.confluent.kafka.schemaregistry.rest.VersionId; import io.confluent.kafka.schemaregistry.rest.exceptions.Errors; import io.confluent.kafka.schemaregistry.rest.exceptions.RestInvalidCompatibilityException; +import io.confluent.kafka.schemaregistry.utils.AppInfoParser; import io.confluent.kafka.schemaregistry.utils.Props; import io.confluent.kafka.schemaregistry.rest.exceptions.RestInvalidModeException; import io.confluent.kafka.schemaregistry.storage.KafkaSchemaRegistry; @@ -692,6 +694,12 @@ public SchemaRegistryDeployment getSchemaRegistryDeployment() return Props.getSchemaRegistryDeployment(schemaRegistry.properties()); } + @Override + public SchemaRegistryServerVersion getSchemaRegistryServerVersion() + throws IOException, RestClientException { + return new SchemaRegistryServerVersion(AppInfoParser.getVersion(), AppInfoParser.getCommitId()); + } + @Override public void reset() { } diff --git a/core/src/main/java/io/confluent/kafka/schemaregistry/utils/Props.java b/core/src/main/java/io/confluent/kafka/schemaregistry/utils/Props.java index e71315b2a9f..f78081c4bbc 100644 --- a/core/src/main/java/io/confluent/kafka/schemaregistry/utils/Props.java +++ b/core/src/main/java/io/confluent/kafka/schemaregistry/utils/Props.java @@ -36,7 +36,7 @@ public static SchemaRegistryDeployment getSchemaRegistryDeployment(Map srDeploymentList = (List) srDeployment; // Validate and process each element List processedList = srDeploymentList.stream().map( - item -> item.toString().trim().toLowerCase() + item -> item.toString().trim() ).collect(Collectors.toList()); return new SchemaRegistryDeployment(processedList); } else { diff --git a/core/src/test/java/io/confluent/kafka/schemaregistry/rest/client/LocalSchemaRegistryClientTest.java b/core/src/test/java/io/confluent/kafka/schemaregistry/rest/client/LocalSchemaRegistryClientTest.java index 24c7631a9ce..0bc43f58d7e 100644 --- a/core/src/test/java/io/confluent/kafka/schemaregistry/rest/client/LocalSchemaRegistryClientTest.java +++ b/core/src/test/java/io/confluent/kafka/schemaregistry/rest/client/LocalSchemaRegistryClientTest.java @@ -23,13 +23,15 @@ import io.confluent.kafka.schemaregistry.client.rest.entities.Config; import io.confluent.kafka.schemaregistry.client.rest.entities.Metadata; import io.confluent.kafka.schemaregistry.client.rest.entities.Schema; -import io.confluent.kafka.schemaregistry.client.rest.exceptions.RestClientException; +import io.confluent.kafka.schemaregistry.client.rest.entities.SchemaRegistryDeployment; +import io.confluent.kafka.schemaregistry.client.rest.entities.SchemaRegistryServerVersion; import io.confluent.kafka.schemaregistry.rest.SchemaRegistryConfig; import io.confluent.kafka.schemaregistry.rest.exceptions.RestInvalidSchemaException; import io.confluent.kafka.schemaregistry.rest.exceptions.RestOperationNotPermittedException; import io.confluent.kafka.schemaregistry.storage.KafkaSchemaRegistry; import io.confluent.kafka.schemaregistry.storage.StoreUtils; import io.confluent.kafka.schemaregistry.storage.serialization.SchemaRegistrySerializer; +import io.confluent.kafka.schemaregistry.utils.Props; import java.io.IOException; import java.util.*; @@ -214,4 +216,27 @@ public void testGetByVersion() throws Exception { Schema s2 = client.getByVersion(SUBJECT2, 1, false); assertEquals(id2, s2.getId().intValue()); } + + @Test + public void testGetSchemaRegistryDeployment() throws Exception { + Map props = new HashMap<>(); + List deploymentAttributes = new ArrayList(Collections.singleton("deploymentScope:opensource")); + props.put(Props.PROPERTY_SCHEMA_REGISTRY_DEPLOYMENT_ATTRIBUTES, deploymentAttributes); + + SchemaRegistryDeployment deployment = client.getSchemaRegistryDeployment(); + + assertNotNull(deployment); + assertEquals(deployment.getAttributes(), + new ArrayList(Collections.singleton("deploymentScope:opensource")) + ); + } + + @Test + public void testGetSchemaRegistryServerVersion() throws Exception { + SchemaRegistryServerVersion version = client.getSchemaRegistryServerVersion(); + + assertNotNull(version); + assertNotNull(version.getVersion()); + assertNotNull(version.getCommitId()); + } } diff --git a/core/src/test/java/io/confluent/kafka/schemaregistry/utils/PropsTest.java b/core/src/test/java/io/confluent/kafka/schemaregistry/utils/PropsTest.java index 155b85a9d1d..f06e4694361 100644 --- a/core/src/test/java/io/confluent/kafka/schemaregistry/utils/PropsTest.java +++ b/core/src/test/java/io/confluent/kafka/schemaregistry/utils/PropsTest.java @@ -182,7 +182,7 @@ public void testGetSchemaRegistryDeploymentWithMixedCaseStrings() { SchemaRegistryDeployment result = Props.getSchemaRegistryDeployment(props); assertNotNull("Should return SchemaRegistryDeployment for mixed case strings", result); - List expected = Arrays.asList("confluent", "enterprise", "opensource"); + List expected = Arrays.asList("CONFLUENT", "Enterprise", "opensource"); assertEquals("Should convert to lowercase", expected, result.getAttributes()); } @@ -223,14 +223,14 @@ public void testGetSchemaRegistryDeploymentWithComplexObjects() { } @Test - public void testGetSchemaRegistryDeploymentTrimsAndLowercase() { + public void testGetSchemaRegistryDeploymentTrims() { Map props = new HashMap<>(); List attributes = Arrays.asList(" CONFLUENT ", "Enterprise ", " opensource"); props.put(Props.PROPERTY_SCHEMA_REGISTRY_DEPLOYMENT_ATTRIBUTES, attributes); SchemaRegistryDeployment result = Props.getSchemaRegistryDeployment(props); assertNotNull("Should return SchemaRegistryDeployment", result); - List expected = Arrays.asList("confluent", "enterprise", "opensource"); + List expected = Arrays.asList("CONFLUENT", "Enterprise", "opensource"); assertEquals("Should trim whitespace and convert to lowercase", expected, result.getAttributes()); } } diff --git a/core/src/test/java/io/confluent/kafka/serializers/protobuf/test/Ref.java b/core/src/test/java/io/confluent/kafka/serializers/protobuf/test/Ref.java index 6998907afcf..d1febb37f10 100644 --- a/core/src/test/java/io/confluent/kafka/serializers/protobuf/test/Ref.java +++ b/core/src/test/java/io/confluent/kafka/serializers/protobuf/test/Ref.java @@ -1,18 +1,19 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: ref.proto -// Protobuf Java Version: 4.29.3 +// Protobuf Java Version: 4.31.1 package io.confluent.kafka.serializers.protobuf.test; +@com.google.protobuf.Generated public final class Ref { private Ref() {} static { com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", Ref.class.getName()); } @@ -59,8 +60,8 @@ public static final class ReferencedMessage extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", ReferencedMessage.class.getName()); } diff --git a/core/src/test/java/io/confluent/kafka/serializers/protobuf/test/Root.java b/core/src/test/java/io/confluent/kafka/serializers/protobuf/test/Root.java index caf2ca55de2..4c4103c0791 100644 --- a/core/src/test/java/io/confluent/kafka/serializers/protobuf/test/Root.java +++ b/core/src/test/java/io/confluent/kafka/serializers/protobuf/test/Root.java @@ -1,18 +1,19 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: root.proto -// Protobuf Java Version: 4.29.3 +// Protobuf Java Version: 4.31.1 package io.confluent.kafka.serializers.protobuf.test; +@com.google.protobuf.Generated public final class Root { private Root() {} static { com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", Root.class.getName()); } @@ -68,8 +69,8 @@ public static final class ReferrerMessage extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", ReferrerMessage.class.getName()); } @@ -365,7 +366,7 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getRefFieldBuilder(); + internalGetRefFieldBuilder(); } } @java.lang.Override @@ -477,7 +478,7 @@ public Builder mergeFrom( } // case 10 case 18: { input.readMessage( - getRefFieldBuilder().getBuilder(), + internalGetRefFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000002; break; @@ -662,7 +663,7 @@ public Builder clearRef() { public io.confluent.kafka.serializers.protobuf.test.Ref.ReferencedMessage.Builder getRefBuilder() { bitField0_ |= 0x00000002; onChanged(); - return getRefFieldBuilder().getBuilder(); + return internalGetRefFieldBuilder().getBuilder(); } /** * .io.confluent.kafka.serializers.protobuf.test.ReferencedMessage ref = 2 [(.confluent.field_meta) = { ... } @@ -680,7 +681,7 @@ public io.confluent.kafka.serializers.protobuf.test.Ref.ReferencedMessageOrBuild */ private com.google.protobuf.SingleFieldBuilder< io.confluent.kafka.serializers.protobuf.test.Ref.ReferencedMessage, io.confluent.kafka.serializers.protobuf.test.Ref.ReferencedMessage.Builder, io.confluent.kafka.serializers.protobuf.test.Ref.ReferencedMessageOrBuilder> - getRefFieldBuilder() { + internalGetRefFieldBuilder() { if (refBuilder_ == null) { refBuilder_ = new com.google.protobuf.SingleFieldBuilder< io.confluent.kafka.serializers.protobuf.test.Ref.ReferencedMessage, io.confluent.kafka.serializers.protobuf.test.Ref.ReferencedMessage.Builder, io.confluent.kafka.serializers.protobuf.test.Ref.ReferencedMessageOrBuilder>( diff --git a/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/Key.java b/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/Key.java index 5706be59652..626956e4ef2 100644 --- a/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/Key.java +++ b/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/Key.java @@ -1,18 +1,19 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: key.proto -// Protobuf Java Version: 4.29.3 +// Protobuf Java Version: 4.31.1 package io.confluent.connect.protobuf.test; +@com.google.protobuf.Generated public final class Key { private Key() {} static { com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", Key.class.getName()); } @@ -47,8 +48,8 @@ public static final class KeyMessage extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", KeyMessage.class.getName()); } diff --git a/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/KeyValue.java b/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/KeyValue.java index fb3ff87cbb9..f22904fc4fb 100644 --- a/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/KeyValue.java +++ b/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/KeyValue.java @@ -1,18 +1,19 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: keyvalue.proto -// Protobuf Java Version: 4.29.3 +// Protobuf Java Version: 4.31.1 package io.confluent.connect.protobuf.test; +@com.google.protobuf.Generated public final class KeyValue { private KeyValue() {} static { com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", KeyValue.class.getName()); } @@ -59,8 +60,8 @@ public static final class KeyValueMessage extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", KeyValueMessage.class.getName()); } diff --git a/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/KeyValueOptional.java b/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/KeyValueOptional.java index c002795b9a9..6b3bc803e5e 100644 --- a/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/KeyValueOptional.java +++ b/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/KeyValueOptional.java @@ -1,18 +1,19 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: keyvalueoptional.proto -// Protobuf Java Version: 4.29.3 +// Protobuf Java Version: 4.31.1 package io.confluent.connect.protobuf.test; +@com.google.protobuf.Generated public final class KeyValueOptional { private KeyValueOptional() {} static { com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", KeyValueOptional.class.getName()); } @@ -64,8 +65,8 @@ public static final class KeyValueOptionalMessage extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", KeyValueOptionalMessage.class.getName()); } diff --git a/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/KeyValueProto2.java b/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/KeyValueProto2.java index 833c732317e..187c98b13c9 100644 --- a/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/KeyValueProto2.java +++ b/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/KeyValueProto2.java @@ -1,18 +1,19 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: keyvalueproto2.proto -// Protobuf Java Version: 4.29.3 +// Protobuf Java Version: 4.31.1 package io.confluent.connect.protobuf.test; +@com.google.protobuf.Generated public final class KeyValueProto2 { private KeyValueProto2() {} static { com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", KeyValueProto2.class.getName()); } @@ -69,8 +70,8 @@ public static final class KeyValueMessage2 extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", KeyValueMessage2.class.getName()); } diff --git a/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/KeyValueWrapper.java b/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/KeyValueWrapper.java index f49d5d5da59..22c5ca72f4d 100644 --- a/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/KeyValueWrapper.java +++ b/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/KeyValueWrapper.java @@ -1,18 +1,19 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: keyvaluewrapper.proto -// Protobuf Java Version: 4.29.3 +// Protobuf Java Version: 4.31.1 package io.confluent.connect.protobuf.test; +@com.google.protobuf.Generated public final class KeyValueWrapper { private KeyValueWrapper() {} static { com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", KeyValueWrapper.class.getName()); } @@ -77,8 +78,8 @@ public static final class KeyValueWrapperMessage extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", KeyValueWrapperMessage.class.getName()); } @@ -388,8 +389,8 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getWrappedValueFieldBuilder(); - getWrappedValue2FieldBuilder(); + internalGetWrappedValueFieldBuilder(); + internalGetWrappedValue2FieldBuilder(); } } @java.lang.Override @@ -513,14 +514,14 @@ public Builder mergeFrom( } // case 8 case 18: { input.readMessage( - getWrappedValueFieldBuilder().getBuilder(), + internalGetWrappedValueFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000002; break; } // case 18 case 26: { input.readMessage( - getWrappedValue2FieldBuilder().getBuilder(), + internalGetWrappedValue2FieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000004; break; @@ -665,7 +666,7 @@ public Builder clearWrappedValue() { public com.google.protobuf.StringValue.Builder getWrappedValueBuilder() { bitField0_ |= 0x00000002; onChanged(); - return getWrappedValueFieldBuilder().getBuilder(); + return internalGetWrappedValueFieldBuilder().getBuilder(); } /** * .google.protobuf.StringValue wrappedValue = 2; @@ -683,7 +684,7 @@ public com.google.protobuf.StringValueOrBuilder getWrappedValueOrBuilder() { */ private com.google.protobuf.SingleFieldBuilder< com.google.protobuf.StringValue, com.google.protobuf.StringValue.Builder, com.google.protobuf.StringValueOrBuilder> - getWrappedValueFieldBuilder() { + internalGetWrappedValueFieldBuilder() { if (wrappedValueBuilder_ == null) { wrappedValueBuilder_ = new com.google.protobuf.SingleFieldBuilder< com.google.protobuf.StringValue, com.google.protobuf.StringValue.Builder, com.google.protobuf.StringValueOrBuilder>( @@ -786,7 +787,7 @@ public Builder clearWrappedValue2() { public com.google.protobuf.UInt32Value.Builder getWrappedValue2Builder() { bitField0_ |= 0x00000004; onChanged(); - return getWrappedValue2FieldBuilder().getBuilder(); + return internalGetWrappedValue2FieldBuilder().getBuilder(); } /** * .google.protobuf.UInt32Value wrappedValue2 = 3; @@ -804,7 +805,7 @@ public com.google.protobuf.UInt32ValueOrBuilder getWrappedValue2OrBuilder() { */ private com.google.protobuf.SingleFieldBuilder< com.google.protobuf.UInt32Value, com.google.protobuf.UInt32Value.Builder, com.google.protobuf.UInt32ValueOrBuilder> - getWrappedValue2FieldBuilder() { + internalGetWrappedValue2FieldBuilder() { if (wrappedValue2Builder_ == null) { wrappedValue2Builder_ = new com.google.protobuf.SingleFieldBuilder< com.google.protobuf.UInt32Value, com.google.protobuf.UInt32Value.Builder, com.google.protobuf.UInt32ValueOrBuilder>( diff --git a/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/MapReferences.java b/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/MapReferences.java index 79d0266a665..6f0c697c141 100644 --- a/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/MapReferences.java +++ b/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/MapReferences.java @@ -1,18 +1,19 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: mapreferences.proto -// Protobuf Java Version: 4.29.3 +// Protobuf Java Version: 4.31.1 package io.confluent.connect.protobuf.test; +@com.google.protobuf.Generated public final class MapReferences { private MapReferences() {} static { com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", MapReferences.class.getName()); } @@ -119,8 +120,8 @@ public static final class MapReferencesMessage extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", MapReferencesMessage.class.getName()); } @@ -518,10 +519,10 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getMap1FieldBuilder(); - getMap2FieldBuilder(); - getNotAMap1FieldBuilder(); - getNotAMap2FieldBuilder(); + internalGetMap1FieldBuilder(); + internalGetMap2FieldBuilder(); + internalGetNotAMap1FieldBuilder(); + internalGetNotAMap2FieldBuilder(); } } @java.lang.Override @@ -655,7 +656,7 @@ public Builder mergeFrom(io.confluent.connect.protobuf.test.MapReferences.MapRef bitField0_ = (bitField0_ & ~0x00000001); map1Builder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getMap1FieldBuilder() : null; + internalGetMap1FieldBuilder() : null; } else { map1Builder_.addAllMessages(other.map1_); } @@ -681,7 +682,7 @@ public Builder mergeFrom(io.confluent.connect.protobuf.test.MapReferences.MapRef bitField0_ = (bitField0_ & ~0x00000002); map2Builder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getMap2FieldBuilder() : null; + internalGetMap2FieldBuilder() : null; } else { map2Builder_.addAllMessages(other.map2_); } @@ -747,14 +748,14 @@ public Builder mergeFrom( } // case 18 case 26: { input.readMessage( - getNotAMap1FieldBuilder().getBuilder(), + internalGetNotAMap1FieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000004; break; } // case 26 case 34: { input.readMessage( - getNotAMap2FieldBuilder().getBuilder(), + internalGetNotAMap2FieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000008; break; @@ -956,7 +957,7 @@ public Builder removeMap1(int index) { */ public io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry.Builder getMap1Builder( int index) { - return getMap1FieldBuilder().getBuilder(index); + return internalGetMap1FieldBuilder().getBuilder(index); } /** * repeated .AttributeFieldEntry map1 = 1; @@ -983,7 +984,7 @@ public io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntryOrBui * repeated .AttributeFieldEntry map1 = 1; */ public io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry.Builder addMap1Builder() { - return getMap1FieldBuilder().addBuilder( + return internalGetMap1FieldBuilder().addBuilder( io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry.getDefaultInstance()); } /** @@ -991,7 +992,7 @@ public io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry.Buil */ public io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry.Builder addMap1Builder( int index) { - return getMap1FieldBuilder().addBuilder( + return internalGetMap1FieldBuilder().addBuilder( index, io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry.getDefaultInstance()); } /** @@ -999,11 +1000,11 @@ public io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry.Buil */ public java.util.List getMap1BuilderList() { - return getMap1FieldBuilder().getBuilderList(); + return internalGetMap1FieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry, io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry.Builder, io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntryOrBuilder> - getMap1FieldBuilder() { + internalGetMap1FieldBuilder() { if (map1Builder_ == null) { map1Builder_ = new com.google.protobuf.RepeatedFieldBuilder< io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry, io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry.Builder, io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntryOrBuilder>( @@ -1196,7 +1197,7 @@ public Builder removeMap2(int index) { */ public io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry.Builder getMap2Builder( int index) { - return getMap2FieldBuilder().getBuilder(index); + return internalGetMap2FieldBuilder().getBuilder(index); } /** * repeated .AttributeFieldEntry map2 = 2; @@ -1223,7 +1224,7 @@ public io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntryOrBui * repeated .AttributeFieldEntry map2 = 2; */ public io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry.Builder addMap2Builder() { - return getMap2FieldBuilder().addBuilder( + return internalGetMap2FieldBuilder().addBuilder( io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry.getDefaultInstance()); } /** @@ -1231,7 +1232,7 @@ public io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry.Buil */ public io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry.Builder addMap2Builder( int index) { - return getMap2FieldBuilder().addBuilder( + return internalGetMap2FieldBuilder().addBuilder( index, io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry.getDefaultInstance()); } /** @@ -1239,11 +1240,11 @@ public io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry.Buil */ public java.util.List getMap2BuilderList() { - return getMap2FieldBuilder().getBuilderList(); + return internalGetMap2FieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilder< io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry, io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry.Builder, io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntryOrBuilder> - getMap2FieldBuilder() { + internalGetMap2FieldBuilder() { if (map2Builder_ == null) { map2Builder_ = new com.google.protobuf.RepeatedFieldBuilder< io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry, io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry.Builder, io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntryOrBuilder>( @@ -1347,7 +1348,7 @@ public Builder clearNotAMap1() { public io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry.Builder getNotAMap1Builder() { bitField0_ |= 0x00000004; onChanged(); - return getNotAMap1FieldBuilder().getBuilder(); + return internalGetNotAMap1FieldBuilder().getBuilder(); } /** * .AttributeFieldEntry notAMap1 = 3; @@ -1365,7 +1366,7 @@ public io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntryOrBui */ private com.google.protobuf.SingleFieldBuilder< io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry, io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry.Builder, io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntryOrBuilder> - getNotAMap1FieldBuilder() { + internalGetNotAMap1FieldBuilder() { if (notAMap1Builder_ == null) { notAMap1Builder_ = new com.google.protobuf.SingleFieldBuilder< io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry, io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry.Builder, io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntryOrBuilder>( @@ -1468,7 +1469,7 @@ public Builder clearNotAMap2() { public io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry.Builder getNotAMap2Builder() { bitField0_ |= 0x00000008; onChanged(); - return getNotAMap2FieldBuilder().getBuilder(); + return internalGetNotAMap2FieldBuilder().getBuilder(); } /** * .AttributeFieldEntry notAMap2 = 4; @@ -1486,7 +1487,7 @@ public io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntryOrBui */ private com.google.protobuf.SingleFieldBuilder< io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry, io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry.Builder, io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntryOrBuilder> - getNotAMap2FieldBuilder() { + internalGetNotAMap2FieldBuilder() { if (notAMap2Builder_ == null) { notAMap2Builder_ = new com.google.protobuf.SingleFieldBuilder< io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry, io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntry.Builder, io.confluent.connect.protobuf.test.MapReferences.AttributeFieldEntryOrBuilder>( @@ -1589,8 +1590,8 @@ public static final class AttributeFieldEntry extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", AttributeFieldEntry.class.getName()); } diff --git a/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/NestedKeyValue.java b/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/NestedKeyValue.java index e144e3b3921..7150684bb1c 100644 --- a/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/NestedKeyValue.java +++ b/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/NestedKeyValue.java @@ -1,18 +1,19 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: nestedfield.proto -// Protobuf Java Version: 4.29.3 +// Protobuf Java Version: 4.31.1 package io.confluent.connect.protobuf.test; +@com.google.protobuf.Generated public final class NestedKeyValue { private NestedKeyValue() {} static { com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", NestedKeyValue.class.getName()); } @@ -62,8 +63,8 @@ public static final class NestedKeyValueMessage extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", NestedKeyValueMessage.class.getName()); } @@ -333,7 +334,7 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getWrapperFieldFieldBuilder(); + internalGetWrapperFieldFieldBuilder(); } } @java.lang.Override @@ -407,7 +408,7 @@ public Builder mergeFrom(io.confluent.connect.protobuf.test.NestedKeyValue.Neste if (other.hasWrapperField()) { mergeWrapperField(other.getWrapperField()); } - if (other.getInnerField() != 0D) { + if (java.lang.Double.doubleToRawLongBits(other.getInnerField()) != 0) { setInnerField(other.getInnerField()); } this.mergeUnknownFields(other.getUnknownFields()); @@ -438,7 +439,7 @@ public Builder mergeFrom( break; case 10: { input.readMessage( - getWrapperFieldFieldBuilder().getBuilder(), + internalGetWrapperFieldFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000001; break; @@ -556,7 +557,7 @@ public Builder clearWrapperField() { public io.confluent.connect.protobuf.test.NestedKeyValue.NestedAttributeFieldEntry.Builder getWrapperFieldBuilder() { bitField0_ |= 0x00000001; onChanged(); - return getWrapperFieldFieldBuilder().getBuilder(); + return internalGetWrapperFieldFieldBuilder().getBuilder(); } /** * .NestedAttributeFieldEntry wrapper_field = 1; @@ -574,7 +575,7 @@ public io.confluent.connect.protobuf.test.NestedKeyValue.NestedAttributeFieldEnt */ private com.google.protobuf.SingleFieldBuilder< io.confluent.connect.protobuf.test.NestedKeyValue.NestedAttributeFieldEntry, io.confluent.connect.protobuf.test.NestedKeyValue.NestedAttributeFieldEntry.Builder, io.confluent.connect.protobuf.test.NestedKeyValue.NestedAttributeFieldEntryOrBuilder> - getWrapperFieldFieldBuilder() { + internalGetWrapperFieldFieldBuilder() { if (wrapperFieldBuilder_ == null) { wrapperFieldBuilder_ = new com.google.protobuf.SingleFieldBuilder< io.confluent.connect.protobuf.test.NestedKeyValue.NestedAttributeFieldEntry, io.confluent.connect.protobuf.test.NestedKeyValue.NestedAttributeFieldEntry.Builder, io.confluent.connect.protobuf.test.NestedKeyValue.NestedAttributeFieldEntryOrBuilder>( @@ -691,8 +692,8 @@ public static final class NestedAttributeFieldEntry extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", NestedAttributeFieldEntry.class.getName()); } @@ -971,7 +972,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) { public Builder mergeFrom(io.confluent.connect.protobuf.test.NestedKeyValue.NestedAttributeFieldEntry other) { if (other == io.confluent.connect.protobuf.test.NestedKeyValue.NestedAttributeFieldEntry.getDefaultInstance()) return this; - if (other.getNestedField() != 0D) { + if (java.lang.Double.doubleToRawLongBits(other.getNestedField()) != 0) { setNestedField(other.getNestedField()); } this.mergeUnknownFields(other.getUnknownFields()); diff --git a/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/RecursiveKeyValue.java b/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/RecursiveKeyValue.java index ddbf01d4f53..b6139ce7298 100644 --- a/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/RecursiveKeyValue.java +++ b/protobuf-converter/src/test/java/io/confluent/connect/protobuf/test/RecursiveKeyValue.java @@ -1,18 +1,19 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: recursivekeyvalue.proto -// Protobuf Java Version: 4.29.3 +// Protobuf Java Version: 4.31.1 package io.confluent.connect.protobuf.test; +@com.google.protobuf.Generated public final class RecursiveKeyValue { private RecursiveKeyValue() {} static { com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", RecursiveKeyValue.class.getName()); } @@ -74,8 +75,8 @@ public static final class RecursiveKeyValueMessage extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", RecursiveKeyValueMessage.class.getName()); } @@ -393,7 +394,7 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getKeyValueFieldBuilder(); + internalGetKeyValueFieldBuilder(); } } @java.lang.Override @@ -517,7 +518,7 @@ public Builder mergeFrom( } // case 18 case 82: { input.readMessage( - getKeyValueFieldBuilder().getBuilder(), + internalGetKeyValueFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000004; break; @@ -734,7 +735,7 @@ public Builder clearKeyValue() { public io.confluent.connect.protobuf.test.RecursiveKeyValue.RecursiveKeyValueMessage.Builder getKeyValueBuilder() { bitField0_ |= 0x00000004; onChanged(); - return getKeyValueFieldBuilder().getBuilder(); + return internalGetKeyValueFieldBuilder().getBuilder(); } /** * .RecursiveKeyValueMessage key_value = 10; @@ -752,7 +753,7 @@ public io.confluent.connect.protobuf.test.RecursiveKeyValue.RecursiveKeyValueMes */ private com.google.protobuf.SingleFieldBuilder< io.confluent.connect.protobuf.test.RecursiveKeyValue.RecursiveKeyValueMessage, io.confluent.connect.protobuf.test.RecursiveKeyValue.RecursiveKeyValueMessage.Builder, io.confluent.connect.protobuf.test.RecursiveKeyValue.RecursiveKeyValueMessageOrBuilder> - getKeyValueFieldBuilder() { + internalGetKeyValueFieldBuilder() { if (keyValueBuilder_ == null) { keyValueBuilder_ = new com.google.protobuf.SingleFieldBuilder< io.confluent.connect.protobuf.test.RecursiveKeyValue.RecursiveKeyValueMessage, io.confluent.connect.protobuf.test.RecursiveKeyValue.RecursiveKeyValueMessage.Builder, io.confluent.connect.protobuf.test.RecursiveKeyValue.RecursiveKeyValueMessageOrBuilder>( diff --git a/protobuf-serializer/src/test/java/com/acme/glup/CommonProto.java b/protobuf-serializer/src/test/java/com/acme/glup/CommonProto.java index ebcaa3cd754..f32bd1bc3ae 100644 --- a/protobuf-serializer/src/test/java/com/acme/glup/CommonProto.java +++ b/protobuf-serializer/src/test/java/com/acme/glup/CommonProto.java @@ -1,18 +1,19 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: common_proto.proto -// Protobuf Java Version: 4.29.3 +// Protobuf Java Version: 4.31.1 package com.acme.glup; +@com.google.protobuf.Generated public final class CommonProto { private CommonProto() {} static { com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", CommonProto.class.getName()); } @@ -50,8 +51,8 @@ public enum MarketingObjectiveType com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", MarketingObjectiveType.class.getName()); } @@ -119,7 +120,7 @@ public MarketingObjectiveType findValueByNumber(int number) { getDescriptorForType() { return getDescriptor(); } - public static final com.google.protobuf.Descriptors.EnumDescriptor + public static com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { return com.acme.glup.CommonProto.getDescriptor().getEnumTypes().get(0); } @@ -200,8 +201,8 @@ public enum IdentificationForbiddenReason com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", IdentificationForbiddenReason.class.getName()); } @@ -304,7 +305,7 @@ public IdentificationForbiddenReason findValueByNumber(int number) { getDescriptorForType() { return getDescriptor(); } - public static final com.google.protobuf.Descriptors.EnumDescriptor + public static com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { return com.acme.glup.CommonProto.getDescriptor().getEnumTypes().get(1); } @@ -434,8 +435,8 @@ public static final class Consent extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", Consent.class.getName()); } @@ -1082,9 +1083,7 @@ public com.acme.glup.CommonProto.IdentificationForbiddenReason getReason() { * @return This builder for chaining. */ public Builder setReason(com.acme.glup.CommonProto.IdentificationForbiddenReason value) { - if (value == null) { - throw new NullPointerException(); - } + if (value == null) { throw new NullPointerException(); } bitField0_ |= 0x00000002; reason_ = value.getNumber(); onChanged(); diff --git a/protobuf-serializer/src/test/java/com/acme/glup/ExampleProtoAcme.java b/protobuf-serializer/src/test/java/com/acme/glup/ExampleProtoAcme.java index a339540c854..a800da112f0 100644 --- a/protobuf-serializer/src/test/java/com/acme/glup/ExampleProtoAcme.java +++ b/protobuf-serializer/src/test/java/com/acme/glup/ExampleProtoAcme.java @@ -1,18 +1,19 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // NO CHECKED-IN PROTOBUF GENCODE // source: exampleProtoAcme.proto -// Protobuf Java Version: 4.29.3 +// Protobuf Java Version: 4.31.1 package com.acme.glup; +@com.google.protobuf.Generated public final class ExampleProtoAcme { private ExampleProtoAcme() {} static { com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", ExampleProtoAcme.class.getName()); } @@ -184,8 +185,8 @@ public static final class ClickCas extends com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, /* major= */ 4, - /* minor= */ 29, - /* patch= */ 3, + /* minor= */ 31, + /* patch= */ 1, /* suffix= */ "", ClickCas.class.getName()); } @@ -751,9 +752,9 @@ private Builder( private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage .alwaysUseFieldBuilders) { - getGlupOriginFieldBuilder(); - getPartitionFieldBuilder(); - getControlMessageFieldBuilder(); + internalGetGlupOriginFieldBuilder(); + internalGetPartitionFieldBuilder(); + internalGetControlMessageFieldBuilder(); } } @java.lang.Override @@ -894,7 +895,7 @@ public Builder mergeFrom(com.acme.glup.ExampleProtoAcme.ClickCas other) { bitField0_ = (bitField0_ & ~0x00000010); controlMessageBuilder_ = com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getControlMessageFieldBuilder() : null; + internalGetControlMessageFieldBuilder() : null; } else { controlMessageBuilder_.addAllMessages(other.controlMessage_); } @@ -928,14 +929,14 @@ public Builder mergeFrom( break; case 10: { input.readMessage( - getGlupOriginFieldBuilder().getBuilder(), + internalGetGlupOriginFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000001; break; } // case 10 case 18: { input.readMessage( - getPartitionFieldBuilder().getBuilder(), + internalGetPartitionFieldBuilder().getBuilder(), extensionRegistry); bitField0_ |= 0x00000002; break; @@ -1075,7 +1076,7 @@ public Builder clearGlupOrigin() { public com.acme.glup.MetadataProto.Origin.Builder getGlupOriginBuilder() { bitField0_ |= 0x00000001; onChanged(); - return getGlupOriginFieldBuilder().getBuilder(); + return internalGetGlupOriginFieldBuilder().getBuilder(); } /** * .Acme.Glup.Origin glup_origin = 1; @@ -1093,7 +1094,7 @@ public com.acme.glup.MetadataProto.OriginOrBuilder getGlupOriginOrBuilder() { */ private com.google.protobuf.SingleFieldBuilder< com.acme.glup.MetadataProto.Origin, com.acme.glup.MetadataProto.Origin.Builder, com.acme.glup.MetadataProto.OriginOrBuilder> - getGlupOriginFieldBuilder() { + internalGetGlupOriginFieldBuilder() { if (glupOriginBuilder_ == null) { glupOriginBuilder_ = new com.google.protobuf.SingleFieldBuilder< com.acme.glup.MetadataProto.Origin, com.acme.glup.MetadataProto.Origin.Builder, com.acme.glup.MetadataProto.OriginOrBuilder>( @@ -1196,7 +1197,7 @@ public Builder clearPartition() { public com.acme.glup.MetadataProto.Partition.Builder getPartitionBuilder() { bitField0_ |= 0x00000002; onChanged(); - return getPartitionFieldBuilder().getBuilder(); + return internalGetPartitionFieldBuilder().getBuilder(); } /** * .Acme.Glup.Partition partition = 2; @@ -1214,7 +1215,7 @@ public com.acme.glup.MetadataProto.PartitionOrBuilder getPartitionOrBuilder() { */ private com.google.protobuf.SingleFieldBuilder< com.acme.glup.MetadataProto.Partition, com.acme.glup.MetadataProto.Partition.Builder, com.acme.glup.MetadataProto.PartitionOrBuilder> - getPartitionFieldBuilder() { + internalGetPartitionFieldBuilder() { if (partitionBuilder_ == null) { partitionBuilder_ = new com.google.protobuf.SingleFieldBuilder< com.acme.glup.MetadataProto.Partition, com.acme.glup.MetadataProto.Partition.Builder, com.acme.glup.MetadataProto.PartitionOrBuilder>( @@ -1690,7 +1691,7 @@ public Builder removeControlMessage(int index) { */ public com.acme.glup.MetadataProto.ControlMessage.Watermark.Builder getControlMessageBuilder( int index) { - return getControlMessageFieldBuilder().getBuilder(index); + return internalGetControlMessageFieldBuilder().getBuilder(index); } /** *
@@ -1729,7 +1730,7 @@ public com.acme.glup.MetadataProto.ControlMessage.WatermarkOrBuilder getControlM
        * repeated .Acme.Glup.ControlMessage.Watermark control_message = 2097151 [(.Acme.Glup.json) = { ... }
        */
       public com.acme.glup.MetadataProto.ControlMessage.Watermark.Builder addControlMessageBuilder() {
-        return getControlMessageFieldBuilder().addBuilder(
+        return internalGetControlMessageFieldBuilder().addBuilder(
             com.acme.glup.MetadataProto.ControlMessage.Watermark.getDefaultInstance());
       }
       /**
@@ -1741,7 +1742,7 @@ public com.acme.glup.MetadataProto.ControlMessage.Watermark.Builder addControlMe
        */
       public com.acme.glup.MetadataProto.ControlMessage.Watermark.Builder addControlMessageBuilder(
           int index) {
-        return getControlMessageFieldBuilder().addBuilder(
+        return internalGetControlMessageFieldBuilder().addBuilder(
             index, com.acme.glup.MetadataProto.ControlMessage.Watermark.getDefaultInstance());
       }
       /**
@@ -1753,11 +1754,11 @@ public com.acme.glup.MetadataProto.ControlMessage.Watermark.Builder addControlMe
        */
       public java.util.List 
            getControlMessageBuilderList() {
-        return getControlMessageFieldBuilder().getBuilderList();
+        return internalGetControlMessageFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           com.acme.glup.MetadataProto.ControlMessage.Watermark, com.acme.glup.MetadataProto.ControlMessage.Watermark.Builder, com.acme.glup.MetadataProto.ControlMessage.WatermarkOrBuilder> 
-          getControlMessageFieldBuilder() {
+          internalGetControlMessageFieldBuilder() {
         if (controlMessageBuilder_ == null) {
           controlMessageBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               com.acme.glup.MetadataProto.ControlMessage.Watermark, com.acme.glup.MetadataProto.ControlMessage.Watermark.Builder, com.acme.glup.MetadataProto.ControlMessage.WatermarkOrBuilder>(
diff --git a/protobuf-serializer/src/test/java/com/acme/glup/MetadataProto.java b/protobuf-serializer/src/test/java/com/acme/glup/MetadataProto.java
index ea23493b600..22bbc7004d3 100644
--- a/protobuf-serializer/src/test/java/com/acme/glup/MetadataProto.java
+++ b/protobuf-serializer/src/test/java/com/acme/glup/MetadataProto.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: metadata_proto.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package com.acme.glup;
 
+@com.google.protobuf.Generated
 public final class MetadataProto {
   private MetadataProto() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       MetadataProto.class.getName());
   }
@@ -70,8 +71,8 @@ public enum PartitionScheme
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         PartitionScheme.class.getName());
     }
@@ -158,7 +159,7 @@ public PartitionScheme findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return com.acme.glup.MetadataProto.getDescriptor().getEnumTypes().get(0);
     }
@@ -210,8 +211,8 @@ public enum MessageFormat
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         MessageFormat.class.getName());
     }
@@ -284,7 +285,7 @@ public MessageFormat findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return com.acme.glup.MetadataProto.getDescriptor().getEnumTypes().get(1);
     }
@@ -344,8 +345,8 @@ public enum HDFSDataFormat
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         HDFSDataFormat.class.getName());
     }
@@ -423,7 +424,7 @@ public HDFSDataFormat findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return com.acme.glup.MetadataProto.getDescriptor().getEnumTypes().get(2);
     }
@@ -471,8 +472,8 @@ public enum DataSetKind
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         DataSetKind.class.getName());
     }
@@ -540,7 +541,7 @@ public DataSetKind findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return com.acme.glup.MetadataProto.getDescriptor().getEnumTypes().get(3);
     }
@@ -616,8 +617,8 @@ public enum MonitoringLevel
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         MonitoringLevel.class.getName());
     }
@@ -716,7 +717,7 @@ public MonitoringLevel findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return com.acme.glup.MetadataProto.getDescriptor().getEnumTypes().get(4);
     }
@@ -814,8 +815,8 @@ public enum DataCenter
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         DataCenter.class.getName());
     }
@@ -939,7 +940,7 @@ public DataCenter findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return com.acme.glup.MetadataProto.getDescriptor().getEnumTypes().get(5);
     }
@@ -991,8 +992,8 @@ public enum Environment
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Environment.class.getName());
     }
@@ -1065,7 +1066,7 @@ public Environment findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return com.acme.glup.MetadataProto.getDescriptor().getEnumTypes().get(6);
     }
@@ -1135,8 +1136,8 @@ public enum Platform
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Platform.class.getName());
     }
@@ -1225,7 +1226,7 @@ public Platform findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return com.acme.glup.MetadataProto.getDescriptor().getEnumTypes().get(7);
     }
@@ -1285,8 +1286,8 @@ public enum EventType
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         EventType.class.getName());
     }
@@ -1369,7 +1370,7 @@ public EventType findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return com.acme.glup.MetadataProto.getDescriptor().getEnumTypes().get(8);
     }
@@ -1426,8 +1427,8 @@ public enum YesNo
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         YesNo.class.getName());
     }
@@ -1500,7 +1501,7 @@ public YesNo findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return com.acme.glup.MetadataProto.getDescriptor().getEnumTypes().get(9);
     }
@@ -1573,8 +1574,8 @@ public static final class KafkaMessageOptions extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         KafkaMessageOptions.class.getName());
     }
@@ -2308,8 +2309,8 @@ public static final class DataSet extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         DataSet.class.getName());
     }
@@ -3048,7 +3049,7 @@ public Builder mergeFrom(com.acme.glup.MetadataProto.DataSet other) {
               bitField0_ = (bitField0_ & ~0x00000002);
               formatBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getFormatFieldBuilder() : null;
+                   internalGetFormatFieldBuilder() : null;
             } else {
               formatBuilder_.addAllMessages(other.format_);
             }
@@ -3509,7 +3510,7 @@ public Builder removeFormat(int index) {
        */
       public com.acme.glup.MetadataProto.DataSetFormat.Builder getFormatBuilder(
           int index) {
-        return getFormatFieldBuilder().getBuilder(index);
+        return internalGetFormatFieldBuilder().getBuilder(index);
       }
       /**
        * 
@@ -3548,7 +3549,7 @@ public com.acme.glup.MetadataProto.DataSetFormatOrBuilder getFormatOrBuilder(
        * repeated .Acme.Glup.DataSetFormat format = 2;
        */
       public com.acme.glup.MetadataProto.DataSetFormat.Builder addFormatBuilder() {
-        return getFormatFieldBuilder().addBuilder(
+        return internalGetFormatFieldBuilder().addBuilder(
             com.acme.glup.MetadataProto.DataSetFormat.getDefaultInstance());
       }
       /**
@@ -3560,7 +3561,7 @@ public com.acme.glup.MetadataProto.DataSetFormat.Builder addFormatBuilder() {
        */
       public com.acme.glup.MetadataProto.DataSetFormat.Builder addFormatBuilder(
           int index) {
-        return getFormatFieldBuilder().addBuilder(
+        return internalGetFormatFieldBuilder().addBuilder(
             index, com.acme.glup.MetadataProto.DataSetFormat.getDefaultInstance());
       }
       /**
@@ -3572,11 +3573,11 @@ public com.acme.glup.MetadataProto.DataSetFormat.Builder addFormatBuilder(
        */
       public java.util.List 
            getFormatBuilderList() {
-        return getFormatFieldBuilder().getBuilderList();
+        return internalGetFormatFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           com.acme.glup.MetadataProto.DataSetFormat, com.acme.glup.MetadataProto.DataSetFormat.Builder, com.acme.glup.MetadataProto.DataSetFormatOrBuilder> 
-          getFormatFieldBuilder() {
+          internalGetFormatFieldBuilder() {
         if (formatBuilder_ == null) {
           formatBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               com.acme.glup.MetadataProto.DataSetFormat, com.acme.glup.MetadataProto.DataSetFormat.Builder, com.acme.glup.MetadataProto.DataSetFormatOrBuilder>(
@@ -3639,9 +3640,7 @@ public com.acme.glup.MetadataProto.PartitionScheme getPartitionScheme() {
        * @return This builder for chaining.
        */
       public Builder setPartitionScheme(com.acme.glup.MetadataProto.PartitionScheme value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000004;
         partitionScheme_ = value.getNumber();
         onChanged();
@@ -3984,9 +3983,7 @@ public com.acme.glup.MetadataProto.DataSetKind getKind() {
        * @return This builder for chaining.
        */
       public Builder setKind(com.acme.glup.MetadataProto.DataSetKind value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000080;
         kind_ = value.getNumber();
         onChanged();
@@ -4173,8 +4170,8 @@ public static final class DataSetChunk extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         DataSetChunk.class.getName());
     }
@@ -4529,8 +4526,8 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getPartitionFieldBuilder();
-          getFormatFieldBuilder();
+          internalGetPartitionFieldBuilder();
+          internalGetFormatFieldBuilder();
         }
       }
       @java.lang.Override
@@ -4641,7 +4638,7 @@ public Builder mergeFrom(com.acme.glup.MetadataProto.DataSetChunk other) {
               bitField0_ = (bitField0_ & ~0x00000001);
               partitionBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getPartitionFieldBuilder() : null;
+                   internalGetPartitionFieldBuilder() : null;
             } else {
               partitionBuilder_.addAllMessages(other.partition_);
             }
@@ -4696,7 +4693,7 @@ public Builder mergeFrom(
               } // case 10
               case 18: {
                 input.readMessage(
-                    getFormatFieldBuilder().getBuilder(),
+                    internalGetFormatFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000002;
                 break;
@@ -4903,7 +4900,7 @@ public Builder removePartition(int index) {
        */
       public com.acme.glup.MetadataProto.Partition.Builder getPartitionBuilder(
           int index) {
-        return getPartitionFieldBuilder().getBuilder(index);
+        return internalGetPartitionFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .Acme.Glup.Partition partition = 1;
@@ -4930,7 +4927,7 @@ public com.acme.glup.MetadataProto.PartitionOrBuilder getPartitionOrBuilder(
        * repeated .Acme.Glup.Partition partition = 1;
        */
       public com.acme.glup.MetadataProto.Partition.Builder addPartitionBuilder() {
-        return getPartitionFieldBuilder().addBuilder(
+        return internalGetPartitionFieldBuilder().addBuilder(
             com.acme.glup.MetadataProto.Partition.getDefaultInstance());
       }
       /**
@@ -4938,7 +4935,7 @@ public com.acme.glup.MetadataProto.Partition.Builder addPartitionBuilder() {
        */
       public com.acme.glup.MetadataProto.Partition.Builder addPartitionBuilder(
           int index) {
-        return getPartitionFieldBuilder().addBuilder(
+        return internalGetPartitionFieldBuilder().addBuilder(
             index, com.acme.glup.MetadataProto.Partition.getDefaultInstance());
       }
       /**
@@ -4946,11 +4943,11 @@ public com.acme.glup.MetadataProto.Partition.Builder addPartitionBuilder(
        */
       public java.util.List 
            getPartitionBuilderList() {
-        return getPartitionFieldBuilder().getBuilderList();
+        return internalGetPartitionFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           com.acme.glup.MetadataProto.Partition, com.acme.glup.MetadataProto.Partition.Builder, com.acme.glup.MetadataProto.PartitionOrBuilder> 
-          getPartitionFieldBuilder() {
+          internalGetPartitionFieldBuilder() {
         if (partitionBuilder_ == null) {
           partitionBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               com.acme.glup.MetadataProto.Partition, com.acme.glup.MetadataProto.Partition.Builder, com.acme.glup.MetadataProto.PartitionOrBuilder>(
@@ -5054,7 +5051,7 @@ public Builder clearFormat() {
       public com.acme.glup.MetadataProto.DataSetFormat.Builder getFormatBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
-        return getFormatFieldBuilder().getBuilder();
+        return internalGetFormatFieldBuilder().getBuilder();
       }
       /**
        * .Acme.Glup.DataSetFormat format = 2;
@@ -5072,7 +5069,7 @@ public com.acme.glup.MetadataProto.DataSetFormatOrBuilder getFormatOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           com.acme.glup.MetadataProto.DataSetFormat, com.acme.glup.MetadataProto.DataSetFormat.Builder, com.acme.glup.MetadataProto.DataSetFormatOrBuilder> 
-          getFormatFieldBuilder() {
+          internalGetFormatFieldBuilder() {
         if (formatBuilder_ == null) {
           formatBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               com.acme.glup.MetadataProto.DataSetFormat, com.acme.glup.MetadataProto.DataSetFormat.Builder, com.acme.glup.MetadataProto.DataSetFormatOrBuilder>(
@@ -5398,8 +5395,8 @@ public static final class DataSetFormat extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         DataSetFormat.class.getName());
     }
@@ -5994,8 +5991,8 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getStartPartitionFieldBuilder();
-          getEndPartitionFieldBuilder();
+          internalGetStartPartitionFieldBuilder();
+          internalGetEndPartitionFieldBuilder();
         }
       }
       @java.lang.Override
@@ -6175,14 +6172,14 @@ public Builder mergeFrom(
               } // case 24
               case 34: {
                 input.readMessage(
-                    getStartPartitionFieldBuilder().getBuilder(),
+                    internalGetStartPartitionFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000008;
                 break;
               } // case 34
               case 42: {
                 input.readMessage(
-                    getEndPartitionFieldBuilder().getBuilder(),
+                    internalGetEndPartitionFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000010;
                 break;
@@ -6366,9 +6363,7 @@ public com.acme.glup.MetadataProto.HDFSDataFormat getFileFormat() {
        * @return This builder for chaining.
        */
       public Builder setFileFormat(com.acme.glup.MetadataProto.HDFSDataFormat value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000002;
         fileFormat_ = value.getNumber();
         onChanged();
@@ -6439,9 +6434,7 @@ public com.acme.glup.MetadataProto.PartitionScheme getPartitionScheme() {
        * @return This builder for chaining.
        */
       public Builder setPartitionScheme(com.acme.glup.MetadataProto.PartitionScheme value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000004;
         partitionScheme_ = value.getNumber();
         onChanged();
@@ -6581,7 +6574,7 @@ public Builder clearStartPartition() {
       public com.acme.glup.MetadataProto.HDFSPartition.Builder getStartPartitionBuilder() {
         bitField0_ |= 0x00000008;
         onChanged();
-        return getStartPartitionFieldBuilder().getBuilder();
+        return internalGetStartPartitionFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -6607,7 +6600,7 @@ public com.acme.glup.MetadataProto.HDFSPartitionOrBuilder getStartPartitionOrBui
        */
       private com.google.protobuf.SingleFieldBuilder<
           com.acme.glup.MetadataProto.HDFSPartition, com.acme.glup.MetadataProto.HDFSPartition.Builder, com.acme.glup.MetadataProto.HDFSPartitionOrBuilder> 
-          getStartPartitionFieldBuilder() {
+          internalGetStartPartitionFieldBuilder() {
         if (startPartitionBuilder_ == null) {
           startPartitionBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               com.acme.glup.MetadataProto.HDFSPartition, com.acme.glup.MetadataProto.HDFSPartition.Builder, com.acme.glup.MetadataProto.HDFSPartitionOrBuilder>(
@@ -6738,7 +6731,7 @@ public Builder clearEndPartition() {
       public com.acme.glup.MetadataProto.HDFSPartition.Builder getEndPartitionBuilder() {
         bitField0_ |= 0x00000010;
         onChanged();
-        return getEndPartitionFieldBuilder().getBuilder();
+        return internalGetEndPartitionFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -6764,7 +6757,7 @@ public com.acme.glup.MetadataProto.HDFSPartitionOrBuilder getEndPartitionOrBuild
        */
       private com.google.protobuf.SingleFieldBuilder<
           com.acme.glup.MetadataProto.HDFSPartition, com.acme.glup.MetadataProto.HDFSPartition.Builder, com.acme.glup.MetadataProto.HDFSPartitionOrBuilder> 
-          getEndPartitionFieldBuilder() {
+          internalGetEndPartitionFieldBuilder() {
         if (endPartitionBuilder_ == null) {
           endPartitionBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               com.acme.glup.MetadataProto.HDFSPartition, com.acme.glup.MetadataProto.HDFSPartition.Builder, com.acme.glup.MetadataProto.HDFSPartitionOrBuilder>(
@@ -7006,9 +6999,7 @@ public com.acme.glup.MetadataProto.MonitoringLevel getMonitoringLevel() {
        * @return This builder for chaining.
        */
       public Builder setMonitoringLevel(com.acme.glup.MetadataProto.MonitoringLevel value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000100;
         monitoringLevel_ = value.getNumber();
         onChanged();
@@ -7120,8 +7111,8 @@ public static final class HDFSOptions extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         HDFSOptions.class.getName());
     }
@@ -7275,8 +7266,8 @@ public static final class ImportOptions extends
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 29,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           ImportOptions.class.getName());
       }
@@ -7349,8 +7340,8 @@ public static final class View extends
           com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
             com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
             /* major= */ 4,
-            /* minor= */ 29,
-            /* patch= */ 3,
+            /* minor= */ 31,
+            /* patch= */ 1,
             /* suffix= */ "",
             View.class.getName());
         }
@@ -7415,8 +7406,8 @@ public static final class HiveOptions extends
             com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
               com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
               /* major= */ 4,
-              /* minor= */ 29,
-              /* patch= */ 3,
+              /* minor= */ 31,
+              /* patch= */ 1,
               /* suffix= */ "",
               HiveOptions.class.getName());
           }
@@ -7815,9 +7806,7 @@ public com.acme.glup.MetadataProto.PartitionScheme getPartitioning() {
              * @return This builder for chaining.
              */
             public Builder setPartitioning(com.acme.glup.MetadataProto.PartitionScheme value) {
-              if (value == null) {
-                throw new NullPointerException();
-              }
+              if (value == null) { throw new NullPointerException(); }
               bitField0_ |= 0x00000001;
               partitioning_ = value.getNumber();
               onChanged();
@@ -8123,7 +8112,7 @@ private Builder(
           private void maybeForceBuilderInitialization() {
             if (com.google.protobuf.GeneratedMessage
                     .alwaysUseFieldBuilders) {
-              getHiveFieldBuilder();
+              internalGetHiveFieldBuilder();
             }
           }
           @java.lang.Override
@@ -8221,7 +8210,7 @@ public Builder mergeFrom(
                     break;
                   case 82: {
                     input.readMessage(
-                        getHiveFieldBuilder().getBuilder(),
+                        internalGetHiveFieldBuilder().getBuilder(),
                         extensionRegistry);
                     bitField0_ |= 0x00000001;
                     break;
@@ -8362,7 +8351,7 @@ public Builder clearHive() {
           public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.View.HiveOptions.Builder getHiveBuilder() {
             bitField0_ |= 0x00000001;
             onChanged();
-            return getHiveFieldBuilder().getBuilder();
+            return internalGetHiveFieldBuilder().getBuilder();
           }
           /**
            * 
@@ -8388,7 +8377,7 @@ public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.View.HiveOptionsOrB
            */
           private com.google.protobuf.SingleFieldBuilder<
               com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.View.HiveOptions, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.View.HiveOptions.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.View.HiveOptionsOrBuilder> 
-              getHiveFieldBuilder() {
+              internalGetHiveFieldBuilder() {
             if (hiveBuilder_ == null) {
               hiveBuilder_ = new com.google.protobuf.SingleFieldBuilder<
                   com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.View.HiveOptions, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.View.HiveOptions.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.View.HiveOptionsOrBuilder>(
@@ -8747,8 +8736,8 @@ public static final class Generator extends
           com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
             com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
             /* major= */ 4,
-            /* minor= */ 29,
-            /* patch= */ 3,
+            /* minor= */ 31,
+            /* patch= */ 1,
             /* suffix= */ "",
             Generator.class.getName());
         }
@@ -8884,8 +8873,8 @@ public static final class DedupOptions extends
             com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
               com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
               /* major= */ 4,
-              /* minor= */ 29,
-              /* patch= */ 3,
+              /* minor= */ 31,
+              /* patch= */ 1,
               /* suffix= */ "",
               DedupOptions.class.getName());
           }
@@ -10063,8 +10052,8 @@ public static final class Kafka2HdfsOptions extends
             com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
               com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
               /* major= */ 4,
-              /* minor= */ 29,
-              /* patch= */ 3,
+              /* minor= */ 31,
+              /* patch= */ 1,
               /* suffix= */ "",
               Kafka2HdfsOptions.class.getName());
           }
@@ -11020,8 +11009,8 @@ public static final class KacohaConfig extends
             com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
               com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
               /* major= */ 4,
-              /* minor= */ 29,
-              /* patch= */ 3,
+              /* minor= */ 31,
+              /* patch= */ 1,
               /* suffix= */ "",
               KacohaConfig.class.getName());
           }
@@ -11592,8 +11581,8 @@ public static final class KacohaConfigPerDc extends
             com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
               com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
               /* major= */ 4,
-              /* minor= */ 29,
-              /* patch= */ 3,
+              /* minor= */ 31,
+              /* patch= */ 1,
               /* suffix= */ "",
               KacohaConfigPerDc.class.getName());
           }
@@ -11888,7 +11877,7 @@ private Builder(
             private void maybeForceBuilderInitialization() {
               if (com.google.protobuf.GeneratedMessage
                       .alwaysUseFieldBuilders) {
-                getConfigFieldBuilder();
+                internalGetConfigFieldBuilder();
               }
             }
             @java.lang.Override
@@ -11998,7 +11987,7 @@ public Builder mergeFrom(
                     } // case 8
                     case 18: {
                       input.readMessage(
-                          getConfigFieldBuilder().getBuilder(),
+                          internalGetConfigFieldBuilder().getBuilder(),
                           extensionRegistry);
                       bitField0_ |= 0x00000002;
                       break;
@@ -12070,9 +12059,7 @@ public com.acme.glup.MetadataProto.DataCenter getDc() {
              * @return This builder for chaining.
              */
             public Builder setDc(com.acme.glup.MetadataProto.DataCenter value) {
-              if (value == null) {
-                throw new NullPointerException();
-              }
+              if (value == null) { throw new NullPointerException(); }
               bitField0_ |= 0x00000001;
               dc_ = value.getNumber();
               onChanged();
@@ -12212,7 +12199,7 @@ public Builder clearConfig() {
             public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaConfig.Builder getConfigBuilder() {
               bitField0_ |= 0x00000002;
               onChanged();
-              return getConfigFieldBuilder().getBuilder();
+              return internalGetConfigFieldBuilder().getBuilder();
             }
             /**
              * 
@@ -12238,7 +12225,7 @@ public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaCon
              */
             private com.google.protobuf.SingleFieldBuilder<
                 com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaConfig, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaConfig.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaConfigOrBuilder> 
-                getConfigFieldBuilder() {
+                internalGetConfigFieldBuilder() {
               if (configBuilder_ == null) {
                 configBuilder_ = new com.google.protobuf.SingleFieldBuilder<
                     com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaConfig, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaConfig.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaConfigOrBuilder>(
@@ -12458,8 +12445,8 @@ public static final class KaCoHaOptions extends
             com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
               com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
               /* major= */ 4,
-              /* minor= */ 29,
-              /* patch= */ 3,
+              /* minor= */ 31,
+              /* patch= */ 1,
               /* suffix= */ "",
               KaCoHaOptions.class.getName());
           }
@@ -12993,8 +12980,8 @@ private Builder(
             private void maybeForceBuilderInitialization() {
               if (com.google.protobuf.GeneratedMessage
                       .alwaysUseFieldBuilders) {
-                getConfigFieldBuilder();
-                getConfigPerDcFieldBuilder();
+                internalGetConfigFieldBuilder();
+                internalGetConfigPerDcFieldBuilder();
               }
             }
             @java.lang.Override
@@ -13138,7 +13125,7 @@ public Builder mergeFrom(com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.G
                     bitField0_ = (bitField0_ & ~0x00000020);
                     configPerDcBuilder_ = 
                       com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                         getConfigPerDcFieldBuilder() : null;
+                         internalGetConfigPerDcFieldBuilder() : null;
                   } else {
                     configPerDcBuilder_.addAllMessages(other.configPerDc_);
                   }
@@ -13187,7 +13174,7 @@ public Builder mergeFrom(
                     } // case 24
                     case 34: {
                       input.readMessage(
-                          getConfigFieldBuilder().getBuilder(),
+                          internalGetConfigFieldBuilder().getBuilder(),
                           extensionRegistry);
                       bitField0_ |= 0x00000008;
                       break;
@@ -13574,7 +13561,7 @@ public Builder clearConfig() {
             public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaConfig.Builder getConfigBuilder() {
               bitField0_ |= 0x00000008;
               onChanged();
-              return getConfigFieldBuilder().getBuilder();
+              return internalGetConfigFieldBuilder().getBuilder();
             }
             /**
              * 
@@ -13600,7 +13587,7 @@ public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaCon
              */
             private com.google.protobuf.SingleFieldBuilder<
                 com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaConfig, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaConfig.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaConfigOrBuilder> 
-                getConfigFieldBuilder() {
+                internalGetConfigFieldBuilder() {
               if (configBuilder_ == null) {
                 configBuilder_ = new com.google.protobuf.SingleFieldBuilder<
                     com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaConfig, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaConfig.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaConfigOrBuilder>(
@@ -13936,7 +13923,7 @@ public Builder removeConfigPerDc(int index) {
              */
             public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaConfigPerDc.Builder getConfigPerDcBuilder(
                 int index) {
-              return getConfigPerDcFieldBuilder().getBuilder(index);
+              return internalGetConfigPerDcFieldBuilder().getBuilder(index);
             }
             /**
              * 
@@ -13975,7 +13962,7 @@ public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaCon
              * repeated .Acme.Glup.HDFSOptions.ImportOptions.Generator.KacohaConfigPerDc config_per_dc = 6;
              */
             public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaConfigPerDc.Builder addConfigPerDcBuilder() {
-              return getConfigPerDcFieldBuilder().addBuilder(
+              return internalGetConfigPerDcFieldBuilder().addBuilder(
                   com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaConfigPerDc.getDefaultInstance());
             }
             /**
@@ -13987,7 +13974,7 @@ public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaCon
              */
             public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaConfigPerDc.Builder addConfigPerDcBuilder(
                 int index) {
-              return getConfigPerDcFieldBuilder().addBuilder(
+              return internalGetConfigPerDcFieldBuilder().addBuilder(
                   index, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaConfigPerDc.getDefaultInstance());
             }
             /**
@@ -13999,11 +13986,11 @@ public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaCon
              */
             public java.util.List 
                  getConfigPerDcBuilderList() {
-              return getConfigPerDcFieldBuilder().getBuilderList();
+              return internalGetConfigPerDcFieldBuilder().getBuilderList();
             }
             private com.google.protobuf.RepeatedFieldBuilder<
                 com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaConfigPerDc, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaConfigPerDc.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaConfigPerDcOrBuilder> 
-                getConfigPerDcFieldBuilder() {
+                internalGetConfigPerDcFieldBuilder() {
               if (configPerDcBuilder_ == null) {
                 configPerDcBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
                     com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaConfigPerDc, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaConfigPerDc.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KacohaConfigPerDcOrBuilder>(
@@ -14137,8 +14124,8 @@ public static final class DataloaderOptions extends
             com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
               com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
               /* major= */ 4,
-              /* minor= */ 29,
-              /* patch= */ 3,
+              /* minor= */ 31,
+              /* patch= */ 1,
               /* suffix= */ "",
               DataloaderOptions.class.getName());
           }
@@ -14165,8 +14152,9 @@ private DataloaderOptions() {
 
           public static final int PLATFORM_FIELD_NUMBER = 1;
           @SuppressWarnings("serial")
-          private com.google.protobuf.Internal.IntList platform_;
-          private static final com.google.protobuf.Internal.IntListAdapter.IntConverter<
+          private com.google.protobuf.Internal.IntList platform_ =
+              emptyIntList();
+          private static final     com.google.protobuf.Internal.IntListAdapter.IntConverter<
               com.acme.glup.MetadataProto.Platform> platform_converter_ =
                   new com.google.protobuf.Internal.IntListAdapter.IntConverter<
                       com.acme.glup.MetadataProto.Platform>() {
@@ -14452,7 +14440,6 @@ public Builder clear() {
               super.clear();
               bitField0_ = 0;
               platform_ = emptyIntList();
-              bitField0_ = (bitField0_ & ~0x00000001);
               return this;
             }
 
@@ -14479,22 +14466,17 @@ public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.Dataloade
             @java.lang.Override
             public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.DataloaderOptions buildPartial() {
               com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.DataloaderOptions result = new com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.DataloaderOptions(this);
-              buildPartialRepeatedFields(result);
               if (bitField0_ != 0) { buildPartial0(result); }
               onBuilt();
               return result;
             }
 
-            private void buildPartialRepeatedFields(com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.DataloaderOptions result) {
-              if (((bitField0_ & 0x00000001) != 0)) {
-                platform_.makeImmutable();
-                bitField0_ = (bitField0_ & ~0x00000001);
-              }
-              result.platform_ = platform_;
-            }
-
             private void buildPartial0(com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.DataloaderOptions result) {
               int from_bitField0_ = bitField0_;
+              if (((from_bitField0_ & 0x00000001) != 0)) {
+                platform_.makeImmutable();
+                result.platform_ = platform_;
+              }
             }
 
             @java.lang.Override
@@ -14512,7 +14494,8 @@ public Builder mergeFrom(com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.G
               if (!other.platform_.isEmpty()) {
                 if (platform_.isEmpty()) {
                   platform_ = other.platform_;
-                  bitField0_ = (bitField0_ & ~0x00000001);
+                  platform_.makeImmutable();
+                  bitField0_ |= 0x00000001;
                 } else {
                   ensurePlatformIsMutable();
                   platform_.addAll(other.platform_);
@@ -14553,13 +14536,12 @@ public Builder mergeFrom(
                     } // case 8
                     case 10: {
                       int length = input.readRawVarint32();
-                      int oldLimit = input.pushLimit(length);
-                      while(input.getBytesUntilLimit() > 0) {
-                        int tmpRaw = input.readEnum();
-                        ensurePlatformIsMutable();
-                        platform_.addInt(tmpRaw);
+                      int limit = input.pushLimit(length);
+                      ensurePlatformIsMutable();
+                      while (input.getBytesUntilLimit() > 0) {
+                        platform_.addInt(input.readEnum());
                       }
-                      input.popLimit(oldLimit);
+                      input.popLimit(limit);
                       break;
                     } // case 10
                     default: {
@@ -14579,13 +14561,12 @@ public Builder mergeFrom(
             }
             private int bitField0_;
 
-            private com.google.protobuf.Internal.IntList platform_ =
-              emptyIntList();
+            private com.google.protobuf.Internal.IntList platform_ = emptyIntList();
             private void ensurePlatformIsMutable() {
-              if (!((bitField0_ & 0x00000001) != 0)) {
+              if (!platform_.isModifiable()) {
                 platform_ = makeMutableCopy(platform_);
-                bitField0_ |= 0x00000001;
               }
+              bitField0_ |= 0x00000001;
             }
             /**
              * 
@@ -14638,9 +14619,7 @@ public com.acme.glup.MetadataProto.Platform getPlatform(int index) {
              */
             public Builder setPlatform(
                 int index, com.acme.glup.MetadataProto.Platform value) {
-              if (value == null) {
-                throw new NullPointerException();
-              }
+              if (value == null) { throw new NullPointerException(); }
               ensurePlatformIsMutable();
               platform_.setInt(index, value.getNumber());
               onChanged();
@@ -14657,9 +14636,7 @@ public Builder setPlatform(
              * @return This builder for chaining.
              */
             public Builder addPlatform(com.acme.glup.MetadataProto.Platform value) {
-              if (value == null) {
-                throw new NullPointerException();
-              }
+              if (value == null) { throw new NullPointerException(); }
               ensurePlatformIsMutable();
               platform_.addInt(value.getNumber());
               onChanged();
@@ -14710,7 +14687,8 @@ public Builder clearPlatform() {
              */
             public java.util.List
             getPlatformValueList() {
-              return java.util.Collections.unmodifiableList(platform_);
+              platform_.makeImmutable();
+              return platform_;
             }
             /**
              * 
@@ -15022,8 +15000,8 @@ public static final class SyncOptions extends
             com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
               com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
               /* major= */ 4,
-              /* minor= */ 29,
-              /* patch= */ 3,
+              /* minor= */ 31,
+              /* patch= */ 1,
               /* suffix= */ "",
               SyncOptions.class.getName());
           }
@@ -15139,8 +15117,9 @@ public java.lang.String getSourceNamespace() {
 
           public static final int PLATFORMS_FIELD_NUMBER = 6;
           @SuppressWarnings("serial")
-          private com.google.protobuf.Internal.IntList platforms_;
-          private static final com.google.protobuf.Internal.IntListAdapter.IntConverter<
+          private com.google.protobuf.Internal.IntList platforms_ =
+              emptyIntList();
+          private static final     com.google.protobuf.Internal.IntListAdapter.IntConverter<
               com.acme.glup.MetadataProto.Platform> platforms_converter_ =
                   new com.google.protobuf.Internal.IntListAdapter.IntConverter<
                       com.acme.glup.MetadataProto.Platform>() {
@@ -15650,7 +15629,7 @@ private Builder(
             private void maybeForceBuilderInitialization() {
               if (com.google.protobuf.GeneratedMessage
                       .alwaysUseFieldBuilders) {
-                getFromFieldBuilder();
+                internalGetFromFieldBuilder();
               }
             }
             @java.lang.Override
@@ -15664,7 +15643,6 @@ public Builder clear() {
               }
               sourceNamespace_ = "";
               platforms_ = emptyIntList();
-              bitField0_ = (bitField0_ & ~0x00000004);
               isBackfilling_ = false;
               toLabel_ = "";
               toDatasetId_ = "";
@@ -15696,20 +15674,11 @@ public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.SyncOptio
             @java.lang.Override
             public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.SyncOptions buildPartial() {
               com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.SyncOptions result = new com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.SyncOptions(this);
-              buildPartialRepeatedFields(result);
               if (bitField0_ != 0) { buildPartial0(result); }
               onBuilt();
               return result;
             }
 
-            private void buildPartialRepeatedFields(com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.SyncOptions result) {
-              if (((bitField0_ & 0x00000004) != 0)) {
-                platforms_.makeImmutable();
-                bitField0_ = (bitField0_ & ~0x00000004);
-              }
-              result.platforms_ = platforms_;
-            }
-
             private void buildPartial0(com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.SyncOptions result) {
               int from_bitField0_ = bitField0_;
               int to_bitField0_ = 0;
@@ -15722,6 +15691,10 @@ private void buildPartial0(com.acme.glup.MetadataProto.HDFSOptions.ImportOptions
               if (((from_bitField0_ & 0x00000002) != 0)) {
                 result.sourceNamespace_ = sourceNamespace_;
               }
+              if (((from_bitField0_ & 0x00000004) != 0)) {
+                platforms_.makeImmutable();
+                result.platforms_ = platforms_;
+              }
               if (((from_bitField0_ & 0x00000008) != 0)) {
                 result.isBackfilling_ = isBackfilling_;
               }
@@ -15763,7 +15736,8 @@ public Builder mergeFrom(com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.G
               if (!other.platforms_.isEmpty()) {
                 if (platforms_.isEmpty()) {
                   platforms_ = other.platforms_;
-                  bitField0_ = (bitField0_ & ~0x00000004);
+                  platforms_.makeImmutable();
+                  bitField0_ |= 0x00000004;
                 } else {
                   ensurePlatformsIsMutable();
                   platforms_.addAll(other.platforms_);
@@ -15817,7 +15791,7 @@ public Builder mergeFrom(
                       break;
                     case 10: {
                       input.readMessage(
-                          getFromFieldBuilder().getBuilder(),
+                          internalGetFromFieldBuilder().getBuilder(),
                           extensionRegistry);
                       bitField0_ |= 0x00000001;
                       break;
@@ -15835,13 +15809,12 @@ public Builder mergeFrom(
                     } // case 48
                     case 50: {
                       int length = input.readRawVarint32();
-                      int oldLimit = input.pushLimit(length);
-                      while(input.getBytesUntilLimit() > 0) {
-                        int tmpRaw = input.readEnum();
-                        ensurePlatformsIsMutable();
-                        platforms_.addInt(tmpRaw);
+                      int limit = input.pushLimit(length);
+                      ensurePlatformsIsMutable();
+                      while (input.getBytesUntilLimit() > 0) {
+                        platforms_.addInt(input.readEnum());
                       }
-                      input.popLimit(oldLimit);
+                      input.popLimit(limit);
                       break;
                     } // case 50
                     case 64: {
@@ -16005,7 +15978,7 @@ public Builder clearFrom() {
             public com.acme.glup.MetadataProto.Location.Builder getFromBuilder() {
               bitField0_ |= 0x00000001;
               onChanged();
-              return getFromFieldBuilder().getBuilder();
+              return internalGetFromFieldBuilder().getBuilder();
             }
             /**
              * 
@@ -16031,7 +16004,7 @@ public com.acme.glup.MetadataProto.LocationOrBuilder getFromOrBuilder() {
              */
             private com.google.protobuf.SingleFieldBuilder<
                 com.acme.glup.MetadataProto.Location, com.acme.glup.MetadataProto.Location.Builder, com.acme.glup.MetadataProto.LocationOrBuilder> 
-                getFromFieldBuilder() {
+                internalGetFromFieldBuilder() {
               if (fromBuilder_ == null) {
                 fromBuilder_ = new com.google.protobuf.SingleFieldBuilder<
                     com.acme.glup.MetadataProto.Location, com.acme.glup.MetadataProto.Location.Builder, com.acme.glup.MetadataProto.LocationOrBuilder>(
@@ -16135,13 +16108,12 @@ public Builder setSourceNamespaceBytes(
               return this;
             }
 
-            private com.google.protobuf.Internal.IntList platforms_ =
-              emptyIntList();
+            private com.google.protobuf.Internal.IntList platforms_ = emptyIntList();
             private void ensurePlatformsIsMutable() {
-              if (!((bitField0_ & 0x00000004) != 0)) {
+              if (!platforms_.isModifiable()) {
                 platforms_ = makeMutableCopy(platforms_);
-                bitField0_ |= 0x00000004;
               }
+              bitField0_ |= 0x00000004;
             }
             /**
              * 
@@ -16198,9 +16170,7 @@ public com.acme.glup.MetadataProto.Platform getPlatforms(int index) {
              */
             public Builder setPlatforms(
                 int index, com.acme.glup.MetadataProto.Platform value) {
-              if (value == null) {
-                throw new NullPointerException();
-              }
+              if (value == null) { throw new NullPointerException(); }
               ensurePlatformsIsMutable();
               platforms_.setInt(index, value.getNumber());
               onChanged();
@@ -16218,9 +16188,7 @@ public Builder setPlatforms(
              * @return This builder for chaining.
              */
             public Builder addPlatforms(com.acme.glup.MetadataProto.Platform value) {
-              if (value == null) {
-                throw new NullPointerException();
-              }
+              if (value == null) { throw new NullPointerException(); }
               ensurePlatformsIsMutable();
               platforms_.addInt(value.getNumber());
               onChanged();
@@ -16274,7 +16242,8 @@ public Builder clearPlatforms() {
              */
             public java.util.List
             getPlatformsValueList() {
-              return java.util.Collections.unmodifiableList(platforms_);
+              platforms_.makeImmutable();
+              return platforms_;
             }
             /**
              * 
@@ -16826,8 +16795,8 @@ public static final class BackupOptions extends
             com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
               com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
               /* major= */ 4,
-              /* minor= */ 29,
-              /* patch= */ 3,
+              /* minor= */ 31,
+              /* patch= */ 1,
               /* suffix= */ "",
               BackupOptions.class.getName());
           }
@@ -16941,8 +16910,9 @@ public java.lang.String getSourceNamespace() {
 
           public static final int PLATFORMS_FIELD_NUMBER = 3;
           @SuppressWarnings("serial")
-          private com.google.protobuf.Internal.IntList platforms_;
-          private static final com.google.protobuf.Internal.IntListAdapter.IntConverter<
+          private com.google.protobuf.Internal.IntList platforms_ =
+              emptyIntList();
+          private static final     com.google.protobuf.Internal.IntListAdapter.IntConverter<
               com.acme.glup.MetadataProto.Platform> platforms_converter_ =
                   new com.google.protobuf.Internal.IntListAdapter.IntConverter<
                       com.acme.glup.MetadataProto.Platform>() {
@@ -17247,7 +17217,7 @@ private Builder(
             private void maybeForceBuilderInitialization() {
               if (com.google.protobuf.GeneratedMessage
                       .alwaysUseFieldBuilders) {
-                getFromFieldBuilder();
+                internalGetFromFieldBuilder();
               }
             }
             @java.lang.Override
@@ -17261,7 +17231,6 @@ public Builder clear() {
               }
               sourceNamespace_ = "";
               platforms_ = emptyIntList();
-              bitField0_ = (bitField0_ & ~0x00000004);
               return this;
             }
 
@@ -17288,20 +17257,11 @@ public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.BackupOpt
             @java.lang.Override
             public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.BackupOptions buildPartial() {
               com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.BackupOptions result = new com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.BackupOptions(this);
-              buildPartialRepeatedFields(result);
               if (bitField0_ != 0) { buildPartial0(result); }
               onBuilt();
               return result;
             }
 
-            private void buildPartialRepeatedFields(com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.BackupOptions result) {
-              if (((bitField0_ & 0x00000004) != 0)) {
-                platforms_.makeImmutable();
-                bitField0_ = (bitField0_ & ~0x00000004);
-              }
-              result.platforms_ = platforms_;
-            }
-
             private void buildPartial0(com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.BackupOptions result) {
               int from_bitField0_ = bitField0_;
               int to_bitField0_ = 0;
@@ -17314,6 +17274,10 @@ private void buildPartial0(com.acme.glup.MetadataProto.HDFSOptions.ImportOptions
               if (((from_bitField0_ & 0x00000002) != 0)) {
                 result.sourceNamespace_ = sourceNamespace_;
               }
+              if (((from_bitField0_ & 0x00000004) != 0)) {
+                platforms_.makeImmutable();
+                result.platforms_ = platforms_;
+              }
               result.bitField0_ |= to_bitField0_;
             }
 
@@ -17340,7 +17304,8 @@ public Builder mergeFrom(com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.G
               if (!other.platforms_.isEmpty()) {
                 if (platforms_.isEmpty()) {
                   platforms_ = other.platforms_;
-                  bitField0_ = (bitField0_ & ~0x00000004);
+                  platforms_.makeImmutable();
+                  bitField0_ |= 0x00000004;
                 } else {
                   ensurePlatformsIsMutable();
                   platforms_.addAll(other.platforms_);
@@ -17375,7 +17340,7 @@ public Builder mergeFrom(
                       break;
                     case 10: {
                       input.readMessage(
-                          getFromFieldBuilder().getBuilder(),
+                          internalGetFromFieldBuilder().getBuilder(),
                           extensionRegistry);
                       bitField0_ |= 0x00000001;
                       break;
@@ -17393,13 +17358,12 @@ public Builder mergeFrom(
                     } // case 24
                     case 26: {
                       int length = input.readRawVarint32();
-                      int oldLimit = input.pushLimit(length);
-                      while(input.getBytesUntilLimit() > 0) {
-                        int tmpRaw = input.readEnum();
-                        ensurePlatformsIsMutable();
-                        platforms_.addInt(tmpRaw);
+                      int limit = input.pushLimit(length);
+                      ensurePlatformsIsMutable();
+                      while (input.getBytesUntilLimit() > 0) {
+                        platforms_.addInt(input.readEnum());
                       }
-                      input.popLimit(oldLimit);
+                      input.popLimit(limit);
                       break;
                     } // case 26
                     default: {
@@ -17538,7 +17502,7 @@ public Builder clearFrom() {
             public com.acme.glup.MetadataProto.Location.Builder getFromBuilder() {
               bitField0_ |= 0x00000001;
               onChanged();
-              return getFromFieldBuilder().getBuilder();
+              return internalGetFromFieldBuilder().getBuilder();
             }
             /**
              * 
@@ -17564,7 +17528,7 @@ public com.acme.glup.MetadataProto.LocationOrBuilder getFromOrBuilder() {
              */
             private com.google.protobuf.SingleFieldBuilder<
                 com.acme.glup.MetadataProto.Location, com.acme.glup.MetadataProto.Location.Builder, com.acme.glup.MetadataProto.LocationOrBuilder> 
-                getFromFieldBuilder() {
+                internalGetFromFieldBuilder() {
               if (fromBuilder_ == null) {
                 fromBuilder_ = new com.google.protobuf.SingleFieldBuilder<
                     com.acme.glup.MetadataProto.Location, com.acme.glup.MetadataProto.Location.Builder, com.acme.glup.MetadataProto.LocationOrBuilder>(
@@ -17668,13 +17632,12 @@ public Builder setSourceNamespaceBytes(
               return this;
             }
 
-            private com.google.protobuf.Internal.IntList platforms_ =
-              emptyIntList();
+            private com.google.protobuf.Internal.IntList platforms_ = emptyIntList();
             private void ensurePlatformsIsMutable() {
-              if (!((bitField0_ & 0x00000004) != 0)) {
+              if (!platforms_.isModifiable()) {
                 platforms_ = makeMutableCopy(platforms_);
-                bitField0_ |= 0x00000004;
               }
+              bitField0_ |= 0x00000004;
             }
             /**
              * 
@@ -17723,9 +17686,7 @@ public com.acme.glup.MetadataProto.Platform getPlatforms(int index) {
              */
             public Builder setPlatforms(
                 int index, com.acme.glup.MetadataProto.Platform value) {
-              if (value == null) {
-                throw new NullPointerException();
-              }
+              if (value == null) { throw new NullPointerException(); }
               ensurePlatformsIsMutable();
               platforms_.setInt(index, value.getNumber());
               onChanged();
@@ -17741,9 +17702,7 @@ public Builder setPlatforms(
              * @return This builder for chaining.
              */
             public Builder addPlatforms(com.acme.glup.MetadataProto.Platform value) {
-              if (value == null) {
-                throw new NullPointerException();
-              }
+              if (value == null) { throw new NullPointerException(); }
               ensurePlatformsIsMutable();
               platforms_.addInt(value.getNumber());
               onChanged();
@@ -17791,7 +17750,8 @@ public Builder clearPlatforms() {
              */
             public java.util.List
             getPlatformsValueList() {
-              return java.util.Collections.unmodifiableList(platforms_);
+              platforms_.makeImmutable();
+              return platforms_;
             }
             /**
              * 
@@ -18055,8 +18015,8 @@ public static final class TranscodingOptions extends
             com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
               com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
               /* major= */ 4,
-              /* minor= */ 29,
-              /* patch= */ 3,
+              /* minor= */ 31,
+              /* patch= */ 1,
               /* suffix= */ "",
               TranscodingOptions.class.getName());
           }
@@ -19013,9 +18973,7 @@ public com.acme.glup.MetadataProto.HDFSDataFormat getInputFormat() {
              * @return This builder for chaining.
              */
             public Builder setInputFormat(com.acme.glup.MetadataProto.HDFSDataFormat value) {
-              if (value == null) {
-                throw new NullPointerException();
-              }
+              if (value == null) { throw new NullPointerException(); }
               bitField0_ |= 0x00000004;
               inputFormat_ = value.getNumber();
               onChanged();
@@ -19086,9 +19044,7 @@ public com.acme.glup.MetadataProto.HDFSDataFormat getOutputFormat() {
              * @return This builder for chaining.
              */
             public Builder setOutputFormat(com.acme.glup.MetadataProto.HDFSDataFormat value) {
-              if (value == null) {
-                throw new NullPointerException();
-              }
+              if (value == null) { throw new NullPointerException(); }
               bitField0_ |= 0x00000008;
               outputFormat_ = value.getNumber();
               onChanged();
@@ -19494,8 +19450,8 @@ public static final class SamplerOptions extends
             com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
               com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
               /* major= */ 4,
-              /* minor= */ 29,
-              /* patch= */ 3,
+              /* minor= */ 31,
+              /* patch= */ 1,
               /* suffix= */ "",
               SamplerOptions.class.getName());
           }
@@ -20046,7 +20002,7 @@ public Builder mergeFrom(com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.G
                 bitField0_ |= 0x00000008;
                 onChanged();
               }
-              if (other.getSamplingRate() != 0F) {
+              if (java.lang.Float.floatToRawIntBits(other.getSamplingRate()) != 0) {
                 setSamplingRate(other.getSamplingRate());
               }
               this.mergeUnknownFields(other.getUnknownFields());
@@ -20722,8 +20678,8 @@ public static final class ComparatorOptions extends
             com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
               com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
               /* major= */ 4,
-              /* minor= */ 29,
-              /* patch= */ 3,
+              /* minor= */ 31,
+              /* patch= */ 1,
               /* suffix= */ "",
               ComparatorOptions.class.getName());
           }
@@ -22074,8 +22030,8 @@ public static final class ExternalOptions extends
             com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
               com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
               /* major= */ 4,
-              /* minor= */ 29,
-              /* patch= */ 3,
+              /* minor= */ 31,
+              /* patch= */ 1,
               /* suffix= */ "",
               ExternalOptions.class.getName());
           }
@@ -23301,17 +23257,17 @@ private Builder(
           private void maybeForceBuilderInitialization() {
             if (com.google.protobuf.GeneratedMessage
                     .alwaysUseFieldBuilders) {
-              getDataloaderFieldBuilder();
-              getKafka2HdfsFieldBuilder();
-              getSyncFieldBuilder();
-              getExternalFieldBuilder();
-              getBackupFieldBuilder();
-              getTranscodingFieldBuilder();
-              getKacohaFieldBuilder();
-              getDeduplicateFieldBuilder();
-              getSamplerFieldBuilder();
-              getComparatorFieldBuilder();
-              getToFieldBuilder();
+              internalGetDataloaderFieldBuilder();
+              internalGetKafka2HdfsFieldBuilder();
+              internalGetSyncFieldBuilder();
+              internalGetExternalFieldBuilder();
+              internalGetBackupFieldBuilder();
+              internalGetTranscodingFieldBuilder();
+              internalGetKacohaFieldBuilder();
+              internalGetDeduplicateFieldBuilder();
+              internalGetSamplerFieldBuilder();
+              internalGetComparatorFieldBuilder();
+              internalGetToFieldBuilder();
             }
           }
           @java.lang.Override
@@ -23563,7 +23519,7 @@ public Builder mergeFrom(com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.G
                   bitField0_ = (bitField0_ & ~0x00000400);
                   toBuilder_ = 
                     com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                       getToFieldBuilder() : null;
+                       internalGetToFieldBuilder() : null;
                 } else {
                   toBuilder_.addAllMessages(other.to_);
                 }
@@ -23615,70 +23571,70 @@ public Builder mergeFrom(
                     break;
                   case 10: {
                     input.readMessage(
-                        getDataloaderFieldBuilder().getBuilder(),
+                        internalGetDataloaderFieldBuilder().getBuilder(),
                         extensionRegistry);
                     bitField0_ |= 0x00000001;
                     break;
                   } // case 10
                   case 18: {
                     input.readMessage(
-                        getKafka2HdfsFieldBuilder().getBuilder(),
+                        internalGetKafka2HdfsFieldBuilder().getBuilder(),
                         extensionRegistry);
                     bitField0_ |= 0x00000002;
                     break;
                   } // case 18
                   case 26: {
                     input.readMessage(
-                        getSyncFieldBuilder().getBuilder(),
+                        internalGetSyncFieldBuilder().getBuilder(),
                         extensionRegistry);
                     bitField0_ |= 0x00000004;
                     break;
                   } // case 26
                   case 34: {
                     input.readMessage(
-                        getExternalFieldBuilder().getBuilder(),
+                        internalGetExternalFieldBuilder().getBuilder(),
                         extensionRegistry);
                     bitField0_ |= 0x00000008;
                     break;
                   } // case 34
                   case 42: {
                     input.readMessage(
-                        getBackupFieldBuilder().getBuilder(),
+                        internalGetBackupFieldBuilder().getBuilder(),
                         extensionRegistry);
                     bitField0_ |= 0x00000010;
                     break;
                   } // case 42
                   case 50: {
                     input.readMessage(
-                        getTranscodingFieldBuilder().getBuilder(),
+                        internalGetTranscodingFieldBuilder().getBuilder(),
                         extensionRegistry);
                     bitField0_ |= 0x00000020;
                     break;
                   } // case 50
                   case 58: {
                     input.readMessage(
-                        getKacohaFieldBuilder().getBuilder(),
+                        internalGetKacohaFieldBuilder().getBuilder(),
                         extensionRegistry);
                     bitField0_ |= 0x00000040;
                     break;
                   } // case 58
                   case 66: {
                     input.readMessage(
-                        getDeduplicateFieldBuilder().getBuilder(),
+                        internalGetDeduplicateFieldBuilder().getBuilder(),
                         extensionRegistry);
                     bitField0_ |= 0x00000080;
                     break;
                   } // case 66
                   case 74: {
                     input.readMessage(
-                        getSamplerFieldBuilder().getBuilder(),
+                        internalGetSamplerFieldBuilder().getBuilder(),
                         extensionRegistry);
                     bitField0_ |= 0x00000100;
                     break;
                   } // case 74
                   case 82: {
                     input.readMessage(
-                        getComparatorFieldBuilder().getBuilder(),
+                        internalGetComparatorFieldBuilder().getBuilder(),
                         extensionRegistry);
                     bitField0_ |= 0x00000200;
                     break;
@@ -23852,7 +23808,7 @@ public Builder clearDataloader() {
           public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.DataloaderOptions.Builder getDataloaderBuilder() {
             bitField0_ |= 0x00000001;
             onChanged();
-            return getDataloaderFieldBuilder().getBuilder();
+            return internalGetDataloaderFieldBuilder().getBuilder();
           }
           /**
            * 
@@ -23878,7 +23834,7 @@ public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.Dataloade
            */
           private com.google.protobuf.SingleFieldBuilder<
               com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.DataloaderOptions, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.DataloaderOptions.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.DataloaderOptionsOrBuilder> 
-              getDataloaderFieldBuilder() {
+              internalGetDataloaderFieldBuilder() {
             if (dataloaderBuilder_ == null) {
               dataloaderBuilder_ = new com.google.protobuf.SingleFieldBuilder<
                   com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.DataloaderOptions, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.DataloaderOptions.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.DataloaderOptionsOrBuilder>(
@@ -23981,7 +23937,7 @@ public Builder clearKafka2Hdfs() {
           public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.Kafka2HdfsOptions.Builder getKafka2HdfsBuilder() {
             bitField0_ |= 0x00000002;
             onChanged();
-            return getKafka2HdfsFieldBuilder().getBuilder();
+            return internalGetKafka2HdfsFieldBuilder().getBuilder();
           }
           /**
            * .Acme.Glup.HDFSOptions.ImportOptions.Generator.Kafka2HdfsOptions kafka2hdfs = 2;
@@ -23999,7 +23955,7 @@ public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.Kafka2Hdf
            */
           private com.google.protobuf.SingleFieldBuilder<
               com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.Kafka2HdfsOptions, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.Kafka2HdfsOptions.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.Kafka2HdfsOptionsOrBuilder> 
-              getKafka2HdfsFieldBuilder() {
+              internalGetKafka2HdfsFieldBuilder() {
             if (kafka2HdfsBuilder_ == null) {
               kafka2HdfsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
                   com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.Kafka2HdfsOptions, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.Kafka2HdfsOptions.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.Kafka2HdfsOptionsOrBuilder>(
@@ -24102,7 +24058,7 @@ public Builder clearSync() {
           public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.SyncOptions.Builder getSyncBuilder() {
             bitField0_ |= 0x00000004;
             onChanged();
-            return getSyncFieldBuilder().getBuilder();
+            return internalGetSyncFieldBuilder().getBuilder();
           }
           /**
            * .Acme.Glup.HDFSOptions.ImportOptions.Generator.SyncOptions sync = 3;
@@ -24120,7 +24076,7 @@ public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.SyncOptio
            */
           private com.google.protobuf.SingleFieldBuilder<
               com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.SyncOptions, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.SyncOptions.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.SyncOptionsOrBuilder> 
-              getSyncFieldBuilder() {
+              internalGetSyncFieldBuilder() {
             if (syncBuilder_ == null) {
               syncBuilder_ = new com.google.protobuf.SingleFieldBuilder<
                   com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.SyncOptions, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.SyncOptions.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.SyncOptionsOrBuilder>(
@@ -24223,7 +24179,7 @@ public Builder clearExternal() {
           public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.ExternalOptions.Builder getExternalBuilder() {
             bitField0_ |= 0x00000008;
             onChanged();
-            return getExternalFieldBuilder().getBuilder();
+            return internalGetExternalFieldBuilder().getBuilder();
           }
           /**
            * .Acme.Glup.HDFSOptions.ImportOptions.Generator.ExternalOptions external = 4;
@@ -24241,7 +24197,7 @@ public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.ExternalO
            */
           private com.google.protobuf.SingleFieldBuilder<
               com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.ExternalOptions, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.ExternalOptions.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.ExternalOptionsOrBuilder> 
-              getExternalFieldBuilder() {
+              internalGetExternalFieldBuilder() {
             if (externalBuilder_ == null) {
               externalBuilder_ = new com.google.protobuf.SingleFieldBuilder<
                   com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.ExternalOptions, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.ExternalOptions.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.ExternalOptionsOrBuilder>(
@@ -24344,7 +24300,7 @@ public Builder clearBackup() {
           public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.BackupOptions.Builder getBackupBuilder() {
             bitField0_ |= 0x00000010;
             onChanged();
-            return getBackupFieldBuilder().getBuilder();
+            return internalGetBackupFieldBuilder().getBuilder();
           }
           /**
            * .Acme.Glup.HDFSOptions.ImportOptions.Generator.BackupOptions backup = 5;
@@ -24362,7 +24318,7 @@ public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.BackupOpt
            */
           private com.google.protobuf.SingleFieldBuilder<
               com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.BackupOptions, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.BackupOptions.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.BackupOptionsOrBuilder> 
-              getBackupFieldBuilder() {
+              internalGetBackupFieldBuilder() {
             if (backupBuilder_ == null) {
               backupBuilder_ = new com.google.protobuf.SingleFieldBuilder<
                   com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.BackupOptions, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.BackupOptions.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.BackupOptionsOrBuilder>(
@@ -24465,7 +24421,7 @@ public Builder clearTranscoding() {
           public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.TranscodingOptions.Builder getTranscodingBuilder() {
             bitField0_ |= 0x00000020;
             onChanged();
-            return getTranscodingFieldBuilder().getBuilder();
+            return internalGetTranscodingFieldBuilder().getBuilder();
           }
           /**
            * .Acme.Glup.HDFSOptions.ImportOptions.Generator.TranscodingOptions transcoding = 6;
@@ -24483,7 +24439,7 @@ public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.Transcodi
            */
           private com.google.protobuf.SingleFieldBuilder<
               com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.TranscodingOptions, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.TranscodingOptions.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.TranscodingOptionsOrBuilder> 
-              getTranscodingFieldBuilder() {
+              internalGetTranscodingFieldBuilder() {
             if (transcodingBuilder_ == null) {
               transcodingBuilder_ = new com.google.protobuf.SingleFieldBuilder<
                   com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.TranscodingOptions, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.TranscodingOptions.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.TranscodingOptionsOrBuilder>(
@@ -24586,7 +24542,7 @@ public Builder clearKacoha() {
           public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KaCoHaOptions.Builder getKacohaBuilder() {
             bitField0_ |= 0x00000040;
             onChanged();
-            return getKacohaFieldBuilder().getBuilder();
+            return internalGetKacohaFieldBuilder().getBuilder();
           }
           /**
            * .Acme.Glup.HDFSOptions.ImportOptions.Generator.KaCoHaOptions kacoha = 7;
@@ -24604,7 +24560,7 @@ public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KaCoHaOpt
            */
           private com.google.protobuf.SingleFieldBuilder<
               com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KaCoHaOptions, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KaCoHaOptions.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KaCoHaOptionsOrBuilder> 
-              getKacohaFieldBuilder() {
+              internalGetKacohaFieldBuilder() {
             if (kacohaBuilder_ == null) {
               kacohaBuilder_ = new com.google.protobuf.SingleFieldBuilder<
                   com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KaCoHaOptions, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KaCoHaOptions.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.KaCoHaOptionsOrBuilder>(
@@ -24707,7 +24663,7 @@ public Builder clearDeduplicate() {
           public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.DedupOptions.Builder getDeduplicateBuilder() {
             bitField0_ |= 0x00000080;
             onChanged();
-            return getDeduplicateFieldBuilder().getBuilder();
+            return internalGetDeduplicateFieldBuilder().getBuilder();
           }
           /**
            * .Acme.Glup.HDFSOptions.ImportOptions.Generator.DedupOptions deduplicate = 8;
@@ -24725,7 +24681,7 @@ public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.DedupOpti
            */
           private com.google.protobuf.SingleFieldBuilder<
               com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.DedupOptions, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.DedupOptions.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.DedupOptionsOrBuilder> 
-              getDeduplicateFieldBuilder() {
+              internalGetDeduplicateFieldBuilder() {
             if (deduplicateBuilder_ == null) {
               deduplicateBuilder_ = new com.google.protobuf.SingleFieldBuilder<
                   com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.DedupOptions, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.DedupOptions.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.DedupOptionsOrBuilder>(
@@ -24828,7 +24784,7 @@ public Builder clearSampler() {
           public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.SamplerOptions.Builder getSamplerBuilder() {
             bitField0_ |= 0x00000100;
             onChanged();
-            return getSamplerFieldBuilder().getBuilder();
+            return internalGetSamplerFieldBuilder().getBuilder();
           }
           /**
            * .Acme.Glup.HDFSOptions.ImportOptions.Generator.SamplerOptions sampler = 9;
@@ -24846,7 +24802,7 @@ public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.SamplerOp
            */
           private com.google.protobuf.SingleFieldBuilder<
               com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.SamplerOptions, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.SamplerOptions.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.SamplerOptionsOrBuilder> 
-              getSamplerFieldBuilder() {
+              internalGetSamplerFieldBuilder() {
             if (samplerBuilder_ == null) {
               samplerBuilder_ = new com.google.protobuf.SingleFieldBuilder<
                   com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.SamplerOptions, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.SamplerOptions.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.SamplerOptionsOrBuilder>(
@@ -24977,7 +24933,7 @@ public Builder clearComparator() {
           public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.ComparatorOptions.Builder getComparatorBuilder() {
             bitField0_ |= 0x00000200;
             onChanged();
-            return getComparatorFieldBuilder().getBuilder();
+            return internalGetComparatorFieldBuilder().getBuilder();
           }
           /**
            * 
@@ -25003,7 +24959,7 @@ public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.Comparato
            */
           private com.google.protobuf.SingleFieldBuilder<
               com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.ComparatorOptions, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.ComparatorOptions.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.ComparatorOptionsOrBuilder> 
-              getComparatorFieldBuilder() {
+              internalGetComparatorFieldBuilder() {
             if (comparatorBuilder_ == null) {
               comparatorBuilder_ = new com.google.protobuf.SingleFieldBuilder<
                   com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.ComparatorOptions, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.ComparatorOptions.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.ComparatorOptionsOrBuilder>(
@@ -25247,7 +25203,7 @@ public Builder removeTo(int index) {
            */
           public com.acme.glup.MetadataProto.Location.Builder getToBuilder(
               int index) {
-            return getToFieldBuilder().getBuilder(index);
+            return internalGetToFieldBuilder().getBuilder(index);
           }
           /**
            * 
@@ -25286,7 +25242,7 @@ public com.acme.glup.MetadataProto.LocationOrBuilder getToOrBuilder(
            * repeated .Acme.Glup.Location to = 250;
            */
           public com.acme.glup.MetadataProto.Location.Builder addToBuilder() {
-            return getToFieldBuilder().addBuilder(
+            return internalGetToFieldBuilder().addBuilder(
                 com.acme.glup.MetadataProto.Location.getDefaultInstance());
           }
           /**
@@ -25298,7 +25254,7 @@ public com.acme.glup.MetadataProto.Location.Builder addToBuilder() {
            */
           public com.acme.glup.MetadataProto.Location.Builder addToBuilder(
               int index) {
-            return getToFieldBuilder().addBuilder(
+            return internalGetToFieldBuilder().addBuilder(
                 index, com.acme.glup.MetadataProto.Location.getDefaultInstance());
           }
           /**
@@ -25310,11 +25266,11 @@ public com.acme.glup.MetadataProto.Location.Builder addToBuilder(
            */
           public java.util.List 
                getToBuilderList() {
-            return getToFieldBuilder().getBuilderList();
+            return internalGetToFieldBuilder().getBuilderList();
           }
           private com.google.protobuf.RepeatedFieldBuilder<
               com.acme.glup.MetadataProto.Location, com.acme.glup.MetadataProto.Location.Builder, com.acme.glup.MetadataProto.LocationOrBuilder> 
-              getToFieldBuilder() {
+              internalGetToFieldBuilder() {
             if (toBuilder_ == null) {
               toBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
                   com.acme.glup.MetadataProto.Location, com.acme.glup.MetadataProto.Location.Builder, com.acme.glup.MetadataProto.LocationOrBuilder>(
@@ -26298,7 +26254,7 @@ public Builder mergeFrom(com.acme.glup.MetadataProto.HDFSOptions.ImportOptions o
                 bitField0_ = (bitField0_ & ~0x00000020);
                 generatorBuilder_ = 
                   com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                     getGeneratorFieldBuilder() : null;
+                     internalGetGeneratorFieldBuilder() : null;
               } else {
                 generatorBuilder_.addAllMessages(other.generator_);
               }
@@ -26324,7 +26280,7 @@ public Builder mergeFrom(com.acme.glup.MetadataProto.HDFSOptions.ImportOptions o
                 bitField0_ = (bitField0_ & ~0x00000040);
                 viewBuilder_ = 
                   com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                     getViewFieldBuilder() : null;
+                     internalGetViewFieldBuilder() : null;
               } else {
                 viewBuilder_.addAllMessages(other.view_);
               }
@@ -26622,9 +26578,7 @@ public com.acme.glup.MetadataProto.PartitionScheme getPartitioning() {
          * @return This builder for chaining.
          */
         public Builder setPartitioning(com.acme.glup.MetadataProto.PartitionScheme value) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          if (value == null) { throw new NullPointerException(); }
           bitField0_ |= 0x00000004;
           partitioning_ = value.getNumber();
           onChanged();
@@ -26675,9 +26629,7 @@ public com.acme.glup.MetadataProto.HDFSDataFormat getFormat() {
          * @return This builder for chaining.
          */
         public Builder setFormat(com.acme.glup.MetadataProto.HDFSDataFormat value) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          if (value == null) { throw new NullPointerException(); }
           bitField0_ |= 0x00000008;
           format_ = value.getNumber();
           onChanged();
@@ -26921,7 +26873,7 @@ public Builder removeGenerator(int index) {
          */
         public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.Builder getGeneratorBuilder(
             int index) {
-          return getGeneratorFieldBuilder().getBuilder(index);
+          return internalGetGeneratorFieldBuilder().getBuilder(index);
         }
         /**
          * repeated .Acme.Glup.HDFSOptions.ImportOptions.Generator generator = 11;
@@ -26948,7 +26900,7 @@ public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.GeneratorOrBuilder
          * repeated .Acme.Glup.HDFSOptions.ImportOptions.Generator generator = 11;
          */
         public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.Builder addGeneratorBuilder() {
-          return getGeneratorFieldBuilder().addBuilder(
+          return internalGetGeneratorFieldBuilder().addBuilder(
               com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.getDefaultInstance());
         }
         /**
@@ -26956,7 +26908,7 @@ public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.Builder a
          */
         public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.Builder addGeneratorBuilder(
             int index) {
-          return getGeneratorFieldBuilder().addBuilder(
+          return internalGetGeneratorFieldBuilder().addBuilder(
               index, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.getDefaultInstance());
         }
         /**
@@ -26964,11 +26916,11 @@ public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.Builder a
          */
         public java.util.List 
              getGeneratorBuilderList() {
-          return getGeneratorFieldBuilder().getBuilderList();
+          return internalGetGeneratorFieldBuilder().getBuilderList();
         }
         private com.google.protobuf.RepeatedFieldBuilder<
             com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.GeneratorOrBuilder> 
-            getGeneratorFieldBuilder() {
+            internalGetGeneratorFieldBuilder() {
           if (generatorBuilder_ == null) {
             generatorBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
                 com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Generator.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.GeneratorOrBuilder>(
@@ -27161,7 +27113,7 @@ public Builder removeView(int index) {
          */
         public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.View.Builder getViewBuilder(
             int index) {
-          return getViewFieldBuilder().getBuilder(index);
+          return internalGetViewFieldBuilder().getBuilder(index);
         }
         /**
          * repeated .Acme.Glup.HDFSOptions.ImportOptions.View view = 12;
@@ -27188,7 +27140,7 @@ public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.ViewOrBuilder getVi
          * repeated .Acme.Glup.HDFSOptions.ImportOptions.View view = 12;
          */
         public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.View.Builder addViewBuilder() {
-          return getViewFieldBuilder().addBuilder(
+          return internalGetViewFieldBuilder().addBuilder(
               com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.View.getDefaultInstance());
         }
         /**
@@ -27196,7 +27148,7 @@ public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.View.Builder addVie
          */
         public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.View.Builder addViewBuilder(
             int index) {
-          return getViewFieldBuilder().addBuilder(
+          return internalGetViewFieldBuilder().addBuilder(
               index, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.View.getDefaultInstance());
         }
         /**
@@ -27204,11 +27156,11 @@ public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.View.Builder addVie
          */
         public java.util.List 
              getViewBuilderList() {
-          return getViewFieldBuilder().getBuilderList();
+          return internalGetViewFieldBuilder().getBuilderList();
         }
         private com.google.protobuf.RepeatedFieldBuilder<
             com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.View, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.View.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.ViewOrBuilder> 
-            getViewFieldBuilder() {
+            internalGetViewFieldBuilder() {
           if (viewBuilder_ == null) {
             viewBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
                 com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.View, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.View.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.ViewOrBuilder>(
@@ -27593,7 +27545,7 @@ public Builder mergeFrom(com.acme.glup.MetadataProto.HDFSOptions other) {
               bitField0_ = (bitField0_ & ~0x00000001);
               importBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getImportFieldBuilder() : null;
+                   internalGetImportFieldBuilder() : null;
             } else {
               importBuilder_.addAllMessages(other.import_);
             }
@@ -27835,7 +27787,7 @@ public Builder removeImport(int index) {
        */
       public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Builder getImportBuilder(
           int index) {
-        return getImportFieldBuilder().getBuilder(index);
+        return internalGetImportFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .Acme.Glup.HDFSOptions.ImportOptions import = 3;
@@ -27862,7 +27814,7 @@ public com.acme.glup.MetadataProto.HDFSOptions.ImportOptionsOrBuilder getImportO
        * repeated .Acme.Glup.HDFSOptions.ImportOptions import = 3;
        */
       public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Builder addImportBuilder() {
-        return getImportFieldBuilder().addBuilder(
+        return internalGetImportFieldBuilder().addBuilder(
             com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.getDefaultInstance());
       }
       /**
@@ -27870,7 +27822,7 @@ public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Builder addImportBu
        */
       public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Builder addImportBuilder(
           int index) {
-        return getImportFieldBuilder().addBuilder(
+        return internalGetImportFieldBuilder().addBuilder(
             index, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.getDefaultInstance());
       }
       /**
@@ -27878,11 +27830,11 @@ public com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Builder addImportBu
        */
       public java.util.List 
            getImportBuilderList() {
-        return getImportFieldBuilder().getBuilderList();
+        return internalGetImportFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           com.acme.glup.MetadataProto.HDFSOptions.ImportOptions, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptionsOrBuilder> 
-          getImportFieldBuilder() {
+          internalGetImportFieldBuilder() {
         if (importBuilder_ == null) {
           importBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               com.acme.glup.MetadataProto.HDFSOptions.ImportOptions, com.acme.glup.MetadataProto.HDFSOptions.ImportOptions.Builder, com.acme.glup.MetadataProto.HDFSOptions.ImportOptionsOrBuilder>(
@@ -27987,8 +27939,8 @@ public static final class ProducerTransportOptions extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         ProducerTransportOptions.class.getName());
     }
@@ -28545,8 +28497,8 @@ public static final class PropertyOptions extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         PropertyOptions.class.getName());
     }
@@ -29260,8 +29212,8 @@ public static final class GlupOptions extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         GlupOptions.class.getName());
     }
@@ -29834,11 +29786,11 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getKafkaFieldBuilder();
-          getHdfsFieldBuilder();
-          getDatasetFieldBuilder();
-          getProducersFieldBuilder();
-          getPropertiesFieldBuilder();
+          internalGetKafkaFieldBuilder();
+          internalGetHdfsFieldBuilder();
+          internalGetDatasetFieldBuilder();
+          internalGetProducersFieldBuilder();
+          internalGetPropertiesFieldBuilder();
         }
       }
       @java.lang.Override
@@ -30002,7 +29954,7 @@ public Builder mergeFrom(com.acme.glup.MetadataProto.GlupOptions other) {
               bitField0_ = (bitField0_ & ~0x00000010);
               datasetBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getDatasetFieldBuilder() : null;
+                   internalGetDatasetFieldBuilder() : null;
             } else {
               datasetBuilder_.addAllMessages(other.dataset_);
             }
@@ -30045,14 +29997,14 @@ public Builder mergeFrom(
                 break;
               case 10: {
                 input.readMessage(
-                    getKafkaFieldBuilder().getBuilder(),
+                    internalGetKafkaFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000001;
                 break;
               } // case 10
               case 18: {
                 input.readMessage(
-                    getHdfsFieldBuilder().getBuilder(),
+                    internalGetHdfsFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000002;
                 break;
@@ -30087,14 +30039,14 @@ public Builder mergeFrom(
               } // case 48
               case 58: {
                 input.readMessage(
-                    getProducersFieldBuilder().getBuilder(),
+                    internalGetProducersFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000040;
                 break;
               } // case 58
               case 66: {
                 input.readMessage(
-                    getPropertiesFieldBuilder().getBuilder(),
+                    internalGetPropertiesFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000080;
                 break;
@@ -30235,7 +30187,7 @@ public Builder clearKafka() {
       public com.acme.glup.MetadataProto.KafkaMessageOptions.Builder getKafkaBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
-        return getKafkaFieldBuilder().getBuilder();
+        return internalGetKafkaFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -30261,7 +30213,7 @@ public com.acme.glup.MetadataProto.KafkaMessageOptionsOrBuilder getKafkaOrBuilde
        */
       private com.google.protobuf.SingleFieldBuilder<
           com.acme.glup.MetadataProto.KafkaMessageOptions, com.acme.glup.MetadataProto.KafkaMessageOptions.Builder, com.acme.glup.MetadataProto.KafkaMessageOptionsOrBuilder> 
-          getKafkaFieldBuilder() {
+          internalGetKafkaFieldBuilder() {
         if (kafkaBuilder_ == null) {
           kafkaBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               com.acme.glup.MetadataProto.KafkaMessageOptions, com.acme.glup.MetadataProto.KafkaMessageOptions.Builder, com.acme.glup.MetadataProto.KafkaMessageOptionsOrBuilder>(
@@ -30392,7 +30344,7 @@ public Builder clearHdfs() {
       public com.acme.glup.MetadataProto.HDFSOptions.Builder getHdfsBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
-        return getHdfsFieldBuilder().getBuilder();
+        return internalGetHdfsFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -30418,7 +30370,7 @@ public com.acme.glup.MetadataProto.HDFSOptionsOrBuilder getHdfsOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           com.acme.glup.MetadataProto.HDFSOptions, com.acme.glup.MetadataProto.HDFSOptions.Builder, com.acme.glup.MetadataProto.HDFSOptionsOrBuilder> 
-          getHdfsFieldBuilder() {
+          internalGetHdfsFieldBuilder() {
         if (hdfsBuilder_ == null) {
           hdfsBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               com.acme.glup.MetadataProto.HDFSOptions, com.acme.glup.MetadataProto.HDFSOptions.Builder, com.acme.glup.MetadataProto.HDFSOptionsOrBuilder>(
@@ -30750,7 +30702,7 @@ public Builder removeDataset(int index) {
        */
       public com.acme.glup.MetadataProto.DataSet.Builder getDatasetBuilder(
           int index) {
-        return getDatasetFieldBuilder().getBuilder(index);
+        return internalGetDatasetFieldBuilder().getBuilder(index);
       }
       /**
        * 
@@ -30789,7 +30741,7 @@ public com.acme.glup.MetadataProto.DataSetOrBuilder getDatasetOrBuilder(
        * repeated .Acme.Glup.DataSet dataset = 5;
        */
       public com.acme.glup.MetadataProto.DataSet.Builder addDatasetBuilder() {
-        return getDatasetFieldBuilder().addBuilder(
+        return internalGetDatasetFieldBuilder().addBuilder(
             com.acme.glup.MetadataProto.DataSet.getDefaultInstance());
       }
       /**
@@ -30801,7 +30753,7 @@ public com.acme.glup.MetadataProto.DataSet.Builder addDatasetBuilder() {
        */
       public com.acme.glup.MetadataProto.DataSet.Builder addDatasetBuilder(
           int index) {
-        return getDatasetFieldBuilder().addBuilder(
+        return internalGetDatasetFieldBuilder().addBuilder(
             index, com.acme.glup.MetadataProto.DataSet.getDefaultInstance());
       }
       /**
@@ -30813,11 +30765,11 @@ public com.acme.glup.MetadataProto.DataSet.Builder addDatasetBuilder(
        */
       public java.util.List 
            getDatasetBuilderList() {
-        return getDatasetFieldBuilder().getBuilderList();
+        return internalGetDatasetFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           com.acme.glup.MetadataProto.DataSet, com.acme.glup.MetadataProto.DataSet.Builder, com.acme.glup.MetadataProto.DataSetOrBuilder> 
-          getDatasetFieldBuilder() {
+          internalGetDatasetFieldBuilder() {
         if (datasetBuilder_ == null) {
           datasetBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               com.acme.glup.MetadataProto.DataSet, com.acme.glup.MetadataProto.DataSet.Builder, com.acme.glup.MetadataProto.DataSetOrBuilder>(
@@ -30993,7 +30945,7 @@ public Builder clearProducers() {
       public com.acme.glup.MetadataProto.ProducerTransportOptions.Builder getProducersBuilder() {
         bitField0_ |= 0x00000040;
         onChanged();
-        return getProducersFieldBuilder().getBuilder();
+        return internalGetProducersFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -31019,7 +30971,7 @@ public com.acme.glup.MetadataProto.ProducerTransportOptionsOrBuilder getProducer
        */
       private com.google.protobuf.SingleFieldBuilder<
           com.acme.glup.MetadataProto.ProducerTransportOptions, com.acme.glup.MetadataProto.ProducerTransportOptions.Builder, com.acme.glup.MetadataProto.ProducerTransportOptionsOrBuilder> 
-          getProducersFieldBuilder() {
+          internalGetProducersFieldBuilder() {
         if (producersBuilder_ == null) {
           producersBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               com.acme.glup.MetadataProto.ProducerTransportOptions, com.acme.glup.MetadataProto.ProducerTransportOptions.Builder, com.acme.glup.MetadataProto.ProducerTransportOptionsOrBuilder>(
@@ -31150,7 +31102,7 @@ public Builder clearProperties() {
       public com.acme.glup.MetadataProto.PropertyOptions.Builder getPropertiesBuilder() {
         bitField0_ |= 0x00000080;
         onChanged();
-        return getPropertiesFieldBuilder().getBuilder();
+        return internalGetPropertiesFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -31176,7 +31128,7 @@ public com.acme.glup.MetadataProto.PropertyOptionsOrBuilder getPropertiesOrBuild
        */
       private com.google.protobuf.SingleFieldBuilder<
           com.acme.glup.MetadataProto.PropertyOptions, com.acme.glup.MetadataProto.PropertyOptions.Builder, com.acme.glup.MetadataProto.PropertyOptionsOrBuilder> 
-          getPropertiesFieldBuilder() {
+          internalGetPropertiesFieldBuilder() {
         if (propertiesBuilder_ == null) {
           propertiesBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               com.acme.glup.MetadataProto.PropertyOptions, com.acme.glup.MetadataProto.PropertyOptions.Builder, com.acme.glup.MetadataProto.PropertyOptionsOrBuilder>(
@@ -31338,8 +31290,8 @@ public static final class GlupFieldOptions extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         GlupFieldOptions.class.getName());
     }
@@ -31389,8 +31341,9 @@ public boolean getSamplingKey() {
 
     public static final int DISABLED_PLATFORM_FIELD_NUMBER = 3;
     @SuppressWarnings("serial")
-    private com.google.protobuf.Internal.IntList disabledPlatform_;
-    private static final com.google.protobuf.Internal.IntListAdapter.IntConverter<
+    private com.google.protobuf.Internal.IntList disabledPlatform_ =
+        emptyIntList();
+    private static final     com.google.protobuf.Internal.IntListAdapter.IntConverter<
         com.acme.glup.MetadataProto.Platform> disabledPlatform_converter_ =
             new com.google.protobuf.Internal.IntListAdapter.IntConverter<
                 com.acme.glup.MetadataProto.Platform>() {
@@ -31790,7 +31743,6 @@ public Builder clear() {
         sampled_ = false;
         samplingKey_ = false;
         disabledPlatform_ = emptyIntList();
-        bitField0_ = (bitField0_ & ~0x00000004);
         shouldCleanPii_ = false;
         pendingDeletion_ = false;
         addedAt_ = "";
@@ -31820,20 +31772,11 @@ public com.acme.glup.MetadataProto.GlupFieldOptions build() {
       @java.lang.Override
       public com.acme.glup.MetadataProto.GlupFieldOptions buildPartial() {
         com.acme.glup.MetadataProto.GlupFieldOptions result = new com.acme.glup.MetadataProto.GlupFieldOptions(this);
-        buildPartialRepeatedFields(result);
         if (bitField0_ != 0) { buildPartial0(result); }
         onBuilt();
         return result;
       }
 
-      private void buildPartialRepeatedFields(com.acme.glup.MetadataProto.GlupFieldOptions result) {
-        if (((bitField0_ & 0x00000004) != 0)) {
-          disabledPlatform_.makeImmutable();
-          bitField0_ = (bitField0_ & ~0x00000004);
-        }
-        result.disabledPlatform_ = disabledPlatform_;
-      }
-
       private void buildPartial0(com.acme.glup.MetadataProto.GlupFieldOptions result) {
         int from_bitField0_ = bitField0_;
         if (((from_bitField0_ & 0x00000001) != 0)) {
@@ -31842,6 +31785,10 @@ private void buildPartial0(com.acme.glup.MetadataProto.GlupFieldOptions result)
         if (((from_bitField0_ & 0x00000002) != 0)) {
           result.samplingKey_ = samplingKey_;
         }
+        if (((from_bitField0_ & 0x00000004) != 0)) {
+          disabledPlatform_.makeImmutable();
+          result.disabledPlatform_ = disabledPlatform_;
+        }
         if (((from_bitField0_ & 0x00000008) != 0)) {
           result.shouldCleanPii_ = shouldCleanPii_;
         }
@@ -31874,7 +31821,8 @@ public Builder mergeFrom(com.acme.glup.MetadataProto.GlupFieldOptions other) {
         if (!other.disabledPlatform_.isEmpty()) {
           if (disabledPlatform_.isEmpty()) {
             disabledPlatform_ = other.disabledPlatform_;
-            bitField0_ = (bitField0_ & ~0x00000004);
+            disabledPlatform_.makeImmutable();
+            bitField0_ |= 0x00000004;
           } else {
             ensureDisabledPlatformIsMutable();
             disabledPlatform_.addAll(other.disabledPlatform_);
@@ -31936,13 +31884,12 @@ public Builder mergeFrom(
               } // case 24
               case 26: {
                 int length = input.readRawVarint32();
-                int oldLimit = input.pushLimit(length);
-                while(input.getBytesUntilLimit() > 0) {
-                  int tmpRaw = input.readEnum();
-                  ensureDisabledPlatformIsMutable();
-                  disabledPlatform_.addInt(tmpRaw);
+                int limit = input.pushLimit(length);
+                ensureDisabledPlatformIsMutable();
+                while (input.getBytesUntilLimit() > 0) {
+                  disabledPlatform_.addInt(input.readEnum());
                 }
-                input.popLimit(oldLimit);
+                input.popLimit(limit);
                 break;
               } // case 26
               case 32: {
@@ -32041,13 +31988,12 @@ public Builder clearSamplingKey() {
         return this;
       }
 
-      private com.google.protobuf.Internal.IntList disabledPlatform_ =
-        emptyIntList();
+      private com.google.protobuf.Internal.IntList disabledPlatform_ = emptyIntList();
       private void ensureDisabledPlatformIsMutable() {
-        if (!((bitField0_ & 0x00000004) != 0)) {
+        if (!disabledPlatform_.isModifiable()) {
           disabledPlatform_ = makeMutableCopy(disabledPlatform_);
-          bitField0_ |= 0x00000004;
         }
+        bitField0_ |= 0x00000004;
       }
       /**
        * repeated .Acme.Glup.Platform disabled_platform = 3;
@@ -32080,9 +32026,7 @@ public com.acme.glup.MetadataProto.Platform getDisabledPlatform(int index) {
        */
       public Builder setDisabledPlatform(
           int index, com.acme.glup.MetadataProto.Platform value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         ensureDisabledPlatformIsMutable();
         disabledPlatform_.setInt(index, value.getNumber());
         onChanged();
@@ -32094,9 +32038,7 @@ public Builder setDisabledPlatform(
        * @return This builder for chaining.
        */
       public Builder addDisabledPlatform(com.acme.glup.MetadataProto.Platform value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         ensureDisabledPlatformIsMutable();
         disabledPlatform_.addInt(value.getNumber());
         onChanged();
@@ -32132,7 +32074,8 @@ public Builder clearDisabledPlatform() {
        */
       public java.util.List
       getDisabledPlatformValueList() {
-        return java.util.Collections.unmodifiableList(disabledPlatform_);
+        disabledPlatform_.makeImmutable();
+        return disabledPlatform_;
       }
       /**
        * repeated .Acme.Glup.Platform disabled_platform = 3;
@@ -32453,8 +32396,8 @@ public static final class JsonMapping extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         JsonMapping.class.getName());
     }
@@ -33103,8 +33046,8 @@ public static final class JsonAlias extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         JsonAlias.class.getName());
     }
@@ -33860,8 +33803,8 @@ public static final class BaseGlupMessage extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         BaseGlupMessage.class.getName());
     }
@@ -34381,9 +34324,9 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getGlupOriginFieldBuilder();
-          getPartitionFieldBuilder();
-          getControlMessageFieldBuilder();
+          internalGetGlupOriginFieldBuilder();
+          internalGetPartitionFieldBuilder();
+          internalGetControlMessageFieldBuilder();
         }
       }
       @java.lang.Override
@@ -34515,7 +34458,7 @@ public Builder mergeFrom(com.acme.glup.MetadataProto.BaseGlupMessage other) {
               bitField0_ = (bitField0_ & ~0x00000008);
               controlMessageBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getControlMessageFieldBuilder() : null;
+                   internalGetControlMessageFieldBuilder() : null;
             } else {
               controlMessageBuilder_.addAllMessages(other.controlMessage_);
             }
@@ -34549,14 +34492,14 @@ public Builder mergeFrom(
                 break;
               case 10: {
                 input.readMessage(
-                    getGlupOriginFieldBuilder().getBuilder(),
+                    internalGetGlupOriginFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000001;
                 break;
               } // case 10
               case 18: {
                 input.readMessage(
-                    getPartitionFieldBuilder().getBuilder(),
+                    internalGetPartitionFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000002;
                 break;
@@ -34691,7 +34634,7 @@ public Builder clearGlupOrigin() {
       public com.acme.glup.MetadataProto.Origin.Builder getGlupOriginBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
-        return getGlupOriginFieldBuilder().getBuilder();
+        return internalGetGlupOriginFieldBuilder().getBuilder();
       }
       /**
        * .Acme.Glup.Origin glup_origin = 1;
@@ -34709,7 +34652,7 @@ public com.acme.glup.MetadataProto.OriginOrBuilder getGlupOriginOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           com.acme.glup.MetadataProto.Origin, com.acme.glup.MetadataProto.Origin.Builder, com.acme.glup.MetadataProto.OriginOrBuilder> 
-          getGlupOriginFieldBuilder() {
+          internalGetGlupOriginFieldBuilder() {
         if (glupOriginBuilder_ == null) {
           glupOriginBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               com.acme.glup.MetadataProto.Origin, com.acme.glup.MetadataProto.Origin.Builder, com.acme.glup.MetadataProto.OriginOrBuilder>(
@@ -34812,7 +34755,7 @@ public Builder clearPartition() {
       public com.acme.glup.MetadataProto.Partition.Builder getPartitionBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
-        return getPartitionFieldBuilder().getBuilder();
+        return internalGetPartitionFieldBuilder().getBuilder();
       }
       /**
        * .Acme.Glup.Partition partition = 2;
@@ -34830,7 +34773,7 @@ public com.acme.glup.MetadataProto.PartitionOrBuilder getPartitionOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           com.acme.glup.MetadataProto.Partition, com.acme.glup.MetadataProto.Partition.Builder, com.acme.glup.MetadataProto.PartitionOrBuilder> 
-          getPartitionFieldBuilder() {
+          internalGetPartitionFieldBuilder() {
         if (partitionBuilder_ == null) {
           partitionBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               com.acme.glup.MetadataProto.Partition, com.acme.glup.MetadataProto.Partition.Builder, com.acme.glup.MetadataProto.PartitionOrBuilder>(
@@ -35234,7 +35177,7 @@ public Builder removeControlMessage(int index) {
        */
       public com.acme.glup.MetadataProto.ControlMessage.Watermark.Builder getControlMessageBuilder(
           int index) {
-        return getControlMessageFieldBuilder().getBuilder(index);
+        return internalGetControlMessageFieldBuilder().getBuilder(index);
       }
       /**
        * 
@@ -35273,7 +35216,7 @@ public com.acme.glup.MetadataProto.ControlMessage.WatermarkOrBuilder getControlM
        * repeated .Acme.Glup.ControlMessage.Watermark control_message = 2097151 [(.Acme.Glup.json) = { ... }
        */
       public com.acme.glup.MetadataProto.ControlMessage.Watermark.Builder addControlMessageBuilder() {
-        return getControlMessageFieldBuilder().addBuilder(
+        return internalGetControlMessageFieldBuilder().addBuilder(
             com.acme.glup.MetadataProto.ControlMessage.Watermark.getDefaultInstance());
       }
       /**
@@ -35285,7 +35228,7 @@ public com.acme.glup.MetadataProto.ControlMessage.Watermark.Builder addControlMe
        */
       public com.acme.glup.MetadataProto.ControlMessage.Watermark.Builder addControlMessageBuilder(
           int index) {
-        return getControlMessageFieldBuilder().addBuilder(
+        return internalGetControlMessageFieldBuilder().addBuilder(
             index, com.acme.glup.MetadataProto.ControlMessage.Watermark.getDefaultInstance());
       }
       /**
@@ -35297,11 +35240,11 @@ public com.acme.glup.MetadataProto.ControlMessage.Watermark.Builder addControlMe
        */
       public java.util.List 
            getControlMessageBuilderList() {
-        return getControlMessageFieldBuilder().getBuilderList();
+        return internalGetControlMessageFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           com.acme.glup.MetadataProto.ControlMessage.Watermark, com.acme.glup.MetadataProto.ControlMessage.Watermark.Builder, com.acme.glup.MetadataProto.ControlMessage.WatermarkOrBuilder> 
-          getControlMessageFieldBuilder() {
+          internalGetControlMessageFieldBuilder() {
         if (controlMessageBuilder_ == null) {
           controlMessageBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               com.acme.glup.MetadataProto.ControlMessage.Watermark, com.acme.glup.MetadataProto.ControlMessage.Watermark.Builder, com.acme.glup.MetadataProto.ControlMessage.WatermarkOrBuilder>(
@@ -35499,8 +35442,8 @@ public static final class ForwardedWatermarkMessage extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         ForwardedWatermarkMessage.class.getName());
     }
@@ -36106,7 +36049,7 @@ public Builder mergeFrom(com.acme.glup.MetadataProto.ForwardedWatermarkMessage o
               bitField0_ = (bitField0_ & ~0x00000020);
               controlMessageBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getControlMessageFieldBuilder() : null;
+                   internalGetControlMessageFieldBuilder() : null;
             } else {
               controlMessageBuilder_.addAllMessages(other.controlMessage_);
             }
@@ -36741,7 +36684,7 @@ public Builder removeControlMessage(int index) {
        */
       public com.acme.glup.MetadataProto.ControlMessage.Watermark.Builder getControlMessageBuilder(
           int index) {
-        return getControlMessageFieldBuilder().getBuilder(index);
+        return internalGetControlMessageFieldBuilder().getBuilder(index);
       }
       /**
        * 
@@ -36780,7 +36723,7 @@ public com.acme.glup.MetadataProto.ControlMessage.WatermarkOrBuilder getControlM
        * repeated .Acme.Glup.ControlMessage.Watermark control_message = 2097151 [(.Acme.Glup.json) = { ... }
        */
       public com.acme.glup.MetadataProto.ControlMessage.Watermark.Builder addControlMessageBuilder() {
-        return getControlMessageFieldBuilder().addBuilder(
+        return internalGetControlMessageFieldBuilder().addBuilder(
             com.acme.glup.MetadataProto.ControlMessage.Watermark.getDefaultInstance());
       }
       /**
@@ -36792,7 +36735,7 @@ public com.acme.glup.MetadataProto.ControlMessage.Watermark.Builder addControlMe
        */
       public com.acme.glup.MetadataProto.ControlMessage.Watermark.Builder addControlMessageBuilder(
           int index) {
-        return getControlMessageFieldBuilder().addBuilder(
+        return internalGetControlMessageFieldBuilder().addBuilder(
             index, com.acme.glup.MetadataProto.ControlMessage.Watermark.getDefaultInstance());
       }
       /**
@@ -36804,11 +36747,11 @@ public com.acme.glup.MetadataProto.ControlMessage.Watermark.Builder addControlMe
        */
       public java.util.List 
            getControlMessageBuilderList() {
-        return getControlMessageFieldBuilder().getBuilderList();
+        return internalGetControlMessageFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           com.acme.glup.MetadataProto.ControlMessage.Watermark, com.acme.glup.MetadataProto.ControlMessage.Watermark.Builder, com.acme.glup.MetadataProto.ControlMessage.WatermarkOrBuilder> 
-          getControlMessageFieldBuilder() {
+          internalGetControlMessageFieldBuilder() {
         if (controlMessageBuilder_ == null) {
           controlMessageBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               com.acme.glup.MetadataProto.ControlMessage.Watermark, com.acme.glup.MetadataProto.ControlMessage.Watermark.Builder, com.acme.glup.MetadataProto.ControlMessage.WatermarkOrBuilder>(
@@ -36950,8 +36893,8 @@ public static final class Location extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Location.class.getName());
     }
@@ -37505,9 +37448,7 @@ public com.acme.glup.MetadataProto.Environment getEnv() {
        * @return This builder for chaining.
        */
       public Builder setEnv(com.acme.glup.MetadataProto.Environment value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000001;
         env_ = value.getNumber();
         onChanged();
@@ -37558,9 +37499,7 @@ public com.acme.glup.MetadataProto.DataCenter getDc() {
        * @return This builder for chaining.
        */
       public Builder setDc(com.acme.glup.MetadataProto.DataCenter value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000002;
         dc_ = value.getNumber();
         onChanged();
@@ -37914,8 +37853,8 @@ public static final class Origin extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Origin.class.getName());
     }
@@ -38559,9 +38498,7 @@ public com.acme.glup.MetadataProto.DataCenter getDatacenter() {
        * @return This builder for chaining.
        */
       public Builder setDatacenter(com.acme.glup.MetadataProto.DataCenter value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000001;
         datacenter_ = value.getNumber();
         onChanged();
@@ -38971,8 +38908,8 @@ public static final class ControlMessage extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         ControlMessage.class.getName());
     }
@@ -39024,8 +38961,8 @@ public enum Cluster
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 29,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           Cluster.class.getName());
       }
@@ -39103,7 +39040,7 @@ public Cluster findValueByNumber(int number) {
           getDescriptorForType() {
         return getDescriptor();
       }
-      public static final com.google.protobuf.Descriptors.EnumDescriptor
+      public static com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
         return com.acme.glup.MetadataProto.ControlMessage.getDescriptor().getEnumTypes().get(0);
       }
@@ -39181,8 +39118,8 @@ public static final class WatermarkOrigin extends
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 29,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           WatermarkOrigin.class.getName());
       }
@@ -39728,9 +39665,7 @@ public com.acme.glup.MetadataProto.DataCenter getDatacenter() {
          * @return This builder for chaining.
          */
         public Builder setDatacenter(com.acme.glup.MetadataProto.DataCenter value) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          if (value == null) { throw new NullPointerException(); }
           bitField0_ |= 0x00000002;
           datacenter_ = value.getNumber();
           onChanged();
@@ -39781,9 +39716,7 @@ public com.acme.glup.MetadataProto.ControlMessage.Cluster getCluster() {
          * @return This builder for chaining.
          */
         public Builder setCluster(com.acme.glup.MetadataProto.ControlMessage.Cluster value) {
-          if (value == null) {
-            throw new NullPointerException();
-          }
+          if (value == null) { throw new NullPointerException(); }
           bitField0_ |= 0x00000004;
           cluster_ = value.getNumber();
           onChanged();
@@ -40079,8 +40012,8 @@ public static final class Watermark extends
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 29,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           Watermark.class.getName());
       }
@@ -40999,7 +40932,7 @@ public Builder mergeFrom(com.acme.glup.MetadataProto.ControlMessage.Watermark ot
           if (other.getPartitionCount() != 0) {
             setPartitionCount(other.getPartitionCount());
           }
-          if (other.getProcessUuid() != com.google.protobuf.ByteString.EMPTY) {
+          if (!other.getProcessUuid().isEmpty()) {
             setProcessUuid(other.getProcessUuid());
           }
           if (!other.getRegion().isEmpty()) {
@@ -42283,7 +42216,7 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getWatermarkFieldBuilder();
+          internalGetWatermarkFieldBuilder();
         }
       }
       @java.lang.Override
@@ -42381,7 +42314,7 @@ public Builder mergeFrom(
                 break;
               case 10: {
                 input.readMessage(
-                    getWatermarkFieldBuilder().getBuilder(),
+                    internalGetWatermarkFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000001;
                 break;
@@ -42494,7 +42427,7 @@ public Builder clearWatermark() {
       public com.acme.glup.MetadataProto.ControlMessage.Watermark.Builder getWatermarkBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
-        return getWatermarkFieldBuilder().getBuilder();
+        return internalGetWatermarkFieldBuilder().getBuilder();
       }
       /**
        * .Acme.Glup.ControlMessage.Watermark watermark = 1;
@@ -42512,7 +42445,7 @@ public com.acme.glup.MetadataProto.ControlMessage.WatermarkOrBuilder getWatermar
        */
       private com.google.protobuf.SingleFieldBuilder<
           com.acme.glup.MetadataProto.ControlMessage.Watermark, com.acme.glup.MetadataProto.ControlMessage.Watermark.Builder, com.acme.glup.MetadataProto.ControlMessage.WatermarkOrBuilder> 
-          getWatermarkFieldBuilder() {
+          internalGetWatermarkFieldBuilder() {
         if (watermarkBuilder_ == null) {
           watermarkBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               com.acme.glup.MetadataProto.ControlMessage.Watermark, com.acme.glup.MetadataProto.ControlMessage.Watermark.Builder, com.acme.glup.MetadataProto.ControlMessage.WatermarkOrBuilder>(
@@ -42636,8 +42569,8 @@ public static final class Partition extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Partition.class.getName());
     }
@@ -43143,9 +43076,7 @@ public com.acme.glup.MetadataProto.Platform getHostPlatform() {
        * @return This builder for chaining.
        */
       public Builder setHostPlatform(com.acme.glup.MetadataProto.Platform value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000002;
         hostPlatform_ = value.getNumber();
         onChanged();
@@ -43212,9 +43143,7 @@ public com.acme.glup.MetadataProto.EventType getEventType() {
        * @return This builder for chaining.
        */
       public Builder setEventType(com.acme.glup.MetadataProto.EventType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000004;
         eventType_ = value.getNumber();
         onChanged();
@@ -43351,8 +43280,8 @@ public static final class HDFSPartition extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         HDFSPartition.class.getName());
     }
@@ -43890,9 +43819,7 @@ public com.acme.glup.MetadataProto.Platform getHostPlatform() {
        * @return This builder for chaining.
        */
       public Builder setHostPlatform(com.acme.glup.MetadataProto.Platform value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000002;
         hostPlatform_ = value.getNumber();
         onChanged();
@@ -43943,9 +43870,7 @@ public com.acme.glup.MetadataProto.EventType getEventType() {
        * @return This builder for chaining.
        */
       public Builder setEventType(com.acme.glup.MetadataProto.EventType value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000004;
         eventType_ = value.getNumber();
         onChanged();
@@ -44155,8 +44080,8 @@ public static final class Hash128 extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Hash128.class.getName());
     }
diff --git a/protobuf-serializer/src/test/java/io/confluent/connect/protobuf/test/DescriptorRef.java b/protobuf-serializer/src/test/java/io/confluent/connect/protobuf/test/DescriptorRef.java
index 50bae9af86b..c482026ae8f 100644
--- a/protobuf-serializer/src/test/java/io/confluent/connect/protobuf/test/DescriptorRef.java
+++ b/protobuf-serializer/src/test/java/io/confluent/connect/protobuf/test/DescriptorRef.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: DescriptorRef.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.connect.protobuf.test;
 
+@com.google.protobuf.Generated
 public final class DescriptorRef {
   private DescriptorRef() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       DescriptorRef.class.getName());
   }
@@ -62,8 +63,8 @@ public static final class DescriptorMessage extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         DescriptorMessage.class.getName());
     }
@@ -337,7 +338,7 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getValueFieldBuilder();
+          internalGetValueFieldBuilder();
         }
       }
       @java.lang.Override
@@ -452,7 +453,7 @@ public Builder mergeFrom(
               } // case 8
               case 18: {
                 input.readMessage(
-                    getValueFieldBuilder().getBuilder(),
+                    internalGetValueFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000002;
                 break;
@@ -597,7 +598,7 @@ public Builder clearValue() {
       public com.google.protobuf.DescriptorProtos.DescriptorProto.Builder getValueBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
-        return getValueFieldBuilder().getBuilder();
+        return internalGetValueFieldBuilder().getBuilder();
       }
       /**
        * .google.protobuf.DescriptorProto value = 2;
@@ -615,7 +616,7 @@ public com.google.protobuf.DescriptorProtos.DescriptorProtoOrBuilder getValueOrB
        */
       private com.google.protobuf.SingleFieldBuilder<
           com.google.protobuf.DescriptorProtos.DescriptorProto, com.google.protobuf.DescriptorProtos.DescriptorProto.Builder, com.google.protobuf.DescriptorProtos.DescriptorProtoOrBuilder> 
-          getValueFieldBuilder() {
+          internalGetValueFieldBuilder() {
         if (valueBuilder_ == null) {
           valueBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               com.google.protobuf.DescriptorProtos.DescriptorProto, com.google.protobuf.DescriptorProtos.DescriptorProto.Builder, com.google.protobuf.DescriptorProtos.DescriptorProtoOrBuilder>(
diff --git a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/CustomOptions.java b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/CustomOptions.java
index 4629c16bfdc..0b12923e6c6 100644
--- a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/CustomOptions.java
+++ b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/CustomOptions.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: CustomOptions.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.serializers.protobuf.test;
 
+@com.google.protobuf.Generated
 public final class CustomOptions {
   private CustomOptions() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       CustomOptions.class.getName());
   }
@@ -59,8 +60,8 @@ public enum CustomEnumOptions
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         CustomEnumOptions.class.getName());
     }
@@ -133,7 +134,7 @@ public CustomEnumOptions findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return io.confluent.kafka.serializers.protobuf.test.CustomOptions.getDescriptor().getEnumTypes().get(0);
     }
@@ -185,8 +186,8 @@ public enum MyEnum
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         MyEnum.class.getName());
     }
@@ -259,7 +260,7 @@ public MyEnum findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return io.confluent.kafka.serializers.protobuf.test.CustomOptions.getDescriptor().getEnumTypes().get(1);
     }
@@ -321,8 +322,8 @@ public static final class CustomMessageOptions extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         CustomMessageOptions.class.getName());
     }
@@ -966,8 +967,8 @@ public static final class MyMessage extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         MyMessage.class.getName());
     }
@@ -1561,10 +1562,10 @@ public Builder mergeFrom(io.confluent.kafka.serializers.protobuf.test.CustomOpti
         if (other.getId() != 0) {
           setId(other.getId());
         }
-        if (other.getF() != 0F) {
+        if (java.lang.Float.floatToRawIntBits(other.getF()) != 0) {
           setF(other.getF());
         }
-        if (other.getD() != 0D) {
+        if (java.lang.Double.doubleToRawLongBits(other.getD()) != 0) {
           setD(other.getD());
         }
         if (!other.getDoc().isEmpty()) {
diff --git a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/CustomOptions2.java b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/CustomOptions2.java
index cf12d89c3a6..aa48dbf2b5e 100644
--- a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/CustomOptions2.java
+++ b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/CustomOptions2.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: CustomOptions2.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.serializers.protobuf.test;
 
+@com.google.protobuf.Generated
 public final class CustomOptions2 {
   private CustomOptions2() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       CustomOptions2.class.getName());
   }
@@ -101,8 +102,8 @@ public static final class FooBar extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         FooBar.class.getName());
     }
@@ -151,8 +152,8 @@ public enum FooBarBazEnum
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 29,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           FooBarBazEnum.class.getName());
       }
@@ -217,7 +218,7 @@ public FooBarBazEnum findValueByNumber(int number) {
           getDescriptorForType() {
         return getDescriptor();
       }
-      public static final com.google.protobuf.Descriptors.EnumDescriptor
+      public static com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
         return io.confluent.kafka.serializers.protobuf.test.CustomOptions2.FooBar.getDescriptor().getEnumTypes().get(0);
       }
@@ -275,8 +276,8 @@ public static final class More extends
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 29,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           More.class.getName());
       }
@@ -831,8 +832,8 @@ public static final class More2 extends
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 29,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           More2.class.getName());
       }
@@ -1814,7 +1815,7 @@ public Builder mergeFrom(io.confluent.kafka.serializers.protobuf.test.CustomOpti
               bitField0_ = (bitField0_ & ~0x00000004);
               nestedBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getNestedFieldBuilder() : null;
+                   internalGetNestedFieldBuilder() : null;
             } else {
               nestedBuilder_.addAllMessages(other.nested_);
             }
@@ -2195,7 +2196,7 @@ public Builder removeNested(int index) {
        */
       public io.confluent.kafka.serializers.protobuf.test.CustomOptions2.FooBar.Builder getNestedBuilder(
           int index) {
-        return getNestedFieldBuilder().getBuilder(index);
+        return internalGetNestedFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .io.confluent.kafka.serializers.protobuf.test.FooBar nested = 3;
@@ -2222,7 +2223,7 @@ public io.confluent.kafka.serializers.protobuf.test.CustomOptions2.FooBarOrBuild
        * repeated .io.confluent.kafka.serializers.protobuf.test.FooBar nested = 3;
        */
       public io.confluent.kafka.serializers.protobuf.test.CustomOptions2.FooBar.Builder addNestedBuilder() {
-        return getNestedFieldBuilder().addBuilder(
+        return internalGetNestedFieldBuilder().addBuilder(
             io.confluent.kafka.serializers.protobuf.test.CustomOptions2.FooBar.getDefaultInstance());
       }
       /**
@@ -2230,7 +2231,7 @@ public io.confluent.kafka.serializers.protobuf.test.CustomOptions2.FooBar.Builde
        */
       public io.confluent.kafka.serializers.protobuf.test.CustomOptions2.FooBar.Builder addNestedBuilder(
           int index) {
-        return getNestedFieldBuilder().addBuilder(
+        return internalGetNestedFieldBuilder().addBuilder(
             index, io.confluent.kafka.serializers.protobuf.test.CustomOptions2.FooBar.getDefaultInstance());
       }
       /**
@@ -2238,11 +2239,11 @@ public io.confluent.kafka.serializers.protobuf.test.CustomOptions2.FooBar.Builde
        */
       public java.util.List 
            getNestedBuilderList() {
-        return getNestedFieldBuilder().getBuilderList();
+        return internalGetNestedFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           io.confluent.kafka.serializers.protobuf.test.CustomOptions2.FooBar, io.confluent.kafka.serializers.protobuf.test.CustomOptions2.FooBar.Builder, io.confluent.kafka.serializers.protobuf.test.CustomOptions2.FooBarOrBuilder> 
-          getNestedFieldBuilder() {
+          internalGetNestedFieldBuilder() {
         if (nestedBuilder_ == null) {
           nestedBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               io.confluent.kafka.serializers.protobuf.test.CustomOptions2.FooBar, io.confluent.kafka.serializers.protobuf.test.CustomOptions2.FooBar.Builder, io.confluent.kafka.serializers.protobuf.test.CustomOptions2.FooBarOrBuilder>(
diff --git a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/DateValueOuterClass.java b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/DateValueOuterClass.java
index fd2bb703783..67f14ac09c6 100644
--- a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/DateValueOuterClass.java
+++ b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/DateValueOuterClass.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: DateValue.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.serializers.protobuf.test;
 
+@com.google.protobuf.Generated
 public final class DateValueOuterClass {
   private DateValueOuterClass() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       DateValueOuterClass.class.getName());
   }
@@ -72,8 +73,8 @@ public static final class DateValue extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         DateValue.class.getName());
     }
@@ -335,7 +336,7 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getValueFieldBuilder();
+          internalGetValueFieldBuilder();
         }
       }
       @java.lang.Override
@@ -433,7 +434,7 @@ public Builder mergeFrom(
                 break;
               case 10: {
                 input.readMessage(
-                    getValueFieldBuilder().getBuilder(),
+                    internalGetValueFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000001;
                 break;
@@ -574,7 +575,7 @@ public Builder clearValue() {
       public com.google.type.Date.Builder getValueBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
-        return getValueFieldBuilder().getBuilder();
+        return internalGetValueFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -600,7 +601,7 @@ public com.google.type.DateOrBuilder getValueOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           com.google.type.Date, com.google.type.Date.Builder, com.google.type.DateOrBuilder> 
-          getValueFieldBuilder() {
+          internalGetValueFieldBuilder() {
         if (valueBuilder_ == null) {
           valueBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               com.google.type.Date, com.google.type.Date.Builder, com.google.type.DateOrBuilder>(
diff --git a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/DecimalValueOuterClass.java b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/DecimalValueOuterClass.java
index 480c2932e15..1c2a88c7237 100644
--- a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/DecimalValueOuterClass.java
+++ b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/DecimalValueOuterClass.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: DecimalValue.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.serializers.protobuf.test;
 
+@com.google.protobuf.Generated
 public final class DecimalValueOuterClass {
   private DecimalValueOuterClass() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       DecimalValueOuterClass.class.getName());
   }
@@ -72,8 +73,8 @@ public static final class DecimalValue extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         DecimalValue.class.getName());
     }
@@ -335,7 +336,7 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getValueFieldBuilder();
+          internalGetValueFieldBuilder();
         }
       }
       @java.lang.Override
@@ -433,7 +434,7 @@ public Builder mergeFrom(
                 break;
               case 10: {
                 input.readMessage(
-                    getValueFieldBuilder().getBuilder(),
+                    internalGetValueFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000001;
                 break;
@@ -574,7 +575,7 @@ public Builder clearValue() {
       public io.confluent.protobuf.type.Decimal.Builder getValueBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
-        return getValueFieldBuilder().getBuilder();
+        return internalGetValueFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -600,7 +601,7 @@ public io.confluent.protobuf.type.DecimalOrBuilder getValueOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           io.confluent.protobuf.type.Decimal, io.confluent.protobuf.type.Decimal.Builder, io.confluent.protobuf.type.DecimalOrBuilder> 
-          getValueFieldBuilder() {
+          internalGetValueFieldBuilder() {
         if (valueBuilder_ == null) {
           valueBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               io.confluent.protobuf.type.Decimal, io.confluent.protobuf.type.Decimal.Builder, io.confluent.protobuf.type.DecimalOrBuilder>(
diff --git a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/DecimalValuePb2OuterClass.java b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/DecimalValuePb2OuterClass.java
index 8ecb5785be6..849e7b44938 100644
--- a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/DecimalValuePb2OuterClass.java
+++ b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/DecimalValuePb2OuterClass.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: DecimalValuePb2.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.serializers.protobuf.test;
 
+@com.google.protobuf.Generated
 public final class DecimalValuePb2OuterClass {
   private DecimalValuePb2OuterClass() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       DecimalValuePb2OuterClass.class.getName());
   }
@@ -72,8 +73,8 @@ public static final class DecimalValuePb2 extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         DecimalValuePb2.class.getName());
     }
@@ -335,7 +336,7 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getValueFieldBuilder();
+          internalGetValueFieldBuilder();
         }
       }
       @java.lang.Override
@@ -433,7 +434,7 @@ public Builder mergeFrom(
                 break;
               case 10: {
                 input.readMessage(
-                    getValueFieldBuilder().getBuilder(),
+                    internalGetValueFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000001;
                 break;
@@ -574,7 +575,7 @@ public Builder clearValue() {
       public io.confluent.protobuf.type.Decimal.Builder getValueBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
-        return getValueFieldBuilder().getBuilder();
+        return internalGetValueFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -600,7 +601,7 @@ public io.confluent.protobuf.type.DecimalOrBuilder getValueOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           io.confluent.protobuf.type.Decimal, io.confluent.protobuf.type.Decimal.Builder, io.confluent.protobuf.type.DecimalOrBuilder> 
-          getValueFieldBuilder() {
+          internalGetValueFieldBuilder() {
         if (valueBuilder_ == null) {
           valueBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               io.confluent.protobuf.type.Decimal, io.confluent.protobuf.type.Decimal.Builder, io.confluent.protobuf.type.DecimalOrBuilder>(
diff --git a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/DependencyTestProto.java b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/DependencyTestProto.java
index acaf11e3bb0..405b2df9263 100644
--- a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/DependencyTestProto.java
+++ b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/DependencyTestProto.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: DependencyTestProto.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.serializers.protobuf.test;
 
+@com.google.protobuf.Generated
 public final class DependencyTestProto {
   private DependencyTestProto() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       DependencyTestProto.class.getName());
   }
@@ -77,8 +78,8 @@ public static final class DependencyMessage extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         DependencyMessage.class.getName());
     }
@@ -389,8 +390,8 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getNestedMessageFieldBuilder();
-          getTestMesssageFieldBuilder();
+          internalGetNestedMessageFieldBuilder();
+          internalGetTestMesssageFieldBuilder();
         }
       }
       @java.lang.Override
@@ -509,7 +510,7 @@ public Builder mergeFrom(
                 break;
               case 10: {
                 input.readMessage(
-                    getNestedMessageFieldBuilder().getBuilder(),
+                    internalGetNestedMessageFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000001;
                 break;
@@ -521,7 +522,7 @@ public Builder mergeFrom(
               } // case 16
               case 26: {
                 input.readMessage(
-                    getTestMesssageFieldBuilder().getBuilder(),
+                    internalGetTestMesssageFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000004;
                 break;
@@ -634,7 +635,7 @@ public Builder clearNestedMessage() {
       public io.confluent.kafka.serializers.protobuf.test.NestedTestProto.NestedMessage.Builder getNestedMessageBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
-        return getNestedMessageFieldBuilder().getBuilder();
+        return internalGetNestedMessageFieldBuilder().getBuilder();
       }
       /**
        * .io.confluent.kafka.serializers.protobuf.test.NestedMessage nested_message = 1;
@@ -652,7 +653,7 @@ public io.confluent.kafka.serializers.protobuf.test.NestedTestProto.NestedMessag
        */
       private com.google.protobuf.SingleFieldBuilder<
           io.confluent.kafka.serializers.protobuf.test.NestedTestProto.NestedMessage, io.confluent.kafka.serializers.protobuf.test.NestedTestProto.NestedMessage.Builder, io.confluent.kafka.serializers.protobuf.test.NestedTestProto.NestedMessageOrBuilder> 
-          getNestedMessageFieldBuilder() {
+          internalGetNestedMessageFieldBuilder() {
         if (nestedMessageBuilder_ == null) {
           nestedMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               io.confluent.kafka.serializers.protobuf.test.NestedTestProto.NestedMessage, io.confluent.kafka.serializers.protobuf.test.NestedTestProto.NestedMessage.Builder, io.confluent.kafka.serializers.protobuf.test.NestedTestProto.NestedMessageOrBuilder>(
@@ -787,7 +788,7 @@ public Builder clearTestMesssage() {
       public io.confluent.kafka.serializers.protobuf.test.TestMessageProtos.TestMessage.Builder getTestMesssageBuilder() {
         bitField0_ |= 0x00000004;
         onChanged();
-        return getTestMesssageFieldBuilder().getBuilder();
+        return internalGetTestMesssageFieldBuilder().getBuilder();
       }
       /**
        * .io.confluent.kafka.serializers.protobuf.test.TestMessage test_messsage = 3;
@@ -805,7 +806,7 @@ public io.confluent.kafka.serializers.protobuf.test.TestMessageProtos.TestMessag
        */
       private com.google.protobuf.SingleFieldBuilder<
           io.confluent.kafka.serializers.protobuf.test.TestMessageProtos.TestMessage, io.confluent.kafka.serializers.protobuf.test.TestMessageProtos.TestMessage.Builder, io.confluent.kafka.serializers.protobuf.test.TestMessageProtos.TestMessageOrBuilder> 
-          getTestMesssageFieldBuilder() {
+          internalGetTestMesssageFieldBuilder() {
         if (testMesssageBuilder_ == null) {
           testMesssageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               io.confluent.kafka.serializers.protobuf.test.TestMessageProtos.TestMessage, io.confluent.kafka.serializers.protobuf.test.TestMessageProtos.TestMessage.Builder, io.confluent.kafka.serializers.protobuf.test.TestMessageProtos.TestMessageOrBuilder>(
diff --git a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/EnumReferenceOuter.java b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/EnumReferenceOuter.java
index 5dd387c945a..e2f2a443839 100644
--- a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/EnumReferenceOuter.java
+++ b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/EnumReferenceOuter.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: EnumReference.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.serializers.protobuf.test;
 
+@com.google.protobuf.Generated
 public final class EnumReferenceOuter {
   private EnumReferenceOuter() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       EnumReferenceOuter.class.getName());
   }
@@ -52,8 +53,8 @@ public static final class EnumReference extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         EnumReference.class.getName());
     }
@@ -422,9 +423,7 @@ public io.confluent.kafka.serializers.protobuf.test.EnumRootOuter.EnumRoot getEn
        * @return This builder for chaining.
        */
       public Builder setEnumRoot(io.confluent.kafka.serializers.protobuf.test.EnumRootOuter.EnumRoot value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000001;
         enumRoot_ = value.getNumber();
         onChanged();
diff --git a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/EnumRootOuter.java b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/EnumRootOuter.java
index fc35f576b3e..de068d51fa0 100644
--- a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/EnumRootOuter.java
+++ b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/EnumRootOuter.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: EnumRoot.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.serializers.protobuf.test;
 
+@com.google.protobuf.Generated
 public final class EnumRootOuter {
   private EnumRootOuter() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       EnumRootOuter.class.getName());
   }
@@ -45,8 +46,8 @@ public enum EnumRoot
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         EnumRoot.class.getName());
     }
@@ -114,7 +115,7 @@ public EnumRoot findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return io.confluent.kafka.serializers.protobuf.test.EnumRootOuter.getDescriptor().getEnumTypes().get(0);
     }
diff --git a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/EnumUnionOuter.java b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/EnumUnionOuter.java
index d5ff48c197f..ab7b786ca50 100644
--- a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/EnumUnionOuter.java
+++ b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/EnumUnionOuter.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: EnumUnion.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.serializers.protobuf.test;
 
+@com.google.protobuf.Generated
 public final class EnumUnionOuter {
   private EnumUnionOuter() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       EnumUnionOuter.class.getName());
   }
@@ -98,8 +99,8 @@ public static final class EnumUnion extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         EnumUnion.class.getName());
     }
@@ -880,9 +881,7 @@ public io.confluent.kafka.serializers.protobuf.test.NestedTestProto.Status getSo
        * @return This builder for chaining.
        */
       public Builder setSomeStatus(io.confluent.kafka.serializers.protobuf.test.NestedTestProto.Status value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         someValCase_ = 3;
         someVal_ = value.getNumber();
         onChanged();
@@ -935,9 +934,7 @@ public io.confluent.kafka.serializers.protobuf.test.NestedTestProto.Status getSt
        * @return This builder for chaining.
        */
       public Builder setStatus(io.confluent.kafka.serializers.protobuf.test.NestedTestProto.Status value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000008;
         status_ = value.getNumber();
         onChanged();
diff --git a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/Int16ValueOuterClass.java b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/Int16ValueOuterClass.java
index fe6b67ccd92..cbe3be57be4 100644
--- a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/Int16ValueOuterClass.java
+++ b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/Int16ValueOuterClass.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: Int16Value.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.serializers.protobuf.test;
 
+@com.google.protobuf.Generated
 public final class Int16ValueOuterClass {
   private Int16ValueOuterClass() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       Int16ValueOuterClass.class.getName());
   }
@@ -51,8 +52,8 @@ public static final class Int16Value extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Int16Value.class.getName());
     }
diff --git a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/Int8ValueOuterClass.java b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/Int8ValueOuterClass.java
index e87edfd5f20..bd113623290 100644
--- a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/Int8ValueOuterClass.java
+++ b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/Int8ValueOuterClass.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: Int8Value.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.serializers.protobuf.test;
 
+@com.google.protobuf.Generated
 public final class Int8ValueOuterClass {
   private Int8ValueOuterClass() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       Int8ValueOuterClass.class.getName());
   }
@@ -51,8 +52,8 @@ public static final class Int8Value extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Int8Value.class.getName());
     }
diff --git a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/KeyTimestampValueOuterClass.java b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/KeyTimestampValueOuterClass.java
index 3b1d9fd300a..a408354ec8a 100644
--- a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/KeyTimestampValueOuterClass.java
+++ b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/KeyTimestampValueOuterClass.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: KeyTimestampValue.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.serializers.protobuf.test;
 
+@com.google.protobuf.Generated
 public final class KeyTimestampValueOuterClass {
   private KeyTimestampValueOuterClass() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       KeyTimestampValueOuterClass.class.getName());
   }
@@ -81,8 +82,8 @@ public static final class KeyTimestampValue extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         KeyTimestampValue.class.getName());
     }
@@ -396,8 +397,8 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getValueFieldBuilder();
-          getValue2FieldBuilder();
+          internalGetValueFieldBuilder();
+          internalGetValue2FieldBuilder();
         }
       }
       @java.lang.Override
@@ -521,14 +522,14 @@ public Builder mergeFrom(
               } // case 8
               case 18: {
                 input.readMessage(
-                    getValueFieldBuilder().getBuilder(),
+                    internalGetValueFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000002;
                 break;
               } // case 18
               case 26: {
                 input.readMessage(
-                    getValue2FieldBuilder().getBuilder(),
+                    internalGetValue2FieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000004;
                 break;
@@ -673,7 +674,7 @@ public Builder clearValue() {
       public io.confluent.kafka.serializers.protobuf.test.TimestampValueOuterClass.TimestampValue.Builder getValueBuilder() {
         bitField0_ |= 0x00000002;
         onChanged();
-        return getValueFieldBuilder().getBuilder();
+        return internalGetValueFieldBuilder().getBuilder();
       }
       /**
        * .TimestampValue value = 2;
@@ -691,7 +692,7 @@ public io.confluent.kafka.serializers.protobuf.test.TimestampValueOuterClass.Tim
        */
       private com.google.protobuf.SingleFieldBuilder<
           io.confluent.kafka.serializers.protobuf.test.TimestampValueOuterClass.TimestampValue, io.confluent.kafka.serializers.protobuf.test.TimestampValueOuterClass.TimestampValue.Builder, io.confluent.kafka.serializers.protobuf.test.TimestampValueOuterClass.TimestampValueOrBuilder> 
-          getValueFieldBuilder() {
+          internalGetValueFieldBuilder() {
         if (valueBuilder_ == null) {
           valueBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               io.confluent.kafka.serializers.protobuf.test.TimestampValueOuterClass.TimestampValue, io.confluent.kafka.serializers.protobuf.test.TimestampValueOuterClass.TimestampValue.Builder, io.confluent.kafka.serializers.protobuf.test.TimestampValueOuterClass.TimestampValueOrBuilder>(
@@ -794,7 +795,7 @@ public Builder clearValue2() {
       public com.google.protobuf.Timestamp.Builder getValue2Builder() {
         bitField0_ |= 0x00000004;
         onChanged();
-        return getValue2FieldBuilder().getBuilder();
+        return internalGetValue2FieldBuilder().getBuilder();
       }
       /**
        * .google.protobuf.Timestamp value2 = 3;
@@ -812,7 +813,7 @@ public com.google.protobuf.TimestampOrBuilder getValue2OrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
-          getValue2FieldBuilder() {
+          internalGetValue2FieldBuilder() {
         if (value2Builder_ == null) {
           value2Builder_ = new com.google.protobuf.SingleFieldBuilder<
               com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
diff --git a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/NestedTestProto.java b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/NestedTestProto.java
index ed790f8602b..ca239692d41 100644
--- a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/NestedTestProto.java
+++ b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/NestedTestProto.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: NestedTestProto.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.serializers.protobuf.test;
 
+@com.google.protobuf.Generated
 public final class NestedTestProto {
   private NestedTestProto() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       NestedTestProto.class.getName());
   }
@@ -45,8 +46,8 @@ public enum Status
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Status.class.getName());
     }
@@ -114,7 +115,7 @@ public Status findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return io.confluent.kafka.serializers.protobuf.test.NestedTestProto.getDescriptor().getEnumTypes().get(0);
     }
@@ -203,8 +204,8 @@ public static final class UserId extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         UserId.class.getName());
     }
@@ -731,7 +732,7 @@ public Builder mergeFrom(
               } // case 16
               case 26: {
                 input.readMessage(
-                    getAnotherIdFieldBuilder().getBuilder(),
+                    internalGetAnotherIdFieldBuilder().getBuilder(),
                     extensionRegistry);
                 userIdCase_ = 3;
                 break;
@@ -1007,7 +1008,7 @@ public Builder clearAnotherId() {
        * .io.confluent.kafka.serializers.protobuf.test.MessageId another_id = 3;
        */
       public io.confluent.kafka.serializers.protobuf.test.NestedTestProto.MessageId.Builder getAnotherIdBuilder() {
-        return getAnotherIdFieldBuilder().getBuilder();
+        return internalGetAnotherIdFieldBuilder().getBuilder();
       }
       /**
        * .io.confluent.kafka.serializers.protobuf.test.MessageId another_id = 3;
@@ -1028,7 +1029,7 @@ public io.confluent.kafka.serializers.protobuf.test.NestedTestProto.MessageIdOrB
        */
       private com.google.protobuf.SingleFieldBuilder<
           io.confluent.kafka.serializers.protobuf.test.NestedTestProto.MessageId, io.confluent.kafka.serializers.protobuf.test.NestedTestProto.MessageId.Builder, io.confluent.kafka.serializers.protobuf.test.NestedTestProto.MessageIdOrBuilder> 
-          getAnotherIdFieldBuilder() {
+          internalGetAnotherIdFieldBuilder() {
         if (anotherIdBuilder_ == null) {
           if (!(userIdCase_ == 3)) {
             userId_ = io.confluent.kafka.serializers.protobuf.test.NestedTestProto.MessageId.getDefaultInstance();
@@ -1124,8 +1125,8 @@ public static final class MessageId extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         MessageId.class.getName());
     }
@@ -1658,8 +1659,8 @@ public static final class ComplexType extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         ComplexType.class.getName());
     }
@@ -2567,8 +2568,8 @@ public static final class NestedMessage extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         NestedMessage.class.getName());
     }
@@ -2623,8 +2624,8 @@ public enum InnerEnum
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 29,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           InnerEnum.class.getName());
       }
@@ -2695,7 +2696,7 @@ public InnerEnum findValueByNumber(int number) {
           getDescriptorForType() {
         return getDescriptor();
       }
-      public static final com.google.protobuf.Descriptors.EnumDescriptor
+      public static com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
         return io.confluent.kafka.serializers.protobuf.test.NestedTestProto.NestedMessage.getDescriptor().getEnumTypes().get(0);
       }
@@ -2772,8 +2773,8 @@ public static final class InnerMessage extends
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 29,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           InnerMessage.class.getName());
       }
@@ -4010,10 +4011,10 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getUserIdFieldBuilder();
-          getUpdatedAtFieldBuilder();
-          getComplexTypeFieldBuilder();
-          getInnerFieldBuilder();
+          internalGetUserIdFieldBuilder();
+          internalGetUpdatedAtFieldBuilder();
+          internalGetComplexTypeFieldBuilder();
+          internalGetInnerFieldBuilder();
         }
       }
       @java.lang.Override
@@ -4191,7 +4192,7 @@ public Builder mergeFrom(
                 break;
               case 10: {
                 input.readMessage(
-                    getUserIdFieldBuilder().getBuilder(),
+                    internalGetUserIdFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000001;
                 break;
@@ -4209,7 +4210,7 @@ public Builder mergeFrom(
               } // case 26
               case 34: {
                 input.readMessage(
-                    getUpdatedAtFieldBuilder().getBuilder(),
+                    internalGetUpdatedAtFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000008;
                 break;
@@ -4221,7 +4222,7 @@ public Builder mergeFrom(
               } // case 40
               case 50: {
                 input.readMessage(
-                    getComplexTypeFieldBuilder().getBuilder(),
+                    internalGetComplexTypeFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000020;
                 break;
@@ -4237,7 +4238,7 @@ public Builder mergeFrom(
               } // case 58
               case 66: {
                 input.readMessage(
-                    getInnerFieldBuilder().getBuilder(),
+                    internalGetInnerFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000080;
                 break;
@@ -4350,7 +4351,7 @@ public Builder clearUserId() {
       public io.confluent.kafka.serializers.protobuf.test.NestedTestProto.UserId.Builder getUserIdBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
-        return getUserIdFieldBuilder().getBuilder();
+        return internalGetUserIdFieldBuilder().getBuilder();
       }
       /**
        * .io.confluent.kafka.serializers.protobuf.test.UserId user_id = 1;
@@ -4368,7 +4369,7 @@ public io.confluent.kafka.serializers.protobuf.test.NestedTestProto.UserIdOrBuil
        */
       private com.google.protobuf.SingleFieldBuilder<
           io.confluent.kafka.serializers.protobuf.test.NestedTestProto.UserId, io.confluent.kafka.serializers.protobuf.test.NestedTestProto.UserId.Builder, io.confluent.kafka.serializers.protobuf.test.NestedTestProto.UserIdOrBuilder> 
-          getUserIdFieldBuilder() {
+          internalGetUserIdFieldBuilder() {
         if (userIdBuilder_ == null) {
           userIdBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               io.confluent.kafka.serializers.protobuf.test.NestedTestProto.UserId, io.confluent.kafka.serializers.protobuf.test.NestedTestProto.UserId.Builder, io.confluent.kafka.serializers.protobuf.test.NestedTestProto.UserIdOrBuilder>(
@@ -4614,7 +4615,7 @@ public Builder clearUpdatedAt() {
       public com.google.protobuf.Timestamp.Builder getUpdatedAtBuilder() {
         bitField0_ |= 0x00000008;
         onChanged();
-        return getUpdatedAtFieldBuilder().getBuilder();
+        return internalGetUpdatedAtFieldBuilder().getBuilder();
       }
       /**
        * .google.protobuf.Timestamp updated_at = 4;
@@ -4632,7 +4633,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdatedAtOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
-          getUpdatedAtFieldBuilder() {
+          internalGetUpdatedAtFieldBuilder() {
         if (updatedAtBuilder_ == null) {
           updatedAtBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
@@ -4678,9 +4679,7 @@ public io.confluent.kafka.serializers.protobuf.test.NestedTestProto.Status getSt
        * @return This builder for chaining.
        */
       public Builder setStatus(io.confluent.kafka.serializers.protobuf.test.NestedTestProto.Status value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000010;
         status_ = value.getNumber();
         onChanged();
@@ -4788,7 +4787,7 @@ public Builder clearComplexType() {
       public io.confluent.kafka.serializers.protobuf.test.NestedTestProto.ComplexType.Builder getComplexTypeBuilder() {
         bitField0_ |= 0x00000020;
         onChanged();
-        return getComplexTypeFieldBuilder().getBuilder();
+        return internalGetComplexTypeFieldBuilder().getBuilder();
       }
       /**
        * .io.confluent.kafka.serializers.protobuf.test.ComplexType complex_type = 6;
@@ -4806,7 +4805,7 @@ public io.confluent.kafka.serializers.protobuf.test.NestedTestProto.ComplexTypeO
        */
       private com.google.protobuf.SingleFieldBuilder<
           io.confluent.kafka.serializers.protobuf.test.NestedTestProto.ComplexType, io.confluent.kafka.serializers.protobuf.test.NestedTestProto.ComplexType.Builder, io.confluent.kafka.serializers.protobuf.test.NestedTestProto.ComplexTypeOrBuilder> 
-          getComplexTypeFieldBuilder() {
+          internalGetComplexTypeFieldBuilder() {
         if (complexTypeBuilder_ == null) {
           complexTypeBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               io.confluent.kafka.serializers.protobuf.test.NestedTestProto.ComplexType, io.confluent.kafka.serializers.protobuf.test.NestedTestProto.ComplexType.Builder, io.confluent.kafka.serializers.protobuf.test.NestedTestProto.ComplexTypeOrBuilder>(
@@ -5036,7 +5035,7 @@ public Builder clearInner() {
       public io.confluent.kafka.serializers.protobuf.test.NestedTestProto.NestedMessage.InnerMessage.Builder getInnerBuilder() {
         bitField0_ |= 0x00000080;
         onChanged();
-        return getInnerFieldBuilder().getBuilder();
+        return internalGetInnerFieldBuilder().getBuilder();
       }
       /**
        * .io.confluent.kafka.serializers.protobuf.test.NestedMessage.InnerMessage inner = 8;
@@ -5054,7 +5053,7 @@ public io.confluent.kafka.serializers.protobuf.test.NestedTestProto.NestedMessag
        */
       private com.google.protobuf.SingleFieldBuilder<
           io.confluent.kafka.serializers.protobuf.test.NestedTestProto.NestedMessage.InnerMessage, io.confluent.kafka.serializers.protobuf.test.NestedTestProto.NestedMessage.InnerMessage.Builder, io.confluent.kafka.serializers.protobuf.test.NestedTestProto.NestedMessage.InnerMessageOrBuilder> 
-          getInnerFieldBuilder() {
+          internalGetInnerFieldBuilder() {
         if (innerBuilder_ == null) {
           innerBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               io.confluent.kafka.serializers.protobuf.test.NestedTestProto.NestedMessage.InnerMessage, io.confluent.kafka.serializers.protobuf.test.NestedTestProto.NestedMessage.InnerMessage.Builder, io.confluent.kafka.serializers.protobuf.test.NestedTestProto.NestedMessage.InnerMessageOrBuilder>(
diff --git a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/PublicTestProto.java b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/PublicTestProto.java
index c874a798d7f..bdf61db0703 100644
--- a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/PublicTestProto.java
+++ b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/PublicTestProto.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: PublicTestProto.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.serializers.protobuf.test;
 
+@com.google.protobuf.Generated
 public final class PublicTestProto {
   private PublicTestProto() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       PublicTestProto.class.getName());
   }
diff --git a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/Ranges.java b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/Ranges.java
index 77cc9b84ff3..bb78eb00006 100644
--- a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/Ranges.java
+++ b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/Ranges.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: Ranges.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.serializers.protobuf.test;
 
+@com.google.protobuf.Generated
 public final class Ranges {
   private Ranges() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       Ranges.class.getName());
   }
@@ -71,8 +72,8 @@ public static final class FooBar2 extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         FooBar2.class.getName());
     }
@@ -116,8 +117,8 @@ public enum FooBarBazEnum
         com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
           com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
           /* major= */ 4,
-          /* minor= */ 29,
-          /* patch= */ 3,
+          /* minor= */ 31,
+          /* patch= */ 1,
           /* suffix= */ "",
           FooBarBazEnum.class.getName());
       }
@@ -177,7 +178,7 @@ public FooBarBazEnum findValueByNumber(int number) {
           getDescriptorForType() {
         return getDescriptor();
       }
-      public static final com.google.protobuf.Descriptors.EnumDescriptor
+      public static com.google.protobuf.Descriptors.EnumDescriptor
           getDescriptor() {
         return io.confluent.kafka.serializers.protobuf.test.Ranges.FooBar2.getDescriptor().getEnumTypes().get(0);
       }
diff --git a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/SInt32ValueOuterClass.java b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/SInt32ValueOuterClass.java
index d547e49b417..5fe80cf540a 100644
--- a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/SInt32ValueOuterClass.java
+++ b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/SInt32ValueOuterClass.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: SInt32Value.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.serializers.protobuf.test;
 
+@com.google.protobuf.Generated
 public final class SInt32ValueOuterClass {
   private SInt32ValueOuterClass() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       SInt32ValueOuterClass.class.getName());
   }
@@ -51,8 +52,8 @@ public static final class SInt32Value extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         SInt32Value.class.getName());
     }
diff --git a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/SInt64ValueOuterClass.java b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/SInt64ValueOuterClass.java
index c8145a808a4..b0cda804d51 100644
--- a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/SInt64ValueOuterClass.java
+++ b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/SInt64ValueOuterClass.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: SInt64Value.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.serializers.protobuf.test;
 
+@com.google.protobuf.Generated
 public final class SInt64ValueOuterClass {
   private SInt64ValueOuterClass() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       SInt64ValueOuterClass.class.getName());
   }
@@ -51,8 +52,8 @@ public static final class SInt64Value extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         SInt64Value.class.getName());
     }
diff --git a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/TestMessageOptionalProtos.java b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/TestMessageOptionalProtos.java
index 10d6f2b56f5..4e502e26fcc 100644
--- a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/TestMessageOptionalProtos.java
+++ b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/TestMessageOptionalProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: TestOptionalProto.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.serializers.protobuf.test;
 
+@com.google.protobuf.Generated
 public final class TestMessageOptionalProtos {
   private TestMessageOptionalProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       TestMessageOptionalProtos.class.getName());
   }
@@ -70,8 +71,8 @@ public static final class TestMessageOptional extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         TestMessageOptional.class.getName());
     }
diff --git a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/TestMessageProtos.java b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/TestMessageProtos.java
index e94094cff26..e51d8efdb24 100644
--- a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/TestMessageProtos.java
+++ b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/TestMessageProtos.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: TestProto.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.serializers.protobuf.test;
 
+@com.google.protobuf.Generated
 public final class TestMessageProtos {
   private TestMessageProtos() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       TestMessageProtos.class.getName());
   }
@@ -137,8 +138,8 @@ public static final class TestMessage extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         TestMessage.class.getName());
     }
@@ -826,13 +827,13 @@ public Builder mergeFrom(io.confluent.kafka.serializers.protobuf.test.TestMessag
         if (other.getTestBool() != false) {
           setTestBool(other.getTestBool());
         }
-        if (other.getTestBytes() != com.google.protobuf.ByteString.EMPTY) {
+        if (!other.getTestBytes().isEmpty()) {
           setTestBytes(other.getTestBytes());
         }
-        if (other.getTestDouble() != 0D) {
+        if (java.lang.Double.doubleToRawLongBits(other.getTestDouble()) != 0) {
           setTestDouble(other.getTestDouble());
         }
-        if (other.getTestFloat() != 0F) {
+        if (java.lang.Float.floatToRawIntBits(other.getTestFloat()) != 0) {
           setTestFloat(other.getTestFloat());
         }
         if (other.getTestFixed32() != 0) {
@@ -1681,8 +1682,8 @@ public static final class TestMessage2 extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         TestMessage2.class.getName());
     }
@@ -2297,7 +2298,7 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getTestMessageFieldBuilder();
+          internalGetTestMessageFieldBuilder();
         }
       }
       @java.lang.Override
@@ -2432,13 +2433,13 @@ public Builder mergeFrom(io.confluent.kafka.serializers.protobuf.test.TestMessag
         if (other.getTestBool() != false) {
           setTestBool(other.getTestBool());
         }
-        if (other.getTestBytes() != com.google.protobuf.ByteString.EMPTY) {
+        if (!other.getTestBytes().isEmpty()) {
           setTestBytes(other.getTestBytes());
         }
-        if (other.getTestDouble() != 0D) {
+        if (java.lang.Double.doubleToRawLongBits(other.getTestDouble()) != 0) {
           setTestDouble(other.getTestDouble());
         }
-        if (other.getTestFloat() != 0F) {
+        if (java.lang.Float.floatToRawIntBits(other.getTestFloat()) != 0) {
           setTestFloat(other.getTestFloat());
         }
         if (other.getTestFixed32() != 0) {
@@ -2577,7 +2578,7 @@ public Builder mergeFrom(
               } // case 120
               case 130: {
                 input.readMessage(
-                    getTestMessageFieldBuilder().getBuilder(),
+                    internalGetTestMessageFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00008000;
                 break;
@@ -3210,7 +3211,7 @@ public Builder clearTestMessage() {
       public io.confluent.kafka.serializers.protobuf.test.TestMessageProtos.TestMessage.Builder getTestMessageBuilder() {
         bitField0_ |= 0x00008000;
         onChanged();
-        return getTestMessageFieldBuilder().getBuilder();
+        return internalGetTestMessageFieldBuilder().getBuilder();
       }
       /**
        * .io.confluent.kafka.serializers.protobuf.test.TestMessage test_message = 16;
@@ -3228,7 +3229,7 @@ public io.confluent.kafka.serializers.protobuf.test.TestMessageProtos.TestMessag
        */
       private com.google.protobuf.SingleFieldBuilder<
           io.confluent.kafka.serializers.protobuf.test.TestMessageProtos.TestMessage, io.confluent.kafka.serializers.protobuf.test.TestMessageProtos.TestMessage.Builder, io.confluent.kafka.serializers.protobuf.test.TestMessageProtos.TestMessageOrBuilder> 
-          getTestMessageFieldBuilder() {
+          internalGetTestMessageFieldBuilder() {
         if (testMessageBuilder_ == null) {
           testMessageBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               io.confluent.kafka.serializers.protobuf.test.TestMessageProtos.TestMessage, io.confluent.kafka.serializers.protobuf.test.TestMessageProtos.TestMessage.Builder, io.confluent.kafka.serializers.protobuf.test.TestMessageProtos.TestMessageOrBuilder>(
diff --git a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/TimeOfDayValueOuterClass.java b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/TimeOfDayValueOuterClass.java
index e92eaa47d51..ca7aaa4974d 100644
--- a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/TimeOfDayValueOuterClass.java
+++ b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/TimeOfDayValueOuterClass.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: TimeOfDayValue.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.serializers.protobuf.test;
 
+@com.google.protobuf.Generated
 public final class TimeOfDayValueOuterClass {
   private TimeOfDayValueOuterClass() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       TimeOfDayValueOuterClass.class.getName());
   }
@@ -72,8 +73,8 @@ public static final class TimeOfDayValue extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         TimeOfDayValue.class.getName());
     }
@@ -335,7 +336,7 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getValueFieldBuilder();
+          internalGetValueFieldBuilder();
         }
       }
       @java.lang.Override
@@ -433,7 +434,7 @@ public Builder mergeFrom(
                 break;
               case 10: {
                 input.readMessage(
-                    getValueFieldBuilder().getBuilder(),
+                    internalGetValueFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000001;
                 break;
@@ -574,7 +575,7 @@ public Builder clearValue() {
       public com.google.type.TimeOfDay.Builder getValueBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
-        return getValueFieldBuilder().getBuilder();
+        return internalGetValueFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -600,7 +601,7 @@ public com.google.type.TimeOfDayOrBuilder getValueOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           com.google.type.TimeOfDay, com.google.type.TimeOfDay.Builder, com.google.type.TimeOfDayOrBuilder> 
-          getValueFieldBuilder() {
+          internalGetValueFieldBuilder() {
         if (valueBuilder_ == null) {
           valueBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               com.google.type.TimeOfDay, com.google.type.TimeOfDay.Builder, com.google.type.TimeOfDayOrBuilder>(
diff --git a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/TimestampValueOuterClass.java b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/TimestampValueOuterClass.java
index 479cfea0d86..669d68026bd 100644
--- a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/TimestampValueOuterClass.java
+++ b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/TimestampValueOuterClass.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: TimestampValue.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.serializers.protobuf.test;
 
+@com.google.protobuf.Generated
 public final class TimestampValueOuterClass {
   private TimestampValueOuterClass() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       TimestampValueOuterClass.class.getName());
   }
@@ -72,8 +73,8 @@ public static final class TimestampValue extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         TimestampValue.class.getName());
     }
@@ -335,7 +336,7 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getValueFieldBuilder();
+          internalGetValueFieldBuilder();
         }
       }
       @java.lang.Override
@@ -433,7 +434,7 @@ public Builder mergeFrom(
                 break;
               case 10: {
                 input.readMessage(
-                    getValueFieldBuilder().getBuilder(),
+                    internalGetValueFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000001;
                 break;
@@ -574,7 +575,7 @@ public Builder clearValue() {
       public com.google.protobuf.Timestamp.Builder getValueBuilder() {
         bitField0_ |= 0x00000001;
         onChanged();
-        return getValueFieldBuilder().getBuilder();
+        return internalGetValueFieldBuilder().getBuilder();
       }
       /**
        * 
@@ -600,7 +601,7 @@ public com.google.protobuf.TimestampOrBuilder getValueOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
-          getValueFieldBuilder() {
+          internalGetValueFieldBuilder() {
         if (valueBuilder_ == null) {
           valueBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
diff --git a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/UInt32ValueOuterClass.java b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/UInt32ValueOuterClass.java
index 9f9fa1f5ead..7ee2e33baa6 100644
--- a/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/UInt32ValueOuterClass.java
+++ b/protobuf-serializer/src/test/java/io/confluent/kafka/serializers/protobuf/test/UInt32ValueOuterClass.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: UInt32Value.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.serializers.protobuf.test;
 
+@com.google.protobuf.Generated
 public final class UInt32ValueOuterClass {
   private UInt32ValueOuterClass() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       UInt32ValueOuterClass.class.getName());
   }
@@ -51,8 +52,8 @@ public static final class UInt32Value extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         UInt32Value.class.getName());
     }
diff --git a/protobuf-types/src/main/java/io/confluent/protobuf/MetaProto.java b/protobuf-types/src/main/java/io/confluent/protobuf/MetaProto.java
index 03e1c221d3a..1c422054df5 100644
--- a/protobuf-types/src/main/java/io/confluent/protobuf/MetaProto.java
+++ b/protobuf-types/src/main/java/io/confluent/protobuf/MetaProto.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: confluent/meta.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.protobuf;
 
+@com.google.protobuf.Generated
 public final class MetaProto {
   private MetaProto() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       MetaProto.class.getName());
   }
@@ -117,8 +118,8 @@ public static final class Meta extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Meta.class.getName());
     }
diff --git a/protobuf-types/src/main/java/io/confluent/protobuf/type/Decimal.java b/protobuf-types/src/main/java/io/confluent/protobuf/type/Decimal.java
index 67968c0f1b6..55afdc798ab 100644
--- a/protobuf-types/src/main/java/io/confluent/protobuf/type/Decimal.java
+++ b/protobuf-types/src/main/java/io/confluent/protobuf/type/Decimal.java
@@ -1,13 +1,14 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: confluent/type/decimal.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.protobuf.type;
 
 /**
  * Protobuf type {@code confluent.type.Decimal}
  */
+@com.google.protobuf.Generated
 public final class Decimal extends
     com.google.protobuf.GeneratedMessage implements
     // @@protoc_insertion_point(message_implements:confluent.type.Decimal)
@@ -17,8 +18,8 @@ public final class Decimal extends
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       Decimal.class.getName());
   }
@@ -360,7 +361,7 @@ public Builder mergeFrom(com.google.protobuf.Message other) {
 
     public Builder mergeFrom(io.confluent.protobuf.type.Decimal other) {
       if (other == io.confluent.protobuf.type.Decimal.getDefaultInstance()) return this;
-      if (other.getValue() != com.google.protobuf.ByteString.EMPTY) {
+      if (!other.getValue().isEmpty()) {
         setValue(other.getValue());
       }
       if (other.getPrecision() != 0) {
diff --git a/protobuf-types/src/main/java/io/confluent/protobuf/type/DecimalOrBuilder.java b/protobuf-types/src/main/java/io/confluent/protobuf/type/DecimalOrBuilder.java
index 9fee7f0c859..ae6021049c3 100644
--- a/protobuf-types/src/main/java/io/confluent/protobuf/type/DecimalOrBuilder.java
+++ b/protobuf-types/src/main/java/io/confluent/protobuf/type/DecimalOrBuilder.java
@@ -1,10 +1,11 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: confluent/type/decimal.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.protobuf.type;
 
+@com.google.protobuf.Generated
 public interface DecimalOrBuilder extends
     // @@protoc_insertion_point(interface_extends:confluent.type.Decimal)
     com.google.protobuf.MessageOrBuilder {
diff --git a/protobuf-types/src/main/java/io/confluent/protobuf/type/DecimalProto.java b/protobuf-types/src/main/java/io/confluent/protobuf/type/DecimalProto.java
index 5dee5727540..be8ad521882 100644
--- a/protobuf-types/src/main/java/io/confluent/protobuf/type/DecimalProto.java
+++ b/protobuf-types/src/main/java/io/confluent/protobuf/type/DecimalProto.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: confluent/type/decimal.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.protobuf.type;
 
+@com.google.protobuf.Generated
 public final class DecimalProto {
   private DecimalProto() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       DecimalProto.class.getName());
   }
diff --git a/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/ExpiringSpecificWidgetProto.java b/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/ExpiringSpecificWidgetProto.java
index ceaa803fef0..36d9618d205 100644
--- a/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/ExpiringSpecificWidgetProto.java
+++ b/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/ExpiringSpecificWidgetProto.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: ExpiringSpecificWidget.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.schemaregistry.rules;
 
+@com.google.protobuf.Generated
 public final class ExpiringSpecificWidgetProto {
   private ExpiringSpecificWidgetProto() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       ExpiringSpecificWidgetProto.class.getName());
   }
@@ -80,8 +81,8 @@ public static final class ExpiringSpecificWidget extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         ExpiringSpecificWidget.class.getName());
     }
@@ -421,7 +422,7 @@ private Builder(
       private void maybeForceBuilderInitialization() {
         if (com.google.protobuf.GeneratedMessage
                 .alwaysUseFieldBuilders) {
-          getExpirationFieldBuilder();
+          internalGetExpirationFieldBuilder();
         }
       }
       @java.lang.Override
@@ -557,7 +558,7 @@ public Builder mergeFrom(
               } // case 24
               case 34: {
                 input.readMessage(
-                    getExpirationFieldBuilder().getBuilder(),
+                    internalGetExpirationFieldBuilder().getBuilder(),
                     extensionRegistry);
                 bitField0_ |= 0x00000008;
                 break;
@@ -806,7 +807,7 @@ public Builder clearExpiration() {
       public com.google.protobuf.Timestamp.Builder getExpirationBuilder() {
         bitField0_ |= 0x00000008;
         onChanged();
-        return getExpirationFieldBuilder().getBuilder();
+        return internalGetExpirationFieldBuilder().getBuilder();
       }
       /**
        * .google.protobuf.Timestamp expiration = 4;
@@ -824,7 +825,7 @@ public com.google.protobuf.TimestampOrBuilder getExpirationOrBuilder() {
        */
       private com.google.protobuf.SingleFieldBuilder<
           com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder> 
-          getExpirationFieldBuilder() {
+          internalGetExpirationFieldBuilder() {
         if (expirationBuilder_ == null) {
           expirationBuilder_ = new com.google.protobuf.SingleFieldBuilder<
               com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>(
diff --git a/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/NewSpecificWidgetProto.java b/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/NewSpecificWidgetProto.java
index 653501398da..ce0932c226b 100644
--- a/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/NewSpecificWidgetProto.java
+++ b/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/NewSpecificWidgetProto.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: NewSpecificWidget.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.schemaregistry.rules;
 
+@com.google.protobuf.Generated
 public final class NewSpecificWidgetProto {
   private NewSpecificWidgetProto() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       NewSpecificWidgetProto.class.getName());
   }
@@ -65,8 +66,8 @@ public static final class NewSpecificWidget extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         NewSpecificWidget.class.getName());
     }
diff --git a/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/NewWidgetProto.java b/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/NewWidgetProto.java
index 7f9c56de846..a0907ad62dd 100644
--- a/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/NewWidgetProto.java
+++ b/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/NewWidgetProto.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: NewWidget.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.schemaregistry.rules;
 
+@com.google.protobuf.Generated
 public final class NewWidgetProto {
   private NewWidgetProto() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       NewWidgetProto.class.getName());
   }
@@ -49,8 +50,8 @@ public enum Kind
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Kind.class.getName());
     }
@@ -123,7 +124,7 @@ public Kind findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return io.confluent.kafka.schemaregistry.rules.NewWidgetProto.getDescriptor().getEnumTypes().get(0);
     }
@@ -345,8 +346,8 @@ public static final class NewWidget extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         NewWidget.class.getName());
     }
@@ -1298,7 +1299,7 @@ public Builder mergeFrom(io.confluent.kafka.schemaregistry.rules.NewWidgetProto.
           bitField0_ |= 0x00000004;
           onChanged();
         }
-        if (other.getMybytes() != com.google.protobuf.ByteString.EMPTY) {
+        if (!other.getMybytes().isEmpty()) {
           setMybytes(other.getMybytes());
         }
         if (other.getMyint() != 0) {
@@ -1307,10 +1308,10 @@ public Builder mergeFrom(io.confluent.kafka.schemaregistry.rules.NewWidgetProto.
         if (other.getMylong() != 0L) {
           setMylong(other.getMylong());
         }
-        if (other.getMyfloat() != 0F) {
+        if (java.lang.Float.floatToRawIntBits(other.getMyfloat()) != 0) {
           setMyfloat(other.getMyfloat());
         }
-        if (other.getMydouble() != 0D) {
+        if (java.lang.Double.doubleToRawLongBits(other.getMydouble()) != 0) {
           setMydouble(other.getMydouble());
         }
         if (other.getMyboolean() != false) {
@@ -1349,7 +1350,7 @@ public Builder mergeFrom(io.confluent.kafka.schemaregistry.rules.NewWidgetProto.
               bitField0_ = (bitField0_ & ~0x00000800);
               piiArrayBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getPiiArrayFieldBuilder() : null;
+                   internalGetPiiArrayFieldBuilder() : null;
             } else {
               piiArrayBuilder_.addAllMessages(other.piiArray_);
             }
@@ -1937,9 +1938,7 @@ public io.confluent.kafka.schemaregistry.rules.NewWidgetProto.Kind getKind() {
        * @return This builder for chaining.
        */
       public Builder setKind(io.confluent.kafka.schemaregistry.rules.NewWidgetProto.Kind value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000200;
         kind_ = value.getNumber();
         onChanged();
@@ -2247,7 +2246,7 @@ public Builder removePiiArray(int index) {
        */
       public io.confluent.kafka.schemaregistry.rules.NewWidgetProto.Pii.Builder getPiiArrayBuilder(
           int index) {
-        return getPiiArrayFieldBuilder().getBuilder(index);
+        return internalGetPiiArrayFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .io.confluent.kafka.schemaregistry.rules.newwidget.Pii pii_array = 12;
@@ -2274,7 +2273,7 @@ public io.confluent.kafka.schemaregistry.rules.NewWidgetProto.PiiOrBuilder getPi
        * repeated .io.confluent.kafka.schemaregistry.rules.newwidget.Pii pii_array = 12;
        */
       public io.confluent.kafka.schemaregistry.rules.NewWidgetProto.Pii.Builder addPiiArrayBuilder() {
-        return getPiiArrayFieldBuilder().addBuilder(
+        return internalGetPiiArrayFieldBuilder().addBuilder(
             io.confluent.kafka.schemaregistry.rules.NewWidgetProto.Pii.getDefaultInstance());
       }
       /**
@@ -2282,7 +2281,7 @@ public io.confluent.kafka.schemaregistry.rules.NewWidgetProto.Pii.Builder addPii
        */
       public io.confluent.kafka.schemaregistry.rules.NewWidgetProto.Pii.Builder addPiiArrayBuilder(
           int index) {
-        return getPiiArrayFieldBuilder().addBuilder(
+        return internalGetPiiArrayFieldBuilder().addBuilder(
             index, io.confluent.kafka.schemaregistry.rules.NewWidgetProto.Pii.getDefaultInstance());
       }
       /**
@@ -2290,11 +2289,11 @@ public io.confluent.kafka.schemaregistry.rules.NewWidgetProto.Pii.Builder addPii
        */
       public java.util.List 
            getPiiArrayBuilderList() {
-        return getPiiArrayFieldBuilder().getBuilderList();
+        return internalGetPiiArrayFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           io.confluent.kafka.schemaregistry.rules.NewWidgetProto.Pii, io.confluent.kafka.schemaregistry.rules.NewWidgetProto.Pii.Builder, io.confluent.kafka.schemaregistry.rules.NewWidgetProto.PiiOrBuilder> 
-          getPiiArrayFieldBuilder() {
+          internalGetPiiArrayFieldBuilder() {
         if (piiArrayBuilder_ == null) {
           piiArrayBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               io.confluent.kafka.schemaregistry.rules.NewWidgetProto.Pii, io.confluent.kafka.schemaregistry.rules.NewWidgetProto.Pii.Builder, io.confluent.kafka.schemaregistry.rules.NewWidgetProto.PiiOrBuilder>(
@@ -2605,8 +2604,8 @@ public static final class Pii extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Pii.class.getName());
     }
diff --git a/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/NewerSpecificWidgetProto.java b/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/NewerSpecificWidgetProto.java
index 23a738d10b4..a2bdbe659fc 100644
--- a/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/NewerSpecificWidgetProto.java
+++ b/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/NewerSpecificWidgetProto.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: NewerSpecificWidget.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.schemaregistry.rules;
 
+@com.google.protobuf.Generated
 public final class NewerSpecificWidgetProto {
   private NewerSpecificWidgetProto() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       NewerSpecificWidgetProto.class.getName());
   }
@@ -65,8 +66,8 @@ public static final class NewerSpecificWidget extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         NewerSpecificWidget.class.getName());
     }
diff --git a/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/PiiProto.java b/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/PiiProto.java
index 30443681b25..c0135bec38d 100644
--- a/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/PiiProto.java
+++ b/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/PiiProto.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: Pii.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.schemaregistry.rules;
 
+@com.google.protobuf.Generated
 public final class PiiProto {
   private PiiProto() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       PiiProto.class.getName());
   }
@@ -53,8 +54,8 @@ public static final class Pii extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Pii.class.getName());
     }
diff --git a/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/SpecificWidgetProto.java b/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/SpecificWidgetProto.java
index d00d906702f..a4849118a33 100644
--- a/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/SpecificWidgetProto.java
+++ b/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/SpecificWidgetProto.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: SpecificWidget.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.schemaregistry.rules;
 
+@com.google.protobuf.Generated
 public final class SpecificWidgetProto {
   private SpecificWidgetProto() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       SpecificWidgetProto.class.getName());
   }
@@ -65,8 +66,8 @@ public static final class SpecificWidget extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         SpecificWidget.class.getName());
     }
diff --git a/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetProto.java b/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetProto.java
index 654b26a9731..3a91cf73078 100644
--- a/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetProto.java
+++ b/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetProto.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: Widget.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.schemaregistry.rules;
 
+@com.google.protobuf.Generated
 public final class WidgetProto {
   private WidgetProto() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       WidgetProto.class.getName());
   }
@@ -49,8 +50,8 @@ public enum Kind
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Kind.class.getName());
     }
@@ -123,7 +124,7 @@ public Kind findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return io.confluent.kafka.schemaregistry.rules.WidgetProto.getDescriptor().getEnumTypes().get(0);
     }
@@ -379,8 +380,8 @@ public static final class Widget extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Widget.class.getName());
     }
@@ -1510,7 +1511,7 @@ public Builder mergeFrom(io.confluent.kafka.schemaregistry.rules.WidgetProto.Wid
           bitField0_ |= 0x00000004;
           onChanged();
         }
-        if (other.getMybytes() != com.google.protobuf.ByteString.EMPTY) {
+        if (!other.getMybytes().isEmpty()) {
           setMybytes(other.getMybytes());
         }
         if (other.getMyint() != 0) {
@@ -1519,10 +1520,10 @@ public Builder mergeFrom(io.confluent.kafka.schemaregistry.rules.WidgetProto.Wid
         if (other.getMylong() != 0L) {
           setMylong(other.getMylong());
         }
-        if (other.getMyfloat() != 0F) {
+        if (java.lang.Float.floatToRawIntBits(other.getMyfloat()) != 0) {
           setMyfloat(other.getMyfloat());
         }
-        if (other.getMydouble() != 0D) {
+        if (java.lang.Double.doubleToRawLongBits(other.getMydouble()) != 0) {
           setMydouble(other.getMydouble());
         }
         if (other.getMyboolean() != false) {
@@ -1561,7 +1562,7 @@ public Builder mergeFrom(io.confluent.kafka.schemaregistry.rules.WidgetProto.Wid
               bitField0_ = (bitField0_ & ~0x00000800);
               piiArrayBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getPiiArrayFieldBuilder() : null;
+                   internalGetPiiArrayFieldBuilder() : null;
             } else {
               piiArrayBuilder_.addAllMessages(other.piiArray_);
             }
@@ -1707,7 +1708,7 @@ public Builder mergeFrom(
               } // case 120
               case 130: {
                 input.readMessage(
-                    getOneofMessageFieldBuilder().getBuilder(),
+                    internalGetOneofMessageFieldBuilder().getBuilder(),
                     extensionRegistry);
                 piiOneofCase_ = 16;
                 break;
@@ -2192,9 +2193,7 @@ public io.confluent.kafka.schemaregistry.rules.WidgetProto.Kind getKind() {
        * @return This builder for chaining.
        */
       public Builder setKind(io.confluent.kafka.schemaregistry.rules.WidgetProto.Kind value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000200;
         kind_ = value.getNumber();
         onChanged();
@@ -2502,7 +2501,7 @@ public Builder removePiiArray(int index) {
        */
       public io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii.Builder getPiiArrayBuilder(
           int index) {
-        return getPiiArrayFieldBuilder().getBuilder(index);
+        return internalGetPiiArrayFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .io.confluent.kafka.schemaregistry.rules.widget.Pii pii_array = 12;
@@ -2529,7 +2528,7 @@ public io.confluent.kafka.schemaregistry.rules.WidgetProto.PiiOrBuilder getPiiAr
        * repeated .io.confluent.kafka.schemaregistry.rules.widget.Pii pii_array = 12;
        */
       public io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii.Builder addPiiArrayBuilder() {
-        return getPiiArrayFieldBuilder().addBuilder(
+        return internalGetPiiArrayFieldBuilder().addBuilder(
             io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii.getDefaultInstance());
       }
       /**
@@ -2537,7 +2536,7 @@ public io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii.Builder addPiiArr
        */
       public io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii.Builder addPiiArrayBuilder(
           int index) {
-        return getPiiArrayFieldBuilder().addBuilder(
+        return internalGetPiiArrayFieldBuilder().addBuilder(
             index, io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii.getDefaultInstance());
       }
       /**
@@ -2545,11 +2544,11 @@ public io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii.Builder addPiiArr
        */
       public java.util.List 
            getPiiArrayBuilderList() {
-        return getPiiArrayFieldBuilder().getBuilderList();
+        return internalGetPiiArrayFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii, io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii.Builder, io.confluent.kafka.schemaregistry.rules.WidgetProto.PiiOrBuilder> 
-          getPiiArrayFieldBuilder() {
+          internalGetPiiArrayFieldBuilder() {
         if (piiArrayBuilder_ == null) {
           piiArrayBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii, io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii.Builder, io.confluent.kafka.schemaregistry.rules.WidgetProto.PiiOrBuilder>(
@@ -2885,7 +2884,7 @@ public Builder clearOneofMessage() {
        * .io.confluent.kafka.schemaregistry.rules.widget.Pii oneof_message = 16;
        */
       public io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii.Builder getOneofMessageBuilder() {
-        return getOneofMessageFieldBuilder().getBuilder();
+        return internalGetOneofMessageFieldBuilder().getBuilder();
       }
       /**
        * .io.confluent.kafka.schemaregistry.rules.widget.Pii oneof_message = 16;
@@ -2906,7 +2905,7 @@ public io.confluent.kafka.schemaregistry.rules.WidgetProto.PiiOrBuilder getOneof
        */
       private com.google.protobuf.SingleFieldBuilder<
           io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii, io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii.Builder, io.confluent.kafka.schemaregistry.rules.WidgetProto.PiiOrBuilder> 
-          getOneofMessageFieldBuilder() {
+          internalGetOneofMessageFieldBuilder() {
         if (oneofMessageBuilder_ == null) {
           if (!(piiOneofCase_ == 16)) {
             piiOneof_ = io.confluent.kafka.schemaregistry.rules.WidgetProto.Pii.getDefaultInstance();
@@ -3095,8 +3094,8 @@ public static final class Pii extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Pii.class.getName());
     }
diff --git a/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetProto2.java b/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetProto2.java
index d44dc43e158..99646e92a53 100644
--- a/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetProto2.java
+++ b/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetProto2.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: Widget2.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.schemaregistry.rules;
 
+@com.google.protobuf.Generated
 public final class WidgetProto2 {
   private WidgetProto2() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       WidgetProto2.class.getName());
   }
@@ -48,8 +49,8 @@ public enum Kind
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Kind.class.getName());
     }
@@ -114,7 +115,7 @@ public Kind findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return io.confluent.kafka.schemaregistry.rules.WidgetProto2.getDescriptor().getEnumTypes().get(0);
     }
@@ -422,8 +423,8 @@ public static final class Widget2 extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Widget2.class.getName());
     }
@@ -1777,7 +1778,7 @@ public Builder mergeFrom(io.confluent.kafka.schemaregistry.rules.WidgetProto2.Wi
               bitField0_ = (bitField0_ & ~0x00000800);
               piiArrayBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getPiiArrayFieldBuilder() : null;
+                   internalGetPiiArrayFieldBuilder() : null;
             } else {
               piiArrayBuilder_.addAllMessages(other.piiArray_);
             }
@@ -1933,7 +1934,7 @@ public Builder mergeFrom(
               } // case 120
               case 130: {
                 input.readMessage(
-                    getOneofMessageFieldBuilder().getBuilder(),
+                    internalGetOneofMessageFieldBuilder().getBuilder(),
                     extensionRegistry);
                 piiOneofCase_ = 16;
                 break;
@@ -2479,9 +2480,7 @@ public io.confluent.kafka.schemaregistry.rules.WidgetProto2.Kind getKind() {
        * @return This builder for chaining.
        */
       public Builder setKind(io.confluent.kafka.schemaregistry.rules.WidgetProto2.Kind value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000200;
         kind_ = value.getNumber();
         onChanged();
@@ -2788,7 +2787,7 @@ public Builder removePiiArray(int index) {
        */
       public io.confluent.kafka.schemaregistry.rules.WidgetProto2.Pii.Builder getPiiArrayBuilder(
           int index) {
-        return getPiiArrayFieldBuilder().getBuilder(index);
+        return internalGetPiiArrayFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .io.confluent.kafka.schemaregistry.rules.widget2.Pii pii_array = 12;
@@ -2815,7 +2814,7 @@ public io.confluent.kafka.schemaregistry.rules.WidgetProto2.PiiOrBuilder getPiiA
        * repeated .io.confluent.kafka.schemaregistry.rules.widget2.Pii pii_array = 12;
        */
       public io.confluent.kafka.schemaregistry.rules.WidgetProto2.Pii.Builder addPiiArrayBuilder() {
-        return getPiiArrayFieldBuilder().addBuilder(
+        return internalGetPiiArrayFieldBuilder().addBuilder(
             io.confluent.kafka.schemaregistry.rules.WidgetProto2.Pii.getDefaultInstance());
       }
       /**
@@ -2823,7 +2822,7 @@ public io.confluent.kafka.schemaregistry.rules.WidgetProto2.Pii.Builder addPiiAr
        */
       public io.confluent.kafka.schemaregistry.rules.WidgetProto2.Pii.Builder addPiiArrayBuilder(
           int index) {
-        return getPiiArrayFieldBuilder().addBuilder(
+        return internalGetPiiArrayFieldBuilder().addBuilder(
             index, io.confluent.kafka.schemaregistry.rules.WidgetProto2.Pii.getDefaultInstance());
       }
       /**
@@ -2831,11 +2830,11 @@ public io.confluent.kafka.schemaregistry.rules.WidgetProto2.Pii.Builder addPiiAr
        */
       public java.util.List 
            getPiiArrayBuilderList() {
-        return getPiiArrayFieldBuilder().getBuilderList();
+        return internalGetPiiArrayFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           io.confluent.kafka.schemaregistry.rules.WidgetProto2.Pii, io.confluent.kafka.schemaregistry.rules.WidgetProto2.Pii.Builder, io.confluent.kafka.schemaregistry.rules.WidgetProto2.PiiOrBuilder> 
-          getPiiArrayFieldBuilder() {
+          internalGetPiiArrayFieldBuilder() {
         if (piiArrayBuilder_ == null) {
           piiArrayBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               io.confluent.kafka.schemaregistry.rules.WidgetProto2.Pii, io.confluent.kafka.schemaregistry.rules.WidgetProto2.Pii.Builder, io.confluent.kafka.schemaregistry.rules.WidgetProto2.PiiOrBuilder>(
@@ -3187,7 +3186,7 @@ public Builder clearOneofMessage() {
        * .io.confluent.kafka.schemaregistry.rules.widget2.Pii oneof_message = 16;
        */
       public io.confluent.kafka.schemaregistry.rules.WidgetProto2.Pii.Builder getOneofMessageBuilder() {
-        return getOneofMessageFieldBuilder().getBuilder();
+        return internalGetOneofMessageFieldBuilder().getBuilder();
       }
       /**
        * .io.confluent.kafka.schemaregistry.rules.widget2.Pii oneof_message = 16;
@@ -3208,7 +3207,7 @@ public io.confluent.kafka.schemaregistry.rules.WidgetProto2.PiiOrBuilder getOneo
        */
       private com.google.protobuf.SingleFieldBuilder<
           io.confluent.kafka.schemaregistry.rules.WidgetProto2.Pii, io.confluent.kafka.schemaregistry.rules.WidgetProto2.Pii.Builder, io.confluent.kafka.schemaregistry.rules.WidgetProto2.PiiOrBuilder> 
-          getOneofMessageFieldBuilder() {
+          internalGetOneofMessageFieldBuilder() {
         if (oneofMessageBuilder_ == null) {
           if (!(piiOneofCase_ == 16)) {
             piiOneof_ = io.confluent.kafka.schemaregistry.rules.WidgetProto2.Pii.getDefaultInstance();
@@ -3403,8 +3402,8 @@ public static final class Pii extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Pii.class.getName());
     }
diff --git a/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetWithRefProto.java b/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetWithRefProto.java
index d583743c6ff..5027aba95eb 100644
--- a/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetWithRefProto.java
+++ b/schema-rules/src/test/java/io/confluent/kafka/schemaregistry/rules/WidgetWithRefProto.java
@@ -1,18 +1,19 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 // NO CHECKED-IN PROTOBUF GENCODE
 // source: WidgetWithRef.proto
-// Protobuf Java Version: 4.29.3
+// Protobuf Java Version: 4.31.1
 
 package io.confluent.kafka.schemaregistry.rules;
 
+@com.google.protobuf.Generated
 public final class WidgetWithRefProto {
   private WidgetWithRefProto() {}
   static {
     com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
       com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
       /* major= */ 4,
-      /* minor= */ 29,
-      /* patch= */ 3,
+      /* minor= */ 31,
+      /* patch= */ 1,
       /* suffix= */ "",
       WidgetWithRefProto.class.getName());
   }
@@ -49,8 +50,8 @@ public enum Kind
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         Kind.class.getName());
     }
@@ -123,7 +124,7 @@ public Kind findValueByNumber(int number) {
         getDescriptorForType() {
       return getDescriptor();
     }
-    public static final com.google.protobuf.Descriptors.EnumDescriptor
+    public static com.google.protobuf.Descriptors.EnumDescriptor
         getDescriptor() {
       return io.confluent.kafka.schemaregistry.rules.WidgetWithRefProto.getDescriptor().getEnumTypes().get(0);
     }
@@ -309,8 +310,8 @@ public static final class WidgetWithRef extends
       com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion(
         com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC,
         /* major= */ 4,
-        /* minor= */ 29,
-        /* patch= */ 3,
+        /* minor= */ 31,
+        /* patch= */ 1,
         /* suffix= */ "",
         WidgetWithRef.class.getName());
     }
@@ -1132,7 +1133,7 @@ public Builder mergeFrom(io.confluent.kafka.schemaregistry.rules.WidgetWithRefPr
               bitField0_ = (bitField0_ & ~0x00000020);
               piiArrayBuilder_ = 
                 com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
-                   getPiiArrayFieldBuilder() : null;
+                   internalGetPiiArrayFieldBuilder() : null;
             } else {
               piiArrayBuilder_.addAllMessages(other.piiArray_);
             }
@@ -1498,9 +1499,7 @@ public io.confluent.kafka.schemaregistry.rules.WidgetWithRefProto.Kind getKind()
        * @return This builder for chaining.
        */
       public Builder setKind(io.confluent.kafka.schemaregistry.rules.WidgetWithRefProto.Kind value) {
-        if (value == null) {
-          throw new NullPointerException();
-        }
+        if (value == null) { throw new NullPointerException(); }
         bitField0_ |= 0x00000008;
         kind_ = value.getNumber();
         onChanged();
@@ -1808,7 +1807,7 @@ public Builder removePiiArray(int index) {
        */
       public io.confluent.kafka.schemaregistry.rules.PiiProto.Pii.Builder getPiiArrayBuilder(
           int index) {
-        return getPiiArrayFieldBuilder().getBuilder(index);
+        return internalGetPiiArrayFieldBuilder().getBuilder(index);
       }
       /**
        * repeated .io.confluent.kafka.schemaregistry.rules.Pii pii_array = 6;
@@ -1835,7 +1834,7 @@ public io.confluent.kafka.schemaregistry.rules.PiiProto.PiiOrBuilder getPiiArray
        * repeated .io.confluent.kafka.schemaregistry.rules.Pii pii_array = 6;
        */
       public io.confluent.kafka.schemaregistry.rules.PiiProto.Pii.Builder addPiiArrayBuilder() {
-        return getPiiArrayFieldBuilder().addBuilder(
+        return internalGetPiiArrayFieldBuilder().addBuilder(
             io.confluent.kafka.schemaregistry.rules.PiiProto.Pii.getDefaultInstance());
       }
       /**
@@ -1843,7 +1842,7 @@ public io.confluent.kafka.schemaregistry.rules.PiiProto.Pii.Builder addPiiArrayB
        */
       public io.confluent.kafka.schemaregistry.rules.PiiProto.Pii.Builder addPiiArrayBuilder(
           int index) {
-        return getPiiArrayFieldBuilder().addBuilder(
+        return internalGetPiiArrayFieldBuilder().addBuilder(
             index, io.confluent.kafka.schemaregistry.rules.PiiProto.Pii.getDefaultInstance());
       }
       /**
@@ -1851,11 +1850,11 @@ public io.confluent.kafka.schemaregistry.rules.PiiProto.Pii.Builder addPiiArrayB
        */
       public java.util.List 
            getPiiArrayBuilderList() {
-        return getPiiArrayFieldBuilder().getBuilderList();
+        return internalGetPiiArrayFieldBuilder().getBuilderList();
       }
       private com.google.protobuf.RepeatedFieldBuilder<
           io.confluent.kafka.schemaregistry.rules.PiiProto.Pii, io.confluent.kafka.schemaregistry.rules.PiiProto.Pii.Builder, io.confluent.kafka.schemaregistry.rules.PiiProto.PiiOrBuilder> 
-          getPiiArrayFieldBuilder() {
+          internalGetPiiArrayFieldBuilder() {
         if (piiArrayBuilder_ == null) {
           piiArrayBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
               io.confluent.kafka.schemaregistry.rules.PiiProto.Pii, io.confluent.kafka.schemaregistry.rules.PiiProto.Pii.Builder, io.confluent.kafka.schemaregistry.rules.PiiProto.PiiOrBuilder>(