From d9967f322f78a74f23f6ddee9a850b7cebb551ac Mon Sep 17 00:00:00 2001 From: Mike Prieto Date: Fri, 7 Jun 2024 16:44:31 +0000 Subject: [PATCH 1/6] chore: Regenerate us-states.proto to no longer reference removed methods --- .../src/main/java/utilities/StateProto.java | 532 ++++++++---------- 1 file changed, 242 insertions(+), 290 deletions(-) diff --git a/samples/snippets/src/main/java/utilities/StateProto.java b/samples/snippets/src/main/java/utilities/StateProto.java index 60701da37..80b173599 100644 --- a/samples/snippets/src/main/java/utilities/StateProto.java +++ b/samples/snippets/src/main/java/utilities/StateProto.java @@ -1,5 +1,5 @@ /* - * Copyright 2021 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,7 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: us-states.proto +// Protobuf Java Version: 4.26.1 /** * This file is created using protoc. @@ -31,128 +32,85 @@ public final class StateProto { private StateProto() {} - - public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {} - - public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) { - registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry); + static { + com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( + com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, + /* major= */ 4, + /* minor= */ 26, + /* patch= */ 1, + /* suffix= */ "", + StateProto.class.getName()); + } + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { } - public interface StateOrBuilder - extends + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + public interface StateOrBuilder extends // @@protoc_insertion_point(interface_extends:utilities.State) com.google.protobuf.MessageOrBuilder { /** * string name = 1; - * * @return The name. */ java.lang.String getName(); /** * string name = 1; - * * @return The bytes for name. */ - com.google.protobuf.ByteString getNameBytes(); + com.google.protobuf.ByteString + getNameBytes(); /** * string post_abbr = 2; - * * @return The postAbbr. */ java.lang.String getPostAbbr(); /** * string post_abbr = 2; - * * @return The bytes for postAbbr. */ - com.google.protobuf.ByteString getPostAbbrBytes(); + com.google.protobuf.ByteString + getPostAbbrBytes(); } - /** Protobuf type {@code utilities.State} */ - public static final class State extends com.google.protobuf.GeneratedMessageV3 - implements + /** + * Protobuf type {@code utilities.State} + */ + public static final class State extends + com.google.protobuf.GeneratedMessage implements // @@protoc_insertion_point(message_implements:utilities.State) StateOrBuilder { - private static final long serialVersionUID = 0L; + private static final long serialVersionUID = 0L; + static { + com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( + com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, + /* major= */ 4, + /* minor= */ 26, + /* patch= */ 1, + /* suffix= */ "", + State.class.getName()); + } // Use State.newBuilder() to construct. - private State(com.google.protobuf.GeneratedMessageV3.Builder builder) { + private State(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); } - private State() { name_ = ""; postAbbr_ = ""; } - @java.lang.Override - @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance(UnusedPrivateParameter unused) { - return new State(); - } - - @java.lang.Override - public final com.google.protobuf.UnknownFieldSet getUnknownFields() { - return this.unknownFields; - } - - private State( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - this(); - if (extensionRegistry == null) { - throw new java.lang.NullPointerException(); - } - com.google.protobuf.UnknownFieldSet.Builder unknownFields = - com.google.protobuf.UnknownFieldSet.newBuilder(); - try { - boolean done = false; - while (!done) { - int tag = input.readTag(); - switch (tag) { - case 0: - done = true; - break; - case 10: - { - java.lang.String s = input.readStringRequireUtf8(); - - name_ = s; - break; - } - case 18: - { - java.lang.String s = input.readStringRequireUtf8(); - - postAbbr_ = s; - break; - } - default: - { - if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { - done = true; - } - break; - } - } - } - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(this); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); - } finally { - this.unknownFields = unknownFields.build(); - makeExtensionsImmutable(); - } - } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { return utilities.StateProto.internal_static_utilities_State_descriptor; } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return utilities.StateProto.internal_static_utilities_State_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -160,10 +118,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - private volatile java.lang.Object name_; + @SuppressWarnings("serial") + private volatile java.lang.Object name_ = ""; /** * string name = 1; - * * @return The name. */ @java.lang.Override @@ -172,7 +130,8 @@ public java.lang.String getName() { if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { - com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); name_ = s; return s; @@ -180,15 +139,16 @@ public java.lang.String getName() { } /** * string name = 1; - * * @return The bytes for name. */ @java.lang.Override - public com.google.protobuf.ByteString getNameBytes() { + public com.google.protobuf.ByteString + getNameBytes() { java.lang.Object ref = name_; if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); name_ = b; return b; } else { @@ -197,10 +157,10 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int POST_ABBR_FIELD_NUMBER = 2; - private volatile java.lang.Object postAbbr_; + @SuppressWarnings("serial") + private volatile java.lang.Object postAbbr_ = ""; /** * string post_abbr = 2; - * * @return The postAbbr. */ @java.lang.Override @@ -209,7 +169,8 @@ public java.lang.String getPostAbbr() { if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { - com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); postAbbr_ = s; return s; @@ -217,15 +178,16 @@ public java.lang.String getPostAbbr() { } /** * string post_abbr = 2; - * * @return The bytes for postAbbr. */ @java.lang.Override - public com.google.protobuf.ByteString getPostAbbrBytes() { + public com.google.protobuf.ByteString + getPostAbbrBytes() { java.lang.Object ref = postAbbr_; if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); postAbbr_ = b; return b; } else { @@ -234,7 +196,6 @@ public com.google.protobuf.ByteString getPostAbbrBytes() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; @@ -246,14 +207,15 @@ public final boolean isInitialized() { } @java.lang.Override - public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!getNameBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(name_)) { + com.google.protobuf.GeneratedMessage.writeString(output, 1, name_); } - if (!getPostAbbrBytes().isEmpty()) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 2, postAbbr_); + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(postAbbr_)) { + com.google.protobuf.GeneratedMessage.writeString(output, 2, postAbbr_); } - unknownFields.writeTo(output); + getUnknownFields().writeTo(output); } @java.lang.Override @@ -262,13 +224,13 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!getNameBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(name_)) { + size += com.google.protobuf.GeneratedMessage.computeStringSize(1, name_); } - if (!getPostAbbrBytes().isEmpty()) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, postAbbr_); + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(postAbbr_)) { + size += com.google.protobuf.GeneratedMessage.computeStringSize(2, postAbbr_); } - size += unknownFields.getSerializedSize(); + size += getUnknownFields().getSerializedSize(); memoizedSize = size; return size; } @@ -276,16 +238,18 @@ public int getSerializedSize() { @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { - return true; + return true; } if (!(obj instanceof utilities.StateProto.State)) { return super.equals(obj); } utilities.StateProto.State other = (utilities.StateProto.State) obj; - if (!getName().equals(other.getName())) return false; - if (!getPostAbbr().equals(other.getPostAbbr())) return false; - if (!unknownFields.equals(other.unknownFields)) return false; + if (!getName() + .equals(other.getName())) return false; + if (!getPostAbbr() + .equals(other.getPostAbbr())) return false; + if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -300,118 +264,117 @@ public int hashCode() { hash = (53 * hash) + getName().hashCode(); hash = (37 * hash) + POST_ABBR_FIELD_NUMBER; hash = (53 * hash) + getPostAbbr().hashCode(); - hash = (29 * hash) + unknownFields.hashCode(); + hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; } - public static utilities.StateProto.State parseFrom(java.nio.ByteBuffer data) + public static utilities.StateProto.State parseFrom( + java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static utilities.StateProto.State parseFrom( - java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static utilities.StateProto.State parseFrom(com.google.protobuf.ByteString data) + public static utilities.StateProto.State parseFrom( + com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static utilities.StateProto.State parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static utilities.StateProto.State parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static utilities.StateProto.State parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static utilities.StateProto.State parseFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); + return com.google.protobuf.GeneratedMessage + .parseWithIOException(PARSER, input); } - public static utilities.StateProto.State parseFrom( - java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseWithIOException( - PARSER, input, extensionRegistry); + return com.google.protobuf.GeneratedMessage + .parseWithIOException(PARSER, input, extensionRegistry); } public static utilities.StateProto.State parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input); + return com.google.protobuf.GeneratedMessage + .parseDelimitedWithIOException(PARSER, input); } public static utilities.StateProto.State parseDelimitedFrom( - java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException( - PARSER, input, extensionRegistry); + return com.google.protobuf.GeneratedMessage + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - - public static utilities.StateProto.State parseFrom(com.google.protobuf.CodedInputStream input) + public static utilities.StateProto.State parseFrom( + com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); + return com.google.protobuf.GeneratedMessage + .parseWithIOException(PARSER, input); } - public static utilities.StateProto.State parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseWithIOException( - PARSER, input, extensionRegistry); + return com.google.protobuf.GeneratedMessage + .parseWithIOException(PARSER, input, extensionRegistry); } @java.lang.Override - public Builder newBuilderForType() { - return newBuilder(); - } - + public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(utilities.StateProto.State prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { - return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); } @java.lang.Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } - /** Protobuf type {@code utilities.State} */ - public static final class Builder - extends com.google.protobuf.GeneratedMessageV3.Builder - implements + /** + * Protobuf type {@code utilities.State} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:utilities.State) utilities.StateProto.StateOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { return utilities.StateProto.internal_static_utilities_State_descriptor; } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return utilities.StateProto.internal_static_utilities_State_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -420,30 +383,26 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { // Construct using utilities.StateProto.State.newBuilder() private Builder() { - maybeForceBuilderInitialization(); + } - private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); - maybeForceBuilderInitialization(); - } - private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders) {} } - @java.lang.Override public Builder clear() { super.clear(); + bitField0_ = 0; name_ = ""; - postAbbr_ = ""; - return this; } @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { return utilities.StateProto.internal_static_utilities_State_descriptor; } @@ -464,51 +423,25 @@ public utilities.StateProto.State build() { @java.lang.Override public utilities.StateProto.State buildPartial() { utilities.StateProto.State result = new utilities.StateProto.State(this); - result.name_ = name_; - result.postAbbr_ = postAbbr_; + if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return result; } - @java.lang.Override - public Builder clone() { - return super.clone(); - } - - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return super.setField(field, value); - } - - @java.lang.Override - public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - - @java.lang.Override - public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, - java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return super.addRepeatedField(field, value); + private void buildPartial0(utilities.StateProto.State result) { + int from_bitField0_ = bitField0_; + if (((from_bitField0_ & 0x00000001) != 0)) { + result.name_ = name_; + } + if (((from_bitField0_ & 0x00000002) != 0)) { + result.postAbbr_ = postAbbr_; + } } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof utilities.StateProto.State) { - return mergeFrom((utilities.StateProto.State) other); + return mergeFrom((utilities.StateProto.State)other); } else { super.mergeFrom(other); return this; @@ -519,13 +452,15 @@ public Builder mergeFrom(utilities.StateProto.State other) { if (other == utilities.StateProto.State.getDefaultInstance()) return this; if (!other.getName().isEmpty()) { name_ = other.name_; + bitField0_ |= 0x00000001; onChanged(); } if (!other.getPostAbbr().isEmpty()) { postAbbr_ = other.postAbbr_; + bitField0_ |= 0x00000002; onChanged(); } - this.mergeUnknownFields(other.unknownFields); + this.mergeUnknownFields(other.getUnknownFields()); onChanged(); return this; } @@ -540,30 +475,54 @@ public Builder mergeFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - utilities.StateProto.State parsedMessage = null; + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 10: { + name_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + postAbbr_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000002; + break; + } // case 18 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: + } // switch (tag) + } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (utilities.StateProto.State) e.getUnfinishedMessage(); throw e.unwrapIOException(); } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } + onChanged(); + } // finally return this; } + private int bitField0_; private java.lang.Object name_ = ""; /** * string name = 1; - * * @return The name. */ public java.lang.String getName() { java.lang.Object ref = name_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); name_ = s; return s; @@ -573,14 +532,15 @@ public java.lang.String getName() { } /** * string name = 1; - * * @return The bytes for name. */ - public com.google.protobuf.ByteString getNameBytes() { + public com.google.protobuf.ByteString + getNameBytes() { java.lang.Object ref = name_; if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); name_ = b; return b; } else { @@ -589,43 +549,38 @@ public com.google.protobuf.ByteString getNameBytes() { } /** * string name = 1; - * * @param value The name to set. * @return This builder for chaining. */ - public Builder setName(java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - + public Builder setName( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } /** * string name = 1; - * * @return This builder for chaining. */ public Builder clearName() { - name_ = getDefaultInstance().getName(); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); return this; } /** * string name = 1; - * * @param value The bytes for name to set. * @return This builder for chaining. */ - public Builder setNameBytes(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } + public Builder setNameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - name_ = value; + bitField0_ |= 0x00000001; onChanged(); return this; } @@ -633,13 +588,13 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { private java.lang.Object postAbbr_ = ""; /** * string post_abbr = 2; - * * @return The postAbbr. */ public java.lang.String getPostAbbr() { java.lang.Object ref = postAbbr_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); postAbbr_ = s; return s; @@ -649,14 +604,15 @@ public java.lang.String getPostAbbr() { } /** * string post_abbr = 2; - * * @return The bytes for postAbbr. */ - public com.google.protobuf.ByteString getPostAbbrBytes() { + public com.google.protobuf.ByteString + getPostAbbrBytes() { java.lang.Object ref = postAbbr_; if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); postAbbr_ = b; return b; } else { @@ -665,65 +621,47 @@ public com.google.protobuf.ByteString getPostAbbrBytes() { } /** * string post_abbr = 2; - * * @param value The postAbbr to set. * @return This builder for chaining. */ - public Builder setPostAbbr(java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - + public Builder setPostAbbr( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } postAbbr_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } /** * string post_abbr = 2; - * * @return This builder for chaining. */ public Builder clearPostAbbr() { - postAbbr_ = getDefaultInstance().getPostAbbr(); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } /** * string post_abbr = 2; - * * @param value The bytes for postAbbr to set. * @return This builder for chaining. */ - public Builder setPostAbbrBytes(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } + public Builder setPostAbbrBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); - postAbbr_ = value; + bitField0_ |= 0x00000002; onChanged(); return this; } - @java.lang.Override - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFields(unknownFields); - } - - @java.lang.Override - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.mergeUnknownFields(unknownFields); - } - // @@protoc_insertion_point(builder_scope:utilities.State) } // @@protoc_insertion_point(class_scope:utilities.State) private static final utilities.StateProto.State DEFAULT_INSTANCE; - static { DEFAULT_INSTANCE = new utilities.StateProto.State(); } @@ -732,16 +670,27 @@ public static utilities.StateProto.State getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - @java.lang.Override - public State parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new State(input, extensionRegistry); - } - }; + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public State parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; public static com.google.protobuf.Parser parser() { return PARSER; @@ -756,35 +705,38 @@ public com.google.protobuf.Parser getParserForType() { public utilities.StateProto.State getDefaultInstanceForType() { return DEFAULT_INSTANCE; } + } private static final com.google.protobuf.Descriptors.Descriptor - internal_static_utilities_State_descriptor; - private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_utilities_State_descriptor; + private static final + com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_utilities_State_fieldAccessorTable; - public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { return descriptor; } - - private static com.google.protobuf.Descriptors.FileDescriptor descriptor; - + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; static { java.lang.String[] descriptorData = { - "\n\017us-states.proto\022\tutilities\"(\n\005State\022\014\n" - + "\004name\030\001 \001(\t\022\021\n\tpost_abbr\030\002 \001(\tB\014B\nStateP" - + "rotob\006proto3" + "\n\017us-states.proto\022\tutilities\"(\n\005State\022\014\n" + + "\004name\030\001 \001(\t\022\021\n\tpost_abbr\030\002 \001(\tB\014B\nStateP" + + "rotob\006proto3" }; - descriptor = - com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( - descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] {}); - internal_static_utilities_State_descriptor = getDescriptor().getMessageTypes().get(0); - internal_static_utilities_State_fieldAccessorTable = - new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_utilities_State_descriptor, - new java.lang.String[] { - "Name", "PostAbbr", - }); + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }); + internal_static_utilities_State_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_utilities_State_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_utilities_State_descriptor, + new java.lang.String[] { "Name", "PostAbbr", }); + descriptor.resolveAllFeaturesImmutable(); } // @@protoc_insertion_point(outer_class_scope) From 95bc705db48d03bf525fff3ec8a74fc760681946 Mon Sep 17 00:00:00 2001 From: Mike Prieto Date: Fri, 7 Jun 2024 16:48:17 +0000 Subject: [PATCH 2/6] chore: Fix formatting for StateProto.java --- .../src/main/java/utilities/StateProto.java | 378 +++++++++--------- 1 file changed, 193 insertions(+), 185 deletions(-) diff --git a/samples/snippets/src/main/java/utilities/StateProto.java b/samples/snippets/src/main/java/utilities/StateProto.java index 80b173599..8b3b4cfc0 100644 --- a/samples/snippets/src/main/java/utilities/StateProto.java +++ b/samples/snippets/src/main/java/utilities/StateProto.java @@ -32,80 +32,81 @@ public final class StateProto { private StateProto() {} + static { com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( - com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, - /* major= */ 4, - /* minor= */ 26, - /* patch= */ 1, - /* suffix= */ "", - StateProto.class.getName()); - } - public static void registerAllExtensions( - com.google.protobuf.ExtensionRegistryLite registry) { + com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, + /* major= */ 4, + /* minor= */ 26, + /* patch= */ 1, + /* suffix= */ "", + StateProto.class.getName()); } - public static void registerAllExtensions( - com.google.protobuf.ExtensionRegistry registry) { - registerAllExtensions( - (com.google.protobuf.ExtensionRegistryLite) registry); + public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {} + + public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry); } - public interface StateOrBuilder extends + + public interface StateOrBuilder + extends // @@protoc_insertion_point(interface_extends:utilities.State) com.google.protobuf.MessageOrBuilder { /** * string name = 1; + * * @return The name. */ java.lang.String getName(); /** * string name = 1; + * * @return The bytes for name. */ - com.google.protobuf.ByteString - getNameBytes(); + com.google.protobuf.ByteString getNameBytes(); /** * string post_abbr = 2; + * * @return The postAbbr. */ java.lang.String getPostAbbr(); /** * string post_abbr = 2; + * * @return The bytes for postAbbr. */ - com.google.protobuf.ByteString - getPostAbbrBytes(); + com.google.protobuf.ByteString getPostAbbrBytes(); } - /** - * Protobuf type {@code utilities.State} - */ - public static final class State extends - com.google.protobuf.GeneratedMessage implements + /** Protobuf type {@code utilities.State} */ + public static final class State extends com.google.protobuf.GeneratedMessage + implements // @@protoc_insertion_point(message_implements:utilities.State) StateOrBuilder { - private static final long serialVersionUID = 0L; + private static final long serialVersionUID = 0L; + static { com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( - com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, - /* major= */ 4, - /* minor= */ 26, - /* patch= */ 1, - /* suffix= */ "", - State.class.getName()); + com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, + /* major= */ 4, + /* minor= */ 26, + /* patch= */ 1, + /* suffix= */ "", + State.class.getName()); } // Use State.newBuilder() to construct. private State(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); } + private State() { name_ = ""; postAbbr_ = ""; } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return utilities.StateProto.internal_static_utilities_State_descriptor; } @@ -118,10 +119,12 @@ private State() { } public static final int NAME_FIELD_NUMBER = 1; + @SuppressWarnings("serial") private volatile java.lang.Object name_ = ""; /** * string name = 1; + * * @return The name. */ @java.lang.Override @@ -130,8 +133,7 @@ public java.lang.String getName() { if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); name_ = s; return s; @@ -139,16 +141,15 @@ public java.lang.String getName() { } /** * string name = 1; + * * @return The bytes for name. */ @java.lang.Override - public com.google.protobuf.ByteString - getNameBytes() { + public com.google.protobuf.ByteString getNameBytes() { java.lang.Object ref = name_; if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); name_ = b; return b; } else { @@ -157,10 +158,12 @@ public java.lang.String getName() { } public static final int POST_ABBR_FIELD_NUMBER = 2; + @SuppressWarnings("serial") private volatile java.lang.Object postAbbr_ = ""; /** * string post_abbr = 2; + * * @return The postAbbr. */ @java.lang.Override @@ -169,8 +172,7 @@ public java.lang.String getPostAbbr() { if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); postAbbr_ = s; return s; @@ -178,16 +180,15 @@ public java.lang.String getPostAbbr() { } /** * string post_abbr = 2; + * * @return The bytes for postAbbr. */ @java.lang.Override - public com.google.protobuf.ByteString - getPostAbbrBytes() { + public com.google.protobuf.ByteString getPostAbbrBytes() { java.lang.Object ref = postAbbr_; if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); postAbbr_ = b; return b; } else { @@ -196,6 +197,7 @@ public java.lang.String getPostAbbr() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; @@ -207,8 +209,7 @@ public final boolean isInitialized() { } @java.lang.Override - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!com.google.protobuf.GeneratedMessage.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessage.writeString(output, 1, name_); } @@ -238,17 +239,15 @@ public int getSerializedSize() { @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { - return true; + return true; } if (!(obj instanceof utilities.StateProto.State)) { return super.equals(obj); } utilities.StateProto.State other = (utilities.StateProto.State) obj; - if (!getName() - .equals(other.getName())) return false; - if (!getPostAbbr() - .equals(other.getPostAbbr())) return false; + if (!getName().equals(other.getName())) return false; + if (!getPostAbbr().equals(other.getPostAbbr())) return false; if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -269,107 +268,106 @@ public int hashCode() { return hash; } - public static utilities.StateProto.State parseFrom( - java.nio.ByteBuffer data) + public static utilities.StateProto.State parseFrom(java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } + public static utilities.StateProto.State parseFrom( - java.nio.ByteBuffer data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) + java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static utilities.StateProto.State parseFrom( - com.google.protobuf.ByteString data) + + public static utilities.StateProto.State parseFrom(com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } + public static utilities.StateProto.State parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } + public static utilities.StateProto.State parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } + public static utilities.StateProto.State parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) + byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } + public static utilities.StateProto.State parseFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessage - .parseWithIOException(PARSER, input); + return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input); } + public static utilities.StateProto.State parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) + java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessage - .parseWithIOException(PARSER, input, extensionRegistry); + return com.google.protobuf.GeneratedMessage.parseWithIOException( + PARSER, input, extensionRegistry); } public static utilities.StateProto.State parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessage - .parseDelimitedWithIOException(PARSER, input); + return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException(PARSER, input); } public static utilities.StateProto.State parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) + java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessage - .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException( + PARSER, input, extensionRegistry); } - public static utilities.StateProto.State parseFrom( - com.google.protobuf.CodedInputStream input) + + public static utilities.StateProto.State parseFrom(com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessage - .parseWithIOException(PARSER, input); + return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input); } + public static utilities.StateProto.State parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessage - .parseWithIOException(PARSER, input, extensionRegistry); + return com.google.protobuf.GeneratedMessage.parseWithIOException( + PARSER, input, extensionRegistry); } @java.lang.Override - public Builder newBuilderForType() { return newBuilder(); } + public Builder newBuilderForType() { + return newBuilder(); + } + public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } + public static Builder newBuilder(utilities.StateProto.State prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { - return this == DEFAULT_INSTANCE - ? new Builder() : new Builder().mergeFrom(this); + return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } @java.lang.Override - protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + protected Builder newBuilderForType(com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } - /** - * Protobuf type {@code utilities.State} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder implements + /** Protobuf type {@code utilities.State} */ + public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder + implements // @@protoc_insertion_point(builder_implements:utilities.State) utilities.StateProto.StateOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return utilities.StateProto.internal_static_utilities_State_descriptor; } @@ -382,15 +380,12 @@ public static final class Builder extends } // Construct using utilities.StateProto.State.newBuilder() - private Builder() { + private Builder() {} - } - - private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { super(parent); - } + @java.lang.Override public Builder clear() { super.clear(); @@ -401,8 +396,7 @@ public Builder clear() { } @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return utilities.StateProto.internal_static_utilities_State_descriptor; } @@ -423,7 +417,9 @@ public utilities.StateProto.State build() { @java.lang.Override public utilities.StateProto.State buildPartial() { utilities.StateProto.State result = new utilities.StateProto.State(this); - if (bitField0_ != 0) { buildPartial0(result); } + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } @@ -441,7 +437,7 @@ private void buildPartial0(utilities.StateProto.State result) { @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof utilities.StateProto.State) { - return mergeFrom((utilities.StateProto.State)other); + return mergeFrom((utilities.StateProto.State) other); } else { super.mergeFrom(other); return this; @@ -486,22 +482,25 @@ public Builder mergeFrom( case 0: done = true; break; - case 10: { - name_ = input.readStringRequireUtf8(); - bitField0_ |= 0x00000001; - break; - } // case 10 - case 18: { - postAbbr_ = input.readStringRequireUtf8(); - bitField0_ |= 0x00000002; - break; - } // case 18 - default: { - if (!super.parseUnknownField(input, extensionRegistry, tag)) { - done = true; // was an endgroup tag - } - break; - } // default: + case 10: + { + name_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: + { + postAbbr_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000002; + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: } // switch (tag) } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -511,18 +510,19 @@ public Builder mergeFrom( } // finally return this; } + private int bitField0_; private java.lang.Object name_ = ""; /** * string name = 1; + * * @return The name. */ public java.lang.String getName() { java.lang.Object ref = name_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); name_ = s; return s; @@ -532,15 +532,14 @@ public java.lang.String getName() { } /** * string name = 1; + * * @return The bytes for name. */ - public com.google.protobuf.ByteString - getNameBytes() { + public com.google.protobuf.ByteString getNameBytes() { java.lang.Object ref = name_; if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); name_ = b; return b; } else { @@ -549,12 +548,14 @@ public java.lang.String getName() { } /** * string name = 1; + * * @param value The name to set. * @return This builder for chaining. */ - public Builder setName( - java.lang.String value) { - if (value == null) { throw new NullPointerException(); } + public Builder setName(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } name_ = value; bitField0_ |= 0x00000001; onChanged(); @@ -562,6 +563,7 @@ public Builder setName( } /** * string name = 1; + * * @return This builder for chaining. */ public Builder clearName() { @@ -572,12 +574,14 @@ public Builder clearName() { } /** * string name = 1; + * * @param value The bytes for name to set. * @return This builder for chaining. */ - public Builder setNameBytes( - com.google.protobuf.ByteString value) { - if (value == null) { throw new NullPointerException(); } + public Builder setNameBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } checkByteStringIsUtf8(value); name_ = value; bitField0_ |= 0x00000001; @@ -588,13 +592,13 @@ public Builder setNameBytes( private java.lang.Object postAbbr_ = ""; /** * string post_abbr = 2; + * * @return The postAbbr. */ public java.lang.String getPostAbbr() { java.lang.Object ref = postAbbr_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); postAbbr_ = s; return s; @@ -604,15 +608,14 @@ public java.lang.String getPostAbbr() { } /** * string post_abbr = 2; + * * @return The bytes for postAbbr. */ - public com.google.protobuf.ByteString - getPostAbbrBytes() { + public com.google.protobuf.ByteString getPostAbbrBytes() { java.lang.Object ref = postAbbr_; if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); postAbbr_ = b; return b; } else { @@ -621,12 +624,14 @@ public java.lang.String getPostAbbr() { } /** * string post_abbr = 2; + * * @param value The postAbbr to set. * @return This builder for chaining. */ - public Builder setPostAbbr( - java.lang.String value) { - if (value == null) { throw new NullPointerException(); } + public Builder setPostAbbr(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } postAbbr_ = value; bitField0_ |= 0x00000002; onChanged(); @@ -634,6 +639,7 @@ public Builder setPostAbbr( } /** * string post_abbr = 2; + * * @return This builder for chaining. */ public Builder clearPostAbbr() { @@ -644,12 +650,14 @@ public Builder clearPostAbbr() { } /** * string post_abbr = 2; + * * @param value The bytes for postAbbr to set. * @return This builder for chaining. */ - public Builder setPostAbbrBytes( - com.google.protobuf.ByteString value) { - if (value == null) { throw new NullPointerException(); } + public Builder setPostAbbrBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } checkByteStringIsUtf8(value); postAbbr_ = value; bitField0_ |= 0x00000002; @@ -662,6 +670,7 @@ public Builder setPostAbbrBytes( // @@protoc_insertion_point(class_scope:utilities.State) private static final utilities.StateProto.State DEFAULT_INSTANCE; + static { DEFAULT_INSTANCE = new utilities.StateProto.State(); } @@ -670,27 +679,28 @@ public static utilities.StateProto.State getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override - public State parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - Builder builder = newBuilder(); - try { - builder.mergeFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(builder.buildPartial()); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e) - .setUnfinishedMessage(builder.buildPartial()); - } - return builder.buildPartial(); - } - }; + private static final com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + @java.lang.Override + public State parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; public static com.google.protobuf.Parser parser() { return PARSER; @@ -705,37 +715,35 @@ public com.google.protobuf.Parser getParserForType() { public utilities.StateProto.State getDefaultInstanceForType() { return DEFAULT_INSTANCE; } - } private static final com.google.protobuf.Descriptors.Descriptor - internal_static_utilities_State_descriptor; - private static final - com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_utilities_State_descriptor; + private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_utilities_State_fieldAccessorTable; - public static com.google.protobuf.Descriptors.FileDescriptor - getDescriptor() { + public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { return descriptor; } - private static com.google.protobuf.Descriptors.FileDescriptor - descriptor; + + private static com.google.protobuf.Descriptors.FileDescriptor descriptor; + static { java.lang.String[] descriptorData = { - "\n\017us-states.proto\022\tutilities\"(\n\005State\022\014\n" + - "\004name\030\001 \001(\t\022\021\n\tpost_abbr\030\002 \001(\tB\014B\nStateP" + - "rotob\006proto3" + "\n\017us-states.proto\022\tutilities\"(\n\005State\022\014\n" + + "\004name\030\001 \001(\t\022\021\n\tpost_abbr\030\002 \001(\tB\014B\nStateP" + + "rotob\006proto3" }; - descriptor = com.google.protobuf.Descriptors.FileDescriptor - .internalBuildGeneratedFileFrom(descriptorData, - new com.google.protobuf.Descriptors.FileDescriptor[] { - }); - internal_static_utilities_State_descriptor = - getDescriptor().getMessageTypes().get(0); - internal_static_utilities_State_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_utilities_State_descriptor, - new java.lang.String[] { "Name", "PostAbbr", }); + descriptor = + com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( + descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] {}); + internal_static_utilities_State_descriptor = getDescriptor().getMessageTypes().get(0); + internal_static_utilities_State_fieldAccessorTable = + new com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_utilities_State_descriptor, + new java.lang.String[] { + "Name", "PostAbbr", + }); descriptor.resolveAllFeaturesImmutable(); } From d13e98e3994176abcee3eec9af06d09ccbda9554 Mon Sep 17 00:00:00 2001 From: Mike Prieto Date: Fri, 7 Jun 2024 17:08:07 +0000 Subject: [PATCH 3/6] chore: Change protobuf for StateProto.java version to 3.25.3 --- .../src/main/java/utilities/StateProto.java | 447 +++++++++--------- 1 file changed, 236 insertions(+), 211 deletions(-) diff --git a/samples/snippets/src/main/java/utilities/StateProto.java b/samples/snippets/src/main/java/utilities/StateProto.java index 8b3b4cfc0..ace7dd0d9 100644 --- a/samples/snippets/src/main/java/utilities/StateProto.java +++ b/samples/snippets/src/main/java/utilities/StateProto.java @@ -16,7 +16,8 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! // source: us-states.proto -// Protobuf Java Version: 4.26.1 + +// Protobuf Java Version: 3.25.3 /** * This file is created using protoc. @@ -32,86 +33,74 @@ public final class StateProto { private StateProto() {} - - static { - com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( - com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, - /* major= */ 4, - /* minor= */ 26, - /* patch= */ 1, - /* suffix= */ "", - StateProto.class.getName()); + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { } - public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {} - - public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) { - registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry); + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); } - - public interface StateOrBuilder - extends + public interface StateOrBuilder extends // @@protoc_insertion_point(interface_extends:utilities.State) com.google.protobuf.MessageOrBuilder { /** * string name = 1; - * * @return The name. */ java.lang.String getName(); /** * string name = 1; - * * @return The bytes for name. */ - com.google.protobuf.ByteString getNameBytes(); + com.google.protobuf.ByteString + getNameBytes(); /** * string post_abbr = 2; - * * @return The postAbbr. */ java.lang.String getPostAbbr(); /** * string post_abbr = 2; - * * @return The bytes for postAbbr. */ - com.google.protobuf.ByteString getPostAbbrBytes(); + com.google.protobuf.ByteString + getPostAbbrBytes(); } - /** Protobuf type {@code utilities.State} */ - public static final class State extends com.google.protobuf.GeneratedMessage - implements + /** + * Protobuf type {@code utilities.State} + */ + public static final class State extends + com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:utilities.State) StateOrBuilder { - private static final long serialVersionUID = 0L; - - static { - com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( - com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, - /* major= */ 4, - /* minor= */ 26, - /* patch= */ 1, - /* suffix= */ "", - State.class.getName()); - } + private static final long serialVersionUID = 0L; // Use State.newBuilder() to construct. - private State(com.google.protobuf.GeneratedMessage.Builder builder) { + private State(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private State() { name_ = ""; postAbbr_ = ""; } - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new State(); + } + + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { return utilities.StateProto.internal_static_utilities_State_descriptor; } @java.lang.Override - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return utilities.StateProto.internal_static_utilities_State_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -119,12 +108,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - @SuppressWarnings("serial") private volatile java.lang.Object name_ = ""; /** * string name = 1; - * * @return The name. */ @java.lang.Override @@ -133,7 +120,8 @@ public java.lang.String getName() { if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { - com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); name_ = s; return s; @@ -141,15 +129,16 @@ public java.lang.String getName() { } /** * string name = 1; - * * @return The bytes for name. */ @java.lang.Override - public com.google.protobuf.ByteString getNameBytes() { + public com.google.protobuf.ByteString + getNameBytes() { java.lang.Object ref = name_; if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); name_ = b; return b; } else { @@ -158,12 +147,10 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int POST_ABBR_FIELD_NUMBER = 2; - @SuppressWarnings("serial") private volatile java.lang.Object postAbbr_ = ""; /** * string post_abbr = 2; - * * @return The postAbbr. */ @java.lang.Override @@ -172,7 +159,8 @@ public java.lang.String getPostAbbr() { if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { - com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); postAbbr_ = s; return s; @@ -180,15 +168,16 @@ public java.lang.String getPostAbbr() { } /** * string post_abbr = 2; - * * @return The bytes for postAbbr. */ @java.lang.Override - public com.google.protobuf.ByteString getPostAbbrBytes() { + public com.google.protobuf.ByteString + getPostAbbrBytes() { java.lang.Object ref = postAbbr_; if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); postAbbr_ = b; return b; } else { @@ -197,7 +186,6 @@ public com.google.protobuf.ByteString getPostAbbrBytes() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; @@ -209,12 +197,13 @@ public final boolean isInitialized() { } @java.lang.Override - public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!com.google.protobuf.GeneratedMessage.isStringEmpty(name_)) { - com.google.protobuf.GeneratedMessage.writeString(output, 1, name_); + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } - if (!com.google.protobuf.GeneratedMessage.isStringEmpty(postAbbr_)) { - com.google.protobuf.GeneratedMessage.writeString(output, 2, postAbbr_); + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(postAbbr_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, postAbbr_); } getUnknownFields().writeTo(output); } @@ -225,11 +214,11 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!com.google.protobuf.GeneratedMessage.isStringEmpty(name_)) { - size += com.google.protobuf.GeneratedMessage.computeStringSize(1, name_); + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } - if (!com.google.protobuf.GeneratedMessage.isStringEmpty(postAbbr_)) { - size += com.google.protobuf.GeneratedMessage.computeStringSize(2, postAbbr_); + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(postAbbr_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, postAbbr_); } size += getUnknownFields().getSerializedSize(); memoizedSize = size; @@ -239,15 +228,17 @@ public int getSerializedSize() { @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { - return true; + return true; } if (!(obj instanceof utilities.StateProto.State)) { return super.equals(obj); } utilities.StateProto.State other = (utilities.StateProto.State) obj; - if (!getName().equals(other.getName())) return false; - if (!getPostAbbr().equals(other.getPostAbbr())) return false; + if (!getName() + .equals(other.getName())) return false; + if (!getPostAbbr() + .equals(other.getPostAbbr())) return false; if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -268,111 +259,112 @@ public int hashCode() { return hash; } - public static utilities.StateProto.State parseFrom(java.nio.ByteBuffer data) + public static utilities.StateProto.State parseFrom( + java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static utilities.StateProto.State parseFrom( - java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static utilities.StateProto.State parseFrom(com.google.protobuf.ByteString data) + public static utilities.StateProto.State parseFrom( + com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static utilities.StateProto.State parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static utilities.StateProto.State parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static utilities.StateProto.State parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static utilities.StateProto.State parseFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); } - public static utilities.StateProto.State parseFrom( - java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessage.parseWithIOException( - PARSER, input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } public static utilities.StateProto.State parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException(PARSER, input); + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); } public static utilities.StateProto.State parseDelimitedFrom( - java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException( - PARSER, input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - - public static utilities.StateProto.State parseFrom(com.google.protobuf.CodedInputStream input) + public static utilities.StateProto.State parseFrom( + com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); } - public static utilities.StateProto.State parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessage.parseWithIOException( - PARSER, input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } @java.lang.Override - public Builder newBuilderForType() { - return newBuilder(); - } - + public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(utilities.StateProto.State prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { - return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); } @java.lang.Override - protected Builder newBuilderForType(com.google.protobuf.GeneratedMessage.BuilderParent parent) { + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } - /** Protobuf type {@code utilities.State} */ - public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder - implements + /** + * Protobuf type {@code utilities.State} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:utilities.State) utilities.StateProto.StateOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { return utilities.StateProto.internal_static_utilities_State_descriptor; } @java.lang.Override - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return utilities.StateProto.internal_static_utilities_State_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -380,12 +372,15 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using utilities.StateProto.State.newBuilder() - private Builder() {} + private Builder() { - private Builder(com.google.protobuf.GeneratedMessage.BuilderParent parent) { - super(parent); } + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + + } @java.lang.Override public Builder clear() { super.clear(); @@ -396,7 +391,8 @@ public Builder clear() { } @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { return utilities.StateProto.internal_static_utilities_State_descriptor; } @@ -417,9 +413,7 @@ public utilities.StateProto.State build() { @java.lang.Override public utilities.StateProto.State buildPartial() { utilities.StateProto.State result = new utilities.StateProto.State(this); - if (bitField0_ != 0) { - buildPartial0(result); - } + if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return result; } @@ -434,10 +428,42 @@ private void buildPartial0(utilities.StateProto.State result) { } } + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof utilities.StateProto.State) { - return mergeFrom((utilities.StateProto.State) other); + return mergeFrom((utilities.StateProto.State)other); } else { super.mergeFrom(other); return this; @@ -482,25 +508,22 @@ public Builder mergeFrom( case 0: done = true; break; - case 10: - { - name_ = input.readStringRequireUtf8(); - bitField0_ |= 0x00000001; - break; - } // case 10 - case 18: - { - postAbbr_ = input.readStringRequireUtf8(); - bitField0_ |= 0x00000002; - break; - } // case 18 - default: - { - if (!super.parseUnknownField(input, extensionRegistry, tag)) { - done = true; // was an endgroup tag - } - break; - } // default: + case 10: { + name_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + postAbbr_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000002; + break; + } // case 18 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: } // switch (tag) } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -510,19 +533,18 @@ public Builder mergeFrom( } // finally return this; } - private int bitField0_; private java.lang.Object name_ = ""; /** * string name = 1; - * * @return The name. */ public java.lang.String getName() { java.lang.Object ref = name_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); name_ = s; return s; @@ -532,14 +554,15 @@ public java.lang.String getName() { } /** * string name = 1; - * * @return The bytes for name. */ - public com.google.protobuf.ByteString getNameBytes() { + public com.google.protobuf.ByteString + getNameBytes() { java.lang.Object ref = name_; if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); name_ = b; return b; } else { @@ -548,14 +571,12 @@ public com.google.protobuf.ByteString getNameBytes() { } /** * string name = 1; - * * @param value The name to set. * @return This builder for chaining. */ - public Builder setName(java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } + public Builder setName( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } name_ = value; bitField0_ |= 0x00000001; onChanged(); @@ -563,7 +584,6 @@ public Builder setName(java.lang.String value) { } /** * string name = 1; - * * @return This builder for chaining. */ public Builder clearName() { @@ -574,14 +594,12 @@ public Builder clearName() { } /** * string name = 1; - * * @param value The bytes for name to set. * @return This builder for chaining. */ - public Builder setNameBytes(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } + public Builder setNameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); name_ = value; bitField0_ |= 0x00000001; @@ -592,13 +610,13 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { private java.lang.Object postAbbr_ = ""; /** * string post_abbr = 2; - * * @return The postAbbr. */ public java.lang.String getPostAbbr() { java.lang.Object ref = postAbbr_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); postAbbr_ = s; return s; @@ -608,14 +626,15 @@ public java.lang.String getPostAbbr() { } /** * string post_abbr = 2; - * * @return The bytes for postAbbr. */ - public com.google.protobuf.ByteString getPostAbbrBytes() { + public com.google.protobuf.ByteString + getPostAbbrBytes() { java.lang.Object ref = postAbbr_; if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); postAbbr_ = b; return b; } else { @@ -624,14 +643,12 @@ public com.google.protobuf.ByteString getPostAbbrBytes() { } /** * string post_abbr = 2; - * * @param value The postAbbr to set. * @return This builder for chaining. */ - public Builder setPostAbbr(java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } + public Builder setPostAbbr( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } postAbbr_ = value; bitField0_ |= 0x00000002; onChanged(); @@ -639,7 +656,6 @@ public Builder setPostAbbr(java.lang.String value) { } /** * string post_abbr = 2; - * * @return This builder for chaining. */ public Builder clearPostAbbr() { @@ -650,27 +666,36 @@ public Builder clearPostAbbr() { } /** * string post_abbr = 2; - * * @param value The bytes for postAbbr to set. * @return This builder for chaining. */ - public Builder setPostAbbrBytes(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } + public Builder setPostAbbrBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); postAbbr_ = value; bitField0_ |= 0x00000002; onChanged(); return this; } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + // @@protoc_insertion_point(builder_scope:utilities.State) } // @@protoc_insertion_point(class_scope:utilities.State) private static final utilities.StateProto.State DEFAULT_INSTANCE; - static { DEFAULT_INSTANCE = new utilities.StateProto.State(); } @@ -679,28 +704,27 @@ public static utilities.StateProto.State getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - @java.lang.Override - public State parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - Builder builder = newBuilder(); - try { - builder.mergeFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(builder.buildPartial()); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException() - .setUnfinishedMessage(builder.buildPartial()); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e) - .setUnfinishedMessage(builder.buildPartial()); - } - return builder.buildPartial(); - } - }; + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public State parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; public static com.google.protobuf.Parser parser() { return PARSER; @@ -715,36 +739,37 @@ public com.google.protobuf.Parser getParserForType() { public utilities.StateProto.State getDefaultInstanceForType() { return DEFAULT_INSTANCE; } + } private static final com.google.protobuf.Descriptors.Descriptor - internal_static_utilities_State_descriptor; - private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_utilities_State_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_utilities_State_fieldAccessorTable; - public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { return descriptor; } - - private static com.google.protobuf.Descriptors.FileDescriptor descriptor; - + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; static { java.lang.String[] descriptorData = { - "\n\017us-states.proto\022\tutilities\"(\n\005State\022\014\n" - + "\004name\030\001 \001(\t\022\021\n\tpost_abbr\030\002 \001(\tB\014B\nStateP" - + "rotob\006proto3" + "\n\017us-states.proto\022\tutilities\"(\n\005State\022\014\n" + + "\004name\030\001 \001(\t\022\021\n\tpost_abbr\030\002 \001(\tB\014B\nStateP" + + "rotob\006proto3" }; - descriptor = - com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( - descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] {}); - internal_static_utilities_State_descriptor = getDescriptor().getMessageTypes().get(0); - internal_static_utilities_State_fieldAccessorTable = - new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_utilities_State_descriptor, - new java.lang.String[] { - "Name", "PostAbbr", - }); - descriptor.resolveAllFeaturesImmutable(); + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }); + internal_static_utilities_State_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_utilities_State_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_utilities_State_descriptor, + new java.lang.String[] { "Name", "PostAbbr", }); } // @@protoc_insertion_point(outer_class_scope) From 10e8f5f5676c7cc8ca5ddc6e101b2fb9bfdde790 Mon Sep 17 00:00:00 2001 From: Mike Prieto Date: Fri, 7 Jun 2024 17:59:26 +0000 Subject: [PATCH 4/6] chore: Reformat StateProto.java --- .../src/main/java/utilities/StateProto.java | 376 +++++++++--------- 1 file changed, 193 insertions(+), 183 deletions(-) diff --git a/samples/snippets/src/main/java/utilities/StateProto.java b/samples/snippets/src/main/java/utilities/StateProto.java index ace7dd0d9..2923d45c5 100644 --- a/samples/snippets/src/main/java/utilities/StateProto.java +++ b/samples/snippets/src/main/java/utilities/StateProto.java @@ -33,55 +33,55 @@ public final class StateProto { private StateProto() {} - public static void registerAllExtensions( - com.google.protobuf.ExtensionRegistryLite registry) { - } - public static void registerAllExtensions( - com.google.protobuf.ExtensionRegistry registry) { - registerAllExtensions( - (com.google.protobuf.ExtensionRegistryLite) registry); + public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {} + + public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry); } - public interface StateOrBuilder extends + + public interface StateOrBuilder + extends // @@protoc_insertion_point(interface_extends:utilities.State) com.google.protobuf.MessageOrBuilder { /** * string name = 1; + * * @return The name. */ java.lang.String getName(); /** * string name = 1; + * * @return The bytes for name. */ - com.google.protobuf.ByteString - getNameBytes(); + com.google.protobuf.ByteString getNameBytes(); /** * string post_abbr = 2; + * * @return The postAbbr. */ java.lang.String getPostAbbr(); /** * string post_abbr = 2; + * * @return The bytes for postAbbr. */ - com.google.protobuf.ByteString - getPostAbbrBytes(); + com.google.protobuf.ByteString getPostAbbrBytes(); } - /** - * Protobuf type {@code utilities.State} - */ - public static final class State extends - com.google.protobuf.GeneratedMessageV3 implements + /** Protobuf type {@code utilities.State} */ + public static final class State extends com.google.protobuf.GeneratedMessageV3 + implements // @@protoc_insertion_point(message_implements:utilities.State) StateOrBuilder { - private static final long serialVersionUID = 0L; + private static final long serialVersionUID = 0L; // Use State.newBuilder() to construct. private State(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } + private State() { name_ = ""; postAbbr_ = ""; @@ -89,13 +89,11 @@ private State() { @java.lang.Override @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance( - UnusedPrivateParameter unused) { + protected java.lang.Object newInstance(UnusedPrivateParameter unused) { return new State(); } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return utilities.StateProto.internal_static_utilities_State_descriptor; } @@ -108,10 +106,12 @@ protected java.lang.Object newInstance( } public static final int NAME_FIELD_NUMBER = 1; + @SuppressWarnings("serial") private volatile java.lang.Object name_ = ""; /** * string name = 1; + * * @return The name. */ @java.lang.Override @@ -120,8 +120,7 @@ public java.lang.String getName() { if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); name_ = s; return s; @@ -129,16 +128,15 @@ public java.lang.String getName() { } /** * string name = 1; + * * @return The bytes for name. */ @java.lang.Override - public com.google.protobuf.ByteString - getNameBytes() { + public com.google.protobuf.ByteString getNameBytes() { java.lang.Object ref = name_; if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); name_ = b; return b; } else { @@ -147,10 +145,12 @@ public java.lang.String getName() { } public static final int POST_ABBR_FIELD_NUMBER = 2; + @SuppressWarnings("serial") private volatile java.lang.Object postAbbr_ = ""; /** * string post_abbr = 2; + * * @return The postAbbr. */ @java.lang.Override @@ -159,8 +159,7 @@ public java.lang.String getPostAbbr() { if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); postAbbr_ = s; return s; @@ -168,16 +167,15 @@ public java.lang.String getPostAbbr() { } /** * string post_abbr = 2; + * * @return The bytes for postAbbr. */ @java.lang.Override - public com.google.protobuf.ByteString - getPostAbbrBytes() { + public com.google.protobuf.ByteString getPostAbbrBytes() { java.lang.Object ref = postAbbr_; if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); postAbbr_ = b; return b; } else { @@ -186,6 +184,7 @@ public java.lang.String getPostAbbr() { } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; @@ -197,8 +196,7 @@ public final boolean isInitialized() { } @java.lang.Override - public void writeTo(com.google.protobuf.CodedOutputStream output) - throws java.io.IOException { + public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } @@ -228,17 +226,15 @@ public int getSerializedSize() { @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { - return true; + return true; } if (!(obj instanceof utilities.StateProto.State)) { return super.equals(obj); } utilities.StateProto.State other = (utilities.StateProto.State) obj; - if (!getName() - .equals(other.getName())) return false; - if (!getPostAbbr() - .equals(other.getPostAbbr())) return false; + if (!getName().equals(other.getName())) return false; + if (!getPostAbbr().equals(other.getPostAbbr())) return false; if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -259,90 +255,93 @@ public int hashCode() { return hash; } - public static utilities.StateProto.State parseFrom( - java.nio.ByteBuffer data) + public static utilities.StateProto.State parseFrom(java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } + public static utilities.StateProto.State parseFrom( - java.nio.ByteBuffer data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) + java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static utilities.StateProto.State parseFrom( - com.google.protobuf.ByteString data) + + public static utilities.StateProto.State parseFrom(com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } + public static utilities.StateProto.State parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } + public static utilities.StateProto.State parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } + public static utilities.StateProto.State parseFrom( - byte[] data, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) + byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } + public static utilities.StateProto.State parseFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); + return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); } + public static utilities.StateProto.State parseFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) + java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3.parseWithIOException( + PARSER, input, extensionRegistry); } public static utilities.StateProto.State parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input); + return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input); } public static utilities.StateProto.State parseDelimitedFrom( - java.io.InputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) + java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException( + PARSER, input, extensionRegistry); } - public static utilities.StateProto.State parseFrom( - com.google.protobuf.CodedInputStream input) + + public static utilities.StateProto.State parseFrom(com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input); + return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); } + public static utilities.StateProto.State parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3 - .parseWithIOException(PARSER, input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3.parseWithIOException( + PARSER, input, extensionRegistry); } @java.lang.Override - public Builder newBuilderForType() { return newBuilder(); } + public Builder newBuilderForType() { + return newBuilder(); + } + public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } + public static Builder newBuilder(utilities.StateProto.State prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } + @java.lang.Override public Builder toBuilder() { - return this == DEFAULT_INSTANCE - ? new Builder() : new Builder().mergeFrom(this); + return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); } @java.lang.Override @@ -351,15 +350,13 @@ protected Builder newBuilderForType( Builder builder = new Builder(parent); return builder; } - /** - * Protobuf type {@code utilities.State} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessageV3.Builder implements + /** Protobuf type {@code utilities.State} */ + public static final class Builder + extends com.google.protobuf.GeneratedMessageV3.Builder + implements // @@protoc_insertion_point(builder_implements:utilities.State) utilities.StateProto.StateOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return utilities.StateProto.internal_static_utilities_State_descriptor; } @@ -372,15 +369,12 @@ public static final class Builder extends } // Construct using utilities.StateProto.State.newBuilder() - private Builder() { + private Builder() {} - } - - private Builder( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); - } + @java.lang.Override public Builder clear() { super.clear(); @@ -391,8 +385,7 @@ public Builder clear() { } @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return utilities.StateProto.internal_static_utilities_State_descriptor; } @@ -413,7 +406,9 @@ public utilities.StateProto.State build() { @java.lang.Override public utilities.StateProto.State buildPartial() { utilities.StateProto.State result = new utilities.StateProto.State(this); - if (bitField0_ != 0) { buildPartial0(result); } + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } @@ -432,38 +427,41 @@ private void buildPartial0(utilities.StateProto.State result) { public Builder clone() { return super.clone(); } + @java.lang.Override public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return super.setField(field, value); } + @java.lang.Override - public Builder clearField( - com.google.protobuf.Descriptors.FieldDescriptor field) { + public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { return super.clearField(field); } + @java.lang.Override - public Builder clearOneof( - com.google.protobuf.Descriptors.OneofDescriptor oneof) { + public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { return super.clearOneof(oneof); } + @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, - int index, java.lang.Object value) { + int index, + java.lang.Object value) { return super.setRepeatedField(field, index, value); } + @java.lang.Override public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - java.lang.Object value) { + com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { return super.addRepeatedField(field, value); } + @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof utilities.StateProto.State) { - return mergeFrom((utilities.StateProto.State)other); + return mergeFrom((utilities.StateProto.State) other); } else { super.mergeFrom(other); return this; @@ -508,22 +506,25 @@ public Builder mergeFrom( case 0: done = true; break; - case 10: { - name_ = input.readStringRequireUtf8(); - bitField0_ |= 0x00000001; - break; - } // case 10 - case 18: { - postAbbr_ = input.readStringRequireUtf8(); - bitField0_ |= 0x00000002; - break; - } // case 18 - default: { - if (!super.parseUnknownField(input, extensionRegistry, tag)) { - done = true; // was an endgroup tag - } - break; - } // default: + case 10: + { + name_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: + { + postAbbr_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000002; + break; + } // case 18 + default: + { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: } // switch (tag) } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -533,18 +534,19 @@ public Builder mergeFrom( } // finally return this; } + private int bitField0_; private java.lang.Object name_ = ""; /** * string name = 1; + * * @return The name. */ public java.lang.String getName() { java.lang.Object ref = name_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); name_ = s; return s; @@ -554,15 +556,14 @@ public java.lang.String getName() { } /** * string name = 1; + * * @return The bytes for name. */ - public com.google.protobuf.ByteString - getNameBytes() { + public com.google.protobuf.ByteString getNameBytes() { java.lang.Object ref = name_; if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); name_ = b; return b; } else { @@ -571,12 +572,14 @@ public java.lang.String getName() { } /** * string name = 1; + * * @param value The name to set. * @return This builder for chaining. */ - public Builder setName( - java.lang.String value) { - if (value == null) { throw new NullPointerException(); } + public Builder setName(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } name_ = value; bitField0_ |= 0x00000001; onChanged(); @@ -584,6 +587,7 @@ public Builder setName( } /** * string name = 1; + * * @return This builder for chaining. */ public Builder clearName() { @@ -594,12 +598,14 @@ public Builder clearName() { } /** * string name = 1; + * * @param value The bytes for name to set. * @return This builder for chaining. */ - public Builder setNameBytes( - com.google.protobuf.ByteString value) { - if (value == null) { throw new NullPointerException(); } + public Builder setNameBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } checkByteStringIsUtf8(value); name_ = value; bitField0_ |= 0x00000001; @@ -610,13 +616,13 @@ public Builder setNameBytes( private java.lang.Object postAbbr_ = ""; /** * string post_abbr = 2; + * * @return The postAbbr. */ public java.lang.String getPostAbbr() { java.lang.Object ref = postAbbr_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; + com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); postAbbr_ = s; return s; @@ -626,15 +632,14 @@ public java.lang.String getPostAbbr() { } /** * string post_abbr = 2; + * * @return The bytes for postAbbr. */ - public com.google.protobuf.ByteString - getPostAbbrBytes() { + public com.google.protobuf.ByteString getPostAbbrBytes() { java.lang.Object ref = postAbbr_; if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); postAbbr_ = b; return b; } else { @@ -643,12 +648,14 @@ public java.lang.String getPostAbbr() { } /** * string post_abbr = 2; + * * @param value The postAbbr to set. * @return This builder for chaining. */ - public Builder setPostAbbr( - java.lang.String value) { - if (value == null) { throw new NullPointerException(); } + public Builder setPostAbbr(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } postAbbr_ = value; bitField0_ |= 0x00000002; onChanged(); @@ -656,6 +663,7 @@ public Builder setPostAbbr( } /** * string post_abbr = 2; + * * @return This builder for chaining. */ public Builder clearPostAbbr() { @@ -666,18 +674,21 @@ public Builder clearPostAbbr() { } /** * string post_abbr = 2; + * * @param value The bytes for postAbbr to set. * @return This builder for chaining. */ - public Builder setPostAbbrBytes( - com.google.protobuf.ByteString value) { - if (value == null) { throw new NullPointerException(); } + public Builder setPostAbbrBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } checkByteStringIsUtf8(value); postAbbr_ = value; bitField0_ |= 0x00000002; onChanged(); return this; } + @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -690,12 +701,12 @@ public final Builder mergeUnknownFields( return super.mergeUnknownFields(unknownFields); } - // @@protoc_insertion_point(builder_scope:utilities.State) } // @@protoc_insertion_point(class_scope:utilities.State) private static final utilities.StateProto.State DEFAULT_INSTANCE; + static { DEFAULT_INSTANCE = new utilities.StateProto.State(); } @@ -704,27 +715,28 @@ public static utilities.StateProto.State getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override - public State parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - Builder builder = newBuilder(); - try { - builder.mergeFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(builder.buildPartial()); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e) - .setUnfinishedMessage(builder.buildPartial()); - } - return builder.buildPartial(); - } - }; + private static final com.google.protobuf.Parser PARSER = + new com.google.protobuf.AbstractParser() { + @java.lang.Override + public State parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException() + .setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; public static com.google.protobuf.Parser parser() { return PARSER; @@ -739,37 +751,35 @@ public com.google.protobuf.Parser getParserForType() { public utilities.StateProto.State getDefaultInstanceForType() { return DEFAULT_INSTANCE; } - } private static final com.google.protobuf.Descriptors.Descriptor - internal_static_utilities_State_descriptor; - private static final - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_utilities_State_descriptor; + private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_utilities_State_fieldAccessorTable; - public static com.google.protobuf.Descriptors.FileDescriptor - getDescriptor() { + public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { return descriptor; } - private static com.google.protobuf.Descriptors.FileDescriptor - descriptor; + + private static com.google.protobuf.Descriptors.FileDescriptor descriptor; + static { java.lang.String[] descriptorData = { - "\n\017us-states.proto\022\tutilities\"(\n\005State\022\014\n" + - "\004name\030\001 \001(\t\022\021\n\tpost_abbr\030\002 \001(\tB\014B\nStateP" + - "rotob\006proto3" + "\n\017us-states.proto\022\tutilities\"(\n\005State\022\014\n" + + "\004name\030\001 \001(\t\022\021\n\tpost_abbr\030\002 \001(\tB\014B\nStateP" + + "rotob\006proto3" }; - descriptor = com.google.protobuf.Descriptors.FileDescriptor - .internalBuildGeneratedFileFrom(descriptorData, - new com.google.protobuf.Descriptors.FileDescriptor[] { - }); - internal_static_utilities_State_descriptor = - getDescriptor().getMessageTypes().get(0); - internal_static_utilities_State_fieldAccessorTable = new - com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_utilities_State_descriptor, - new java.lang.String[] { "Name", "PostAbbr", }); + descriptor = + com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( + descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] {}); + internal_static_utilities_State_descriptor = getDescriptor().getMessageTypes().get(0); + internal_static_utilities_State_fieldAccessorTable = + new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_utilities_State_descriptor, + new java.lang.String[] { + "Name", "PostAbbr", + }); } // @@protoc_insertion_point(outer_class_scope) From 231124f0354f925c2a354b1783918cad34c8f940 Mon Sep 17 00:00:00 2001 From: Mike Prieto Date: Wed, 28 Aug 2024 21:16:52 +0000 Subject: [PATCH 5/6] chore: Regenerate us-states.proto with protobuf v27.4 --- .../src/main/java/utilities/StateProto.java | 460 ++++++++---------- 1 file changed, 204 insertions(+), 256 deletions(-) diff --git a/samples/snippets/src/main/java/utilities/StateProto.java b/samples/snippets/src/main/java/utilities/StateProto.java index 2923d45c5..9cca1ba7d 100644 --- a/samples/snippets/src/main/java/utilities/StateProto.java +++ b/samples/snippets/src/main/java/utilities/StateProto.java @@ -15,90 +15,93 @@ */ // Generated by the protocol buffer compiler. DO NOT EDIT! +// NO CHECKED-IN PROTOBUF GENCODE // source: us-states.proto +// Protobuf Java Version: 4.27.4 -// Protobuf Java Version: 3.25.3 - -/** - * This file is created using protoc. - * - *

To download, visit https://developers.google.com/protocol-buffers/docs/downloads - * - *

Run the following command from the `samples/snippets` directory to generate this class: - * - *

`protoc --proto_path=src/main/resources/ --java_out=src/main/java/ - * src/main/resources/us-states.proto` - */ package utilities; public final class StateProto { private StateProto() {} - - public static void registerAllExtensions(com.google.protobuf.ExtensionRegistryLite registry) {} - - public static void registerAllExtensions(com.google.protobuf.ExtensionRegistry registry) { - registerAllExtensions((com.google.protobuf.ExtensionRegistryLite) registry); + static { + com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( + com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, + /* major= */ 4, + /* minor= */ 27, + /* patch= */ 4, + /* suffix= */ "", + StateProto.class.getName()); + } + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { } - public interface StateOrBuilder - extends + public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); + } + public interface StateOrBuilder extends // @@protoc_insertion_point(interface_extends:utilities.State) com.google.protobuf.MessageOrBuilder { /** * string name = 1; - * * @return The name. */ java.lang.String getName(); /** * string name = 1; - * * @return The bytes for name. */ - com.google.protobuf.ByteString getNameBytes(); + com.google.protobuf.ByteString + getNameBytes(); /** * string post_abbr = 2; - * * @return The postAbbr. */ java.lang.String getPostAbbr(); /** * string post_abbr = 2; - * * @return The bytes for postAbbr. */ - com.google.protobuf.ByteString getPostAbbrBytes(); + com.google.protobuf.ByteString + getPostAbbrBytes(); } - /** Protobuf type {@code utilities.State} */ - public static final class State extends com.google.protobuf.GeneratedMessageV3 - implements + /** + * Protobuf type {@code utilities.State} + */ + public static final class State extends + com.google.protobuf.GeneratedMessage implements // @@protoc_insertion_point(message_implements:utilities.State) StateOrBuilder { - private static final long serialVersionUID = 0L; + private static final long serialVersionUID = 0L; + static { + com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( + com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, + /* major= */ 4, + /* minor= */ 27, + /* patch= */ 4, + /* suffix= */ "", + State.class.getName()); + } // Use State.newBuilder() to construct. - private State(com.google.protobuf.GeneratedMessageV3.Builder builder) { + private State(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); } - private State() { name_ = ""; postAbbr_ = ""; } - @java.lang.Override - @SuppressWarnings({"unused"}) - protected java.lang.Object newInstance(UnusedPrivateParameter unused) { - return new State(); - } - - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { return utilities.StateProto.internal_static_utilities_State_descriptor; } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return utilities.StateProto.internal_static_utilities_State_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -106,12 +109,10 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } public static final int NAME_FIELD_NUMBER = 1; - @SuppressWarnings("serial") private volatile java.lang.Object name_ = ""; /** * string name = 1; - * * @return The name. */ @java.lang.Override @@ -120,7 +121,8 @@ public java.lang.String getName() { if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { - com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); name_ = s; return s; @@ -128,15 +130,16 @@ public java.lang.String getName() { } /** * string name = 1; - * * @return The bytes for name. */ @java.lang.Override - public com.google.protobuf.ByteString getNameBytes() { + public com.google.protobuf.ByteString + getNameBytes() { java.lang.Object ref = name_; if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); name_ = b; return b; } else { @@ -145,12 +148,10 @@ public com.google.protobuf.ByteString getNameBytes() { } public static final int POST_ABBR_FIELD_NUMBER = 2; - @SuppressWarnings("serial") private volatile java.lang.Object postAbbr_ = ""; /** * string post_abbr = 2; - * * @return The postAbbr. */ @java.lang.Override @@ -159,7 +160,8 @@ public java.lang.String getPostAbbr() { if (ref instanceof java.lang.String) { return (java.lang.String) ref; } else { - com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); postAbbr_ = s; return s; @@ -167,15 +169,16 @@ public java.lang.String getPostAbbr() { } /** * string post_abbr = 2; - * * @return The bytes for postAbbr. */ @java.lang.Override - public com.google.protobuf.ByteString getPostAbbrBytes() { + public com.google.protobuf.ByteString + getPostAbbrBytes() { java.lang.Object ref = postAbbr_; if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); postAbbr_ = b; return b; } else { @@ -184,7 +187,6 @@ public com.google.protobuf.ByteString getPostAbbrBytes() { } private byte memoizedIsInitialized = -1; - @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; @@ -196,12 +198,13 @@ public final boolean isInitialized() { } @java.lang.Override - public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(name_)) { + com.google.protobuf.GeneratedMessage.writeString(output, 1, name_); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(postAbbr_)) { - com.google.protobuf.GeneratedMessageV3.writeString(output, 2, postAbbr_); + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(postAbbr_)) { + com.google.protobuf.GeneratedMessage.writeString(output, 2, postAbbr_); } getUnknownFields().writeTo(output); } @@ -212,11 +215,11 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(name_)) { + size += com.google.protobuf.GeneratedMessage.computeStringSize(1, name_); } - if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(postAbbr_)) { - size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, postAbbr_); + if (!com.google.protobuf.GeneratedMessage.isStringEmpty(postAbbr_)) { + size += com.google.protobuf.GeneratedMessage.computeStringSize(2, postAbbr_); } size += getUnknownFields().getSerializedSize(); memoizedSize = size; @@ -226,15 +229,17 @@ public int getSerializedSize() { @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { - return true; + return true; } if (!(obj instanceof utilities.StateProto.State)) { return super.equals(obj); } utilities.StateProto.State other = (utilities.StateProto.State) obj; - if (!getName().equals(other.getName())) return false; - if (!getPostAbbr().equals(other.getPostAbbr())) return false; + if (!getName() + .equals(other.getName())) return false; + if (!getPostAbbr() + .equals(other.getPostAbbr())) return false; if (!getUnknownFields().equals(other.getUnknownFields())) return false; return true; } @@ -255,113 +260,112 @@ public int hashCode() { return hash; } - public static utilities.StateProto.State parseFrom(java.nio.ByteBuffer data) + public static utilities.StateProto.State parseFrom( + java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static utilities.StateProto.State parseFrom( - java.nio.ByteBuffer data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - - public static utilities.StateProto.State parseFrom(com.google.protobuf.ByteString data) + public static utilities.StateProto.State parseFrom( + com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static utilities.StateProto.State parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static utilities.StateProto.State parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } - public static utilities.StateProto.State parseFrom( - byte[] data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } - public static utilities.StateProto.State parseFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); + return com.google.protobuf.GeneratedMessage + .parseWithIOException(PARSER, input); } - public static utilities.StateProto.State parseFrom( - java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseWithIOException( - PARSER, input, extensionRegistry); + return com.google.protobuf.GeneratedMessage + .parseWithIOException(PARSER, input, extensionRegistry); } public static utilities.StateProto.State parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException(PARSER, input); + return com.google.protobuf.GeneratedMessage + .parseDelimitedWithIOException(PARSER, input); } public static utilities.StateProto.State parseDelimitedFrom( - java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseDelimitedWithIOException( - PARSER, input, extensionRegistry); + return com.google.protobuf.GeneratedMessage + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } - - public static utilities.StateProto.State parseFrom(com.google.protobuf.CodedInputStream input) + public static utilities.StateProto.State parseFrom( + com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseWithIOException(PARSER, input); + return com.google.protobuf.GeneratedMessage + .parseWithIOException(PARSER, input); } - public static utilities.StateProto.State parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessageV3.parseWithIOException( - PARSER, input, extensionRegistry); + return com.google.protobuf.GeneratedMessage + .parseWithIOException(PARSER, input, extensionRegistry); } @java.lang.Override - public Builder newBuilderForType() { - return newBuilder(); - } - + public Builder newBuilderForType() { return newBuilder(); } public static Builder newBuilder() { return DEFAULT_INSTANCE.toBuilder(); } - public static Builder newBuilder(utilities.StateProto.State prototype) { return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); } - @java.lang.Override public Builder toBuilder() { - return this == DEFAULT_INSTANCE ? new Builder() : new Builder().mergeFrom(this); + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); } @java.lang.Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + com.google.protobuf.GeneratedMessage.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } - /** Protobuf type {@code utilities.State} */ - public static final class Builder - extends com.google.protobuf.GeneratedMessageV3.Builder - implements + /** + * Protobuf type {@code utilities.State} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder implements // @@protoc_insertion_point(builder_implements:utilities.State) utilities.StateProto.StateOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { return utilities.StateProto.internal_static_utilities_State_descriptor; } @java.lang.Override - protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { return utilities.StateProto.internal_static_utilities_State_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -369,12 +373,15 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { } // Construct using utilities.StateProto.State.newBuilder() - private Builder() {} + private Builder() { - private Builder(com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { - super(parent); } + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + + } @java.lang.Override public Builder clear() { super.clear(); @@ -385,7 +392,8 @@ public Builder clear() { } @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { return utilities.StateProto.internal_static_utilities_State_descriptor; } @@ -406,9 +414,7 @@ public utilities.StateProto.State build() { @java.lang.Override public utilities.StateProto.State buildPartial() { utilities.StateProto.State result = new utilities.StateProto.State(this); - if (bitField0_ != 0) { - buildPartial0(result); - } + if (bitField0_ != 0) { buildPartial0(result); } onBuilt(); return result; } @@ -423,45 +429,10 @@ private void buildPartial0(utilities.StateProto.State result) { } } - @java.lang.Override - public Builder clone() { - return super.clone(); - } - - @java.lang.Override - public Builder setField( - com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return super.setField(field, value); - } - - @java.lang.Override - public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return super.clearField(field); - } - - @java.lang.Override - public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return super.clearOneof(oneof); - } - - @java.lang.Override - public Builder setRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, - int index, - java.lang.Object value) { - return super.setRepeatedField(field, index, value); - } - - @java.lang.Override - public Builder addRepeatedField( - com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return super.addRepeatedField(field, value); - } - @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof utilities.StateProto.State) { - return mergeFrom((utilities.StateProto.State) other); + return mergeFrom((utilities.StateProto.State)other); } else { super.mergeFrom(other); return this; @@ -506,25 +477,22 @@ public Builder mergeFrom( case 0: done = true; break; - case 10: - { - name_ = input.readStringRequireUtf8(); - bitField0_ |= 0x00000001; - break; - } // case 10 - case 18: - { - postAbbr_ = input.readStringRequireUtf8(); - bitField0_ |= 0x00000002; - break; - } // case 18 - default: - { - if (!super.parseUnknownField(input, extensionRegistry, tag)) { - done = true; // was an endgroup tag - } - break; - } // default: + case 10: { + name_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000001; + break; + } // case 10 + case 18: { + postAbbr_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000002; + break; + } // case 18 + default: { + if (!super.parseUnknownField(input, extensionRegistry, tag)) { + done = true; // was an endgroup tag + } + break; + } // default: } // switch (tag) } // while (!done) } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -534,19 +502,18 @@ public Builder mergeFrom( } // finally return this; } - private int bitField0_; private java.lang.Object name_ = ""; /** * string name = 1; - * * @return The name. */ public java.lang.String getName() { java.lang.Object ref = name_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); name_ = s; return s; @@ -556,14 +523,15 @@ public java.lang.String getName() { } /** * string name = 1; - * * @return The bytes for name. */ - public com.google.protobuf.ByteString getNameBytes() { + public com.google.protobuf.ByteString + getNameBytes() { java.lang.Object ref = name_; if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); name_ = b; return b; } else { @@ -572,14 +540,12 @@ public com.google.protobuf.ByteString getNameBytes() { } /** * string name = 1; - * * @param value The name to set. * @return This builder for chaining. */ - public Builder setName(java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } + public Builder setName( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } name_ = value; bitField0_ |= 0x00000001; onChanged(); @@ -587,7 +553,6 @@ public Builder setName(java.lang.String value) { } /** * string name = 1; - * * @return This builder for chaining. */ public Builder clearName() { @@ -598,14 +563,12 @@ public Builder clearName() { } /** * string name = 1; - * * @param value The bytes for name to set. * @return This builder for chaining. */ - public Builder setNameBytes(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } + public Builder setNameBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); name_ = value; bitField0_ |= 0x00000001; @@ -616,13 +579,13 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { private java.lang.Object postAbbr_ = ""; /** * string post_abbr = 2; - * * @return The postAbbr. */ public java.lang.String getPostAbbr() { java.lang.Object ref = postAbbr_; if (!(ref instanceof java.lang.String)) { - com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref; + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; java.lang.String s = bs.toStringUtf8(); postAbbr_ = s; return s; @@ -632,14 +595,15 @@ public java.lang.String getPostAbbr() { } /** * string post_abbr = 2; - * * @return The bytes for postAbbr. */ - public com.google.protobuf.ByteString getPostAbbrBytes() { + public com.google.protobuf.ByteString + getPostAbbrBytes() { java.lang.Object ref = postAbbr_; if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8((java.lang.String) ref); + com.google.protobuf.ByteString b = + com.google.protobuf.ByteString.copyFromUtf8( + (java.lang.String) ref); postAbbr_ = b; return b; } else { @@ -648,14 +612,12 @@ public com.google.protobuf.ByteString getPostAbbrBytes() { } /** * string post_abbr = 2; - * * @param value The postAbbr to set. * @return This builder for chaining. */ - public Builder setPostAbbr(java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } + public Builder setPostAbbr( + java.lang.String value) { + if (value == null) { throw new NullPointerException(); } postAbbr_ = value; bitField0_ |= 0x00000002; onChanged(); @@ -663,7 +625,6 @@ public Builder setPostAbbr(java.lang.String value) { } /** * string post_abbr = 2; - * * @return This builder for chaining. */ public Builder clearPostAbbr() { @@ -674,14 +635,12 @@ public Builder clearPostAbbr() { } /** * string post_abbr = 2; - * * @param value The bytes for postAbbr to set. * @return This builder for chaining. */ - public Builder setPostAbbrBytes(com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } + public Builder setPostAbbrBytes( + com.google.protobuf.ByteString value) { + if (value == null) { throw new NullPointerException(); } checkByteStringIsUtf8(value); postAbbr_ = value; bitField0_ |= 0x00000002; @@ -689,24 +648,11 @@ public Builder setPostAbbrBytes(com.google.protobuf.ByteString value) { return this; } - @java.lang.Override - public final Builder setUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFields(unknownFields); - } - - @java.lang.Override - public final Builder mergeUnknownFields( - final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.mergeUnknownFields(unknownFields); - } - // @@protoc_insertion_point(builder_scope:utilities.State) } // @@protoc_insertion_point(class_scope:utilities.State) private static final utilities.StateProto.State DEFAULT_INSTANCE; - static { DEFAULT_INSTANCE = new utilities.StateProto.State(); } @@ -715,28 +661,27 @@ public static utilities.StateProto.State getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser PARSER = - new com.google.protobuf.AbstractParser() { - @java.lang.Override - public State parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - Builder builder = newBuilder(); - try { - builder.mergeFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - throw e.setUnfinishedMessage(builder.buildPartial()); - } catch (com.google.protobuf.UninitializedMessageException e) { - throw e.asInvalidProtocolBufferException() - .setUnfinishedMessage(builder.buildPartial()); - } catch (java.io.IOException e) { - throw new com.google.protobuf.InvalidProtocolBufferException(e) - .setUnfinishedMessage(builder.buildPartial()); - } - return builder.buildPartial(); - } - }; + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public State parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + Builder builder = newBuilder(); + try { + builder.mergeFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(builder.buildPartial()); + } catch (com.google.protobuf.UninitializedMessageException e) { + throw e.asInvalidProtocolBufferException().setUnfinishedMessage(builder.buildPartial()); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException(e) + .setUnfinishedMessage(builder.buildPartial()); + } + return builder.buildPartial(); + } + }; public static com.google.protobuf.Parser parser() { return PARSER; @@ -751,35 +696,38 @@ public com.google.protobuf.Parser getParserForType() { public utilities.StateProto.State getDefaultInstanceForType() { return DEFAULT_INSTANCE; } + } private static final com.google.protobuf.Descriptors.Descriptor - internal_static_utilities_State_descriptor; - private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_utilities_State_descriptor; + private static final + com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_utilities_State_fieldAccessorTable; - public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + public static com.google.protobuf.Descriptors.FileDescriptor + getDescriptor() { return descriptor; } - - private static com.google.protobuf.Descriptors.FileDescriptor descriptor; - + private static com.google.protobuf.Descriptors.FileDescriptor + descriptor; static { java.lang.String[] descriptorData = { - "\n\017us-states.proto\022\tutilities\"(\n\005State\022\014\n" - + "\004name\030\001 \001(\t\022\021\n\tpost_abbr\030\002 \001(\tB\014B\nStateP" - + "rotob\006proto3" + "\n\017us-states.proto\022\tutilities\"(\n\005State\022\014\n" + + "\004name\030\001 \001(\t\022\021\n\tpost_abbr\030\002 \001(\tB\014B\nStateP" + + "rotob\006proto3" }; - descriptor = - com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( - descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] {}); - internal_static_utilities_State_descriptor = getDescriptor().getMessageTypes().get(0); - internal_static_utilities_State_fieldAccessorTable = - new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( - internal_static_utilities_State_descriptor, - new java.lang.String[] { - "Name", "PostAbbr", - }); + descriptor = com.google.protobuf.Descriptors.FileDescriptor + .internalBuildGeneratedFileFrom(descriptorData, + new com.google.protobuf.Descriptors.FileDescriptor[] { + }); + internal_static_utilities_State_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_utilities_State_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_utilities_State_descriptor, + new java.lang.String[] { "Name", "PostAbbr", }); + descriptor.resolveAllFeaturesImmutable(); } // @@protoc_insertion_point(outer_class_scope) From f7efd146af1c9f8a029ade79f41fd069bf3a9db7 Mon Sep 17 00:00:00 2001 From: Mike Prieto Date: Thu, 29 Aug 2024 16:09:11 +0000 Subject: [PATCH 6/6] chore: Revert StateProto generation to use protobuf v25.4 --- .../src/main/java/utilities/StateProto.java | 129 ++++++++++++------ 1 file changed, 85 insertions(+), 44 deletions(-) diff --git a/samples/snippets/src/main/java/utilities/StateProto.java b/samples/snippets/src/main/java/utilities/StateProto.java index 9cca1ba7d..8c9ece5de 100644 --- a/samples/snippets/src/main/java/utilities/StateProto.java +++ b/samples/snippets/src/main/java/utilities/StateProto.java @@ -14,24 +14,24 @@ * limitations under the License. */ +/** + * This file is created using protoc. + * + *

To download, visit https://developers.google.com/protocol-buffers/docs/downloads + * + *

Run the following command from the `samples/snippets` directory to generate this class: + * + *

`protoc --proto_path=src/main/resources/ --java_out=src/main/java/ + * src/main/resources/us-states.proto` + */ // Generated by the protocol buffer compiler. DO NOT EDIT! -// NO CHECKED-IN PROTOBUF GENCODE // source: us-states.proto -// Protobuf Java Version: 4.27.4 +// Protobuf Java Version: 3.25.4 package utilities; public final class StateProto { private StateProto() {} - static { - com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( - com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, - /* major= */ 4, - /* minor= */ 27, - /* patch= */ 4, - /* suffix= */ "", - StateProto.class.getName()); - } public static void registerAllExtensions( com.google.protobuf.ExtensionRegistryLite registry) { } @@ -73,21 +73,12 @@ public interface StateOrBuilder extends * Protobuf type {@code utilities.State} */ public static final class State extends - com.google.protobuf.GeneratedMessage implements + com.google.protobuf.GeneratedMessageV3 implements // @@protoc_insertion_point(message_implements:utilities.State) StateOrBuilder { private static final long serialVersionUID = 0L; - static { - com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( - com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, - /* major= */ 4, - /* minor= */ 27, - /* patch= */ 4, - /* suffix= */ "", - State.class.getName()); - } // Use State.newBuilder() to construct. - private State(com.google.protobuf.GeneratedMessage.Builder builder) { + private State(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } private State() { @@ -95,13 +86,20 @@ private State() { postAbbr_ = ""; } + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new State(); + } + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return utilities.StateProto.internal_static_utilities_State_descriptor; } @java.lang.Override - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return utilities.StateProto.internal_static_utilities_State_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -200,11 +198,11 @@ public final boolean isInitialized() { @java.lang.Override public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - if (!com.google.protobuf.GeneratedMessage.isStringEmpty(name_)) { - com.google.protobuf.GeneratedMessage.writeString(output, 1, name_); + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, name_); } - if (!com.google.protobuf.GeneratedMessage.isStringEmpty(postAbbr_)) { - com.google.protobuf.GeneratedMessage.writeString(output, 2, postAbbr_); + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(postAbbr_)) { + com.google.protobuf.GeneratedMessageV3.writeString(output, 2, postAbbr_); } getUnknownFields().writeTo(output); } @@ -215,11 +213,11 @@ public int getSerializedSize() { if (size != -1) return size; size = 0; - if (!com.google.protobuf.GeneratedMessage.isStringEmpty(name_)) { - size += com.google.protobuf.GeneratedMessage.computeStringSize(1, name_); + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(name_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, name_); } - if (!com.google.protobuf.GeneratedMessage.isStringEmpty(postAbbr_)) { - size += com.google.protobuf.GeneratedMessage.computeStringSize(2, postAbbr_); + if (!com.google.protobuf.GeneratedMessageV3.isStringEmpty(postAbbr_)) { + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(2, postAbbr_); } size += getUnknownFields().getSerializedSize(); memoizedSize = size; @@ -294,20 +292,20 @@ public static utilities.StateProto.State parseFrom( } public static utilities.StateProto.State parseFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessage + return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } public static utilities.StateProto.State parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessage + return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } public static utilities.StateProto.State parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessage + return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input); } @@ -315,20 +313,20 @@ public static utilities.StateProto.State parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessage + return com.google.protobuf.GeneratedMessageV3 .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } public static utilities.StateProto.State parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return com.google.protobuf.GeneratedMessage + return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input); } public static utilities.StateProto.State parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return com.google.protobuf.GeneratedMessage + return com.google.protobuf.GeneratedMessageV3 .parseWithIOException(PARSER, input, extensionRegistry); } @@ -348,7 +346,7 @@ public Builder toBuilder() { @java.lang.Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -356,7 +354,7 @@ protected Builder newBuilderForType( * Protobuf type {@code utilities.State} */ public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder implements + com.google.protobuf.GeneratedMessageV3.Builder implements // @@protoc_insertion_point(builder_implements:utilities.State) utilities.StateProto.StateOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor @@ -365,7 +363,7 @@ public static final class Builder extends } @java.lang.Override - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return utilities.StateProto.internal_static_utilities_State_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -378,7 +376,7 @@ private Builder() { } private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); } @@ -429,6 +427,38 @@ private void buildPartial0(utilities.StateProto.State result) { } } + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof utilities.StateProto.State) { @@ -647,6 +677,18 @@ public Builder setPostAbbrBytes( onChanged(); return this; } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + // @@protoc_insertion_point(builder_scope:utilities.State) } @@ -702,7 +744,7 @@ public utilities.StateProto.State getDefaultInstanceForType() { private static final com.google.protobuf.Descriptors.Descriptor internal_static_utilities_State_descriptor; private static final - com.google.protobuf.GeneratedMessage.FieldAccessorTable + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_utilities_State_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor @@ -724,10 +766,9 @@ public utilities.StateProto.State getDefaultInstanceForType() { internal_static_utilities_State_descriptor = getDescriptor().getMessageTypes().get(0); internal_static_utilities_State_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_utilities_State_descriptor, new java.lang.String[] { "Name", "PostAbbr", }); - descriptor.resolveAllFeaturesImmutable(); } // @@protoc_insertion_point(outer_class_scope)