diff --git a/.github/workflows/hermetic_library_generation.yaml b/.github/workflows/hermetic_library_generation.yaml index 1f218b2874..a1d9c6a9f2 100644 --- a/.github/workflows/hermetic_library_generation.yaml +++ b/.github/workflows/hermetic_library_generation.yaml @@ -37,7 +37,7 @@ jobs: with: fetch-depth: 0 token: ${{ secrets.CLOUD_JAVA_BOT_TOKEN }} - - uses: googleapis/sdk-platform-java/.github/scripts@v2.62.3 + - uses: googleapis/sdk-platform-java/.github/scripts@v2.63.0 if: env.SHOULD_RUN == 'true' with: base_ref: ${{ github.base_ref }} diff --git a/.kokoro/presubmit/graalvm-native-a.cfg b/.kokoro/presubmit/graalvm-native-a.cfg index b7567eeb7d..55c5543e26 100644 --- a/.kokoro/presubmit/graalvm-native-a.cfg +++ b/.kokoro/presubmit/graalvm-native-a.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.52.3" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_a:3.53.0" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native-b.cfg b/.kokoro/presubmit/graalvm-native-b.cfg index c7205f0abd..5c981b9848 100644 --- a/.kokoro/presubmit/graalvm-native-b.cfg +++ b/.kokoro/presubmit/graalvm-native-b.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.52.3" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_b:3.53.0" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/.kokoro/presubmit/graalvm-native-c.cfg b/.kokoro/presubmit/graalvm-native-c.cfg index f6ab8976a5..f2032499df 100644 --- a/.kokoro/presubmit/graalvm-native-c.cfg +++ b/.kokoro/presubmit/graalvm-native-c.cfg @@ -3,7 +3,7 @@ # Configure the docker image for kokoro-trampoline. env_vars: { key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.52.3" # {x-version-update:google-cloud-shared-dependencies:current} + value: "gcr.io/cloud-devrel-public-resources/graalvm_sdk_platform_c:3.53.0" # {x-version-update:google-cloud-shared-dependencies:current} } env_vars: { diff --git a/README.md b/README.md index fdb66f7ef7..1a02a15be7 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file: com.google.cloud libraries-bom - 26.50.0 + 26.69.0 pom import @@ -41,7 +41,7 @@ If you are using Maven without the BOM, add this to your dependencies: com.google.cloud google-cloud-bigtable - 2.50.0 + 2.67.0 ``` @@ -353,6 +353,7 @@ Samples are in the [`samples/`](https://github.com/googleapis/java-bigtable/tree | Key Salting | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/KeySalting.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/KeySalting.java) | | Quickstart | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/Quickstart.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/Quickstart.java) | | Reads | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/Reads.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/Reads.java) | +| Schema Bundle Example | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/SchemaBundleExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/SchemaBundleExample.java) | | Table Admin Example | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/TableAdminExample.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/TableAdminExample.java) | | Write Aggregate | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/WriteAggregate.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/WriteAggregate.java) | | Write Batch | [source code](https://github.com/googleapis/java-bigtable/blob/main/samples/snippets/src/main/java/com/example/bigtable/WriteBatch.java) | [![Open in Cloud Shell][shell_img]](https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/googleapis/java-bigtable&page=editor&open_in_editor=samples/snippets/src/main/java/com/example/bigtable/WriteBatch.java) | diff --git a/generation_config.yaml b/generation_config.yaml index 78686181a2..d93e85c00b 100644 --- a/generation_config.yaml +++ b/generation_config.yaml @@ -1,5 +1,5 @@ -gapic_generator_version: 2.62.3 -googleapis_commitish: 6821943108fe3284f483defc9b60774a3752de2b +gapic_generator_version: 2.63.0 +googleapis_commitish: 94ccdfe4519e0ba817bd33aa22eb9c64f88a6874 libraries_bom_version: 26.70.0 template_excludes: - .gitignore diff --git a/samples/snippets/src/main/resources/com/example/bigtable/SingerProto.java b/samples/snippets/src/main/resources/com/example/bigtable/SingerProto.java index 4c5714ebd3..8f1ed90d12 100644 --- a/samples/snippets/src/main/resources/com/example/bigtable/SingerProto.java +++ b/samples/snippets/src/main/resources/com/example/bigtable/SingerProto.java @@ -24,74 +24,57 @@ @com.google.protobuf.Generated public final class SingerProto { private SingerProto() {} + static { com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( - com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, - /* major= */ 4, - /* minor= */ 32, - /* patch= */ 0, - /* suffix= */ "", - SingerProto.class.getName()); - } - public static void registerAllExtensions( - com.google.protobuf.ExtensionRegistryLite registry) { + com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, + /* major= */ 4, + /* minor= */ 32, + /* patch= */ 0, + /* suffix= */ "", + SingerProto.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); } - /** - * Protobuf enum {@code examples.bigtable.music.Genre} - */ - public enum Genre - implements com.google.protobuf.ProtocolMessageEnum { - /** - * POP = 0; - */ + + /** Protobuf enum {@code examples.bigtable.music.Genre} */ + public enum Genre implements com.google.protobuf.ProtocolMessageEnum { + /** POP = 0; */ POP(0), - /** - * JAZZ = 1; - */ + /** JAZZ = 1; */ JAZZ(1), - /** - * FOLK = 2; - */ + /** FOLK = 2; */ FOLK(2), - /** - * ROCK = 3; - */ + /** ROCK = 3; */ ROCK(3), UNRECOGNIZED(-1), ; static { com.google.protobuf.RuntimeVersion.validateProtobufGencodeVersion( - com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, - /* major= */ 4, - /* minor= */ 32, - /* patch= */ 0, - /* suffix= */ "", - Genre.class.getName()); + com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, + /* major= */ 4, + /* minor= */ 32, + /* patch= */ 0, + /* suffix= */ "", + Genre.class.getName()); } - /** - * POP = 0; - */ + + /** POP = 0; */ public static final int POP_VALUE = 0; - /** - * JAZZ = 1; - */ + + /** JAZZ = 1; */ public static final int JAZZ_VALUE = 1; - /** - * FOLK = 2; - */ + + /** FOLK = 2; */ public static final int FOLK_VALUE = 2; - /** - * ROCK = 3; - */ - public static final int ROCK_VALUE = 3; + /** ROCK = 3; */ + public static final int ROCK_VALUE = 3; public final int getNumber() { if (this == UNRECOGNIZED) { @@ -117,50 +100,51 @@ public static Genre valueOf(int value) { */ public static Genre forNumber(int value) { switch (value) { - case 0: return POP; - case 1: return JAZZ; - case 2: return FOLK; - case 3: return ROCK; - default: return null; + case 0: + return POP; + case 1: + return JAZZ; + case 2: + return FOLK; + case 3: + return ROCK; + default: + return null; } } - public static com.google.protobuf.Internal.EnumLiteMap - internalGetValueMap() { + public static com.google.protobuf.Internal.EnumLiteMap internalGetValueMap() { return internalValueMap; } - private static final com.google.protobuf.Internal.EnumLiteMap< - Genre> internalValueMap = - new com.google.protobuf.Internal.EnumLiteMap() { - public Genre findValueByNumber(int number) { - return Genre.forNumber(number); - } - }; - public final com.google.protobuf.Descriptors.EnumValueDescriptor - getValueDescriptor() { + private static final com.google.protobuf.Internal.EnumLiteMap internalValueMap = + new com.google.protobuf.Internal.EnumLiteMap() { + public Genre findValueByNumber(int number) { + return Genre.forNumber(number); + } + }; + + public final com.google.protobuf.Descriptors.EnumValueDescriptor getValueDescriptor() { if (this == UNRECOGNIZED) { throw new java.lang.IllegalStateException( "Can't get the descriptor of an unrecognized enum value."); } return getDescriptor().getValues().get(ordinal()); } - public final com.google.protobuf.Descriptors.EnumDescriptor - getDescriptorForType() { + + public final com.google.protobuf.Descriptors.EnumDescriptor getDescriptorForType() { return getDescriptor(); } - public static com.google.protobuf.Descriptors.EnumDescriptor - getDescriptor() { + + public static com.google.protobuf.Descriptors.EnumDescriptor getDescriptor() { return com.example.bigtable.SingerProto.getDescriptor().getEnumTypes().get(0); } private static final Genre[] VALUES = values(); - public static Genre valueOf( - com.google.protobuf.Descriptors.EnumValueDescriptor desc) { + public static Genre valueOf(com.google.protobuf.Descriptors.EnumValueDescriptor desc) { if (desc.getType() != getDescriptor()) { - throw new java.lang.IllegalArgumentException( - "EnumValueDescriptor is not for this type."); + throw new java.lang.IllegalArgumentException("EnumValueDescriptor is not for this type."); } if (desc.getIndex() == -1) { return UNRECOGNIZED; @@ -177,124 +161,149 @@ private Genre(int value) { // @@protoc_insertion_point(enum_scope:examples.bigtable.music.Genre) } - public interface SingerInfoOrBuilder extends + public interface SingerInfoOrBuilder + extends // @@protoc_insertion_point(interface_extends:examples.bigtable.music.SingerInfo) com.google.protobuf.MessageOrBuilder { /** * optional int64 singer_id = 1; + * * @return Whether the singerId field is set. */ boolean hasSingerId(); + /** * optional int64 singer_id = 1; + * * @return The singerId. */ long getSingerId(); /** * optional string birth_date = 2; + * * @return Whether the birthDate field is set. */ boolean hasBirthDate(); + /** * optional string birth_date = 2; + * * @return The birthDate. */ java.lang.String getBirthDate(); + /** * optional string birth_date = 2; + * * @return The bytes for birthDate. */ - com.google.protobuf.ByteString - getBirthDateBytes(); + com.google.protobuf.ByteString getBirthDateBytes(); /** * optional string nationality = 3; + * * @return Whether the nationality field is set. */ boolean hasNationality(); + /** * optional string nationality = 3; + * * @return The nationality. */ java.lang.String getNationality(); + /** * optional string nationality = 3; + * * @return The bytes for nationality. */ - com.google.protobuf.ByteString - getNationalityBytes(); + com.google.protobuf.ByteString getNationalityBytes(); /** * optional .examples.bigtable.music.Genre genre = 4; + * * @return Whether the genre field is set. */ boolean hasGenre(); + /** * optional .examples.bigtable.music.Genre genre = 4; + * * @return The enum numeric value on the wire for genre. */ int getGenreValue(); + /** * optional .examples.bigtable.music.Genre genre = 4; + * * @return The genre. */ com.example.bigtable.SingerProto.Genre getGenre(); } - /** - * Protobuf type {@code examples.bigtable.music.SingerInfo} - */ - public static final class SingerInfo extends - com.google.protobuf.GeneratedMessage implements + + /** Protobuf type {@code examples.bigtable.music.SingerInfo} */ + public static final class SingerInfo extends com.google.protobuf.GeneratedMessage + implements // @@protoc_insertion_point(message_implements:examples.bigtable.music.SingerInfo) SingerInfoOrBuilder { - 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= */ 32, - /* patch= */ 0, - /* suffix= */ "", - SingerInfo.class.getName()); + com.google.protobuf.RuntimeVersion.RuntimeDomain.PUBLIC, + /* major= */ 4, + /* minor= */ 32, + /* patch= */ 0, + /* suffix= */ "", + SingerInfo.class.getName()); } + // Use SingerInfo.newBuilder() to construct. private SingerInfo(com.google.protobuf.GeneratedMessage.Builder builder) { super(builder); } + private SingerInfo() { birthDate_ = ""; nationality_ = ""; genre_ = 0; } - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return com.example.bigtable.SingerProto.internal_static_examples_bigtable_music_SingerInfo_descriptor; + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + return com.example.bigtable.SingerProto + .internal_static_examples_bigtable_music_SingerInfo_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.example.bigtable.SingerProto.internal_static_examples_bigtable_music_SingerInfo_fieldAccessorTable + return com.example.bigtable.SingerProto + .internal_static_examples_bigtable_music_SingerInfo_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.example.bigtable.SingerProto.SingerInfo.class, com.example.bigtable.SingerProto.SingerInfo.Builder.class); + com.example.bigtable.SingerProto.SingerInfo.class, + com.example.bigtable.SingerProto.SingerInfo.Builder.class); } private int bitField0_; public static final int SINGER_ID_FIELD_NUMBER = 1; private long singerId_ = 0L; + /** * optional int64 singer_id = 1; + * * @return Whether the singerId field is set. */ @java.lang.Override public boolean hasSingerId() { return ((bitField0_ & 0x00000001) != 0); } + /** * optional int64 singer_id = 1; + * * @return The singerId. */ @java.lang.Override @@ -303,18 +312,23 @@ public long getSingerId() { } public static final int BIRTH_DATE_FIELD_NUMBER = 2; + @SuppressWarnings("serial") private volatile java.lang.Object birthDate_ = ""; + /** * optional string birth_date = 2; + * * @return Whether the birthDate field is set. */ @java.lang.Override public boolean hasBirthDate() { return ((bitField0_ & 0x00000002) != 0); } + /** * optional string birth_date = 2; + * * @return The birthDate. */ @java.lang.Override @@ -323,25 +337,24 @@ public java.lang.String getBirthDate() { 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(); birthDate_ = s; return s; } } + /** * optional string birth_date = 2; + * * @return The bytes for birthDate. */ @java.lang.Override - public com.google.protobuf.ByteString - getBirthDateBytes() { + public com.google.protobuf.ByteString getBirthDateBytes() { java.lang.Object ref = birthDate_; 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); birthDate_ = b; return b; } else { @@ -350,18 +363,23 @@ public java.lang.String getBirthDate() { } public static final int NATIONALITY_FIELD_NUMBER = 3; + @SuppressWarnings("serial") private volatile java.lang.Object nationality_ = ""; + /** * optional string nationality = 3; + * * @return Whether the nationality field is set. */ @java.lang.Override public boolean hasNationality() { return ((bitField0_ & 0x00000004) != 0); } + /** * optional string nationality = 3; + * * @return The nationality. */ @java.lang.Override @@ -370,25 +388,24 @@ public java.lang.String getNationality() { 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(); nationality_ = s; return s; } } + /** * optional string nationality = 3; + * * @return The bytes for nationality. */ @java.lang.Override - public com.google.protobuf.ByteString - getNationalityBytes() { + public com.google.protobuf.ByteString getNationalityBytes() { java.lang.Object ref = nationality_; 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); nationality_ = b; return b; } else { @@ -398,30 +415,41 @@ public java.lang.String getNationality() { public static final int GENRE_FIELD_NUMBER = 4; private int genre_ = 0; + /** * optional .examples.bigtable.music.Genre genre = 4; + * * @return Whether the genre field is set. */ - @java.lang.Override public boolean hasGenre() { + @java.lang.Override + public boolean hasGenre() { return ((bitField0_ & 0x00000008) != 0); } + /** * optional .examples.bigtable.music.Genre genre = 4; + * * @return The enum numeric value on the wire for genre. */ - @java.lang.Override public int getGenreValue() { + @java.lang.Override + public int getGenreValue() { return genre_; } + /** * optional .examples.bigtable.music.Genre genre = 4; + * * @return The genre. */ - @java.lang.Override public com.example.bigtable.SingerProto.Genre getGenre() { - com.example.bigtable.SingerProto.Genre result = com.example.bigtable.SingerProto.Genre.forNumber(genre_); + @java.lang.Override + public com.example.bigtable.SingerProto.Genre getGenre() { + com.example.bigtable.SingerProto.Genre result = + com.example.bigtable.SingerProto.Genre.forNumber(genre_); return result == null ? com.example.bigtable.SingerProto.Genre.UNRECOGNIZED : result; } private byte memoizedIsInitialized = -1; + @java.lang.Override public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; @@ -433,8 +461,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 (((bitField0_ & 0x00000001) != 0)) { output.writeInt64(1, singerId_); } @@ -457,8 +484,7 @@ public int getSerializedSize() { size = 0; if (((bitField0_ & 0x00000001) != 0)) { - size += com.google.protobuf.CodedOutputStream - .computeInt64Size(1, singerId_); + size += com.google.protobuf.CodedOutputStream.computeInt64Size(1, singerId_); } if (((bitField0_ & 0x00000002) != 0)) { size += com.google.protobuf.GeneratedMessage.computeStringSize(2, birthDate_); @@ -467,8 +493,7 @@ public int getSerializedSize() { size += com.google.protobuf.GeneratedMessage.computeStringSize(3, nationality_); } if (((bitField0_ & 0x00000008) != 0)) { - size += com.google.protobuf.CodedOutputStream - .computeEnumSize(4, genre_); + size += com.google.protobuf.CodedOutputStream.computeEnumSize(4, genre_); } size += getUnknownFields().getSerializedSize(); memoizedSize = size; @@ -478,27 +503,25 @@ public int getSerializedSize() { @java.lang.Override public boolean equals(final java.lang.Object obj) { if (obj == this) { - return true; + return true; } if (!(obj instanceof com.example.bigtable.SingerProto.SingerInfo)) { return super.equals(obj); } - com.example.bigtable.SingerProto.SingerInfo other = (com.example.bigtable.SingerProto.SingerInfo) obj; + com.example.bigtable.SingerProto.SingerInfo other = + (com.example.bigtable.SingerProto.SingerInfo) obj; if (hasSingerId() != other.hasSingerId()) return false; if (hasSingerId()) { - if (getSingerId() - != other.getSingerId()) return false; + if (getSingerId() != other.getSingerId()) return false; } if (hasBirthDate() != other.hasBirthDate()) return false; if (hasBirthDate()) { - if (!getBirthDate() - .equals(other.getBirthDate())) return false; + if (!getBirthDate().equals(other.getBirthDate())) return false; } if (hasNationality() != other.hasNationality()) return false; if (hasNationality()) { - if (!getNationality() - .equals(other.getNationality())) return false; + if (!getNationality().equals(other.getNationality())) return false; } if (hasGenre() != other.hasGenre()) return false; if (hasGenre()) { @@ -517,8 +540,7 @@ public int hashCode() { hash = (19 * hash) + getDescriptor().hashCode(); if (hasSingerId()) { hash = (37 * hash) + SINGER_ID_FIELD_NUMBER; - hash = (53 * hash) + com.google.protobuf.Internal.hashLong( - getSingerId()); + hash = (53 * hash) + com.google.protobuf.Internal.hashLong(getSingerId()); } if (hasBirthDate()) { hash = (37 * hash) + BIRTH_DATE_FIELD_NUMBER; @@ -537,128 +559,129 @@ public int hashCode() { return hash; } - public static com.example.bigtable.SingerProto.SingerInfo parseFrom( - java.nio.ByteBuffer data) + public static com.example.bigtable.SingerProto.SingerInfo parseFrom(java.nio.ByteBuffer data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } + public static com.example.bigtable.SingerProto.SingerInfo 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 com.example.bigtable.SingerProto.SingerInfo parseFrom( com.google.protobuf.ByteString data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } + public static com.example.bigtable.SingerProto.SingerInfo parseFrom( com.google.protobuf.ByteString data, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data, extensionRegistry); } + public static com.example.bigtable.SingerProto.SingerInfo parseFrom(byte[] data) throws com.google.protobuf.InvalidProtocolBufferException { return PARSER.parseFrom(data); } + public static com.example.bigtable.SingerProto.SingerInfo 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 com.example.bigtable.SingerProto.SingerInfo 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 com.example.bigtable.SingerProto.SingerInfo 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 com.example.bigtable.SingerProto.SingerInfo parseDelimitedFrom(java.io.InputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessage - .parseDelimitedWithIOException(PARSER, input); + public static com.example.bigtable.SingerProto.SingerInfo parseDelimitedFrom( + java.io.InputStream input) throws java.io.IOException { + return com.google.protobuf.GeneratedMessage.parseDelimitedWithIOException(PARSER, input); } public static com.example.bigtable.SingerProto.SingerInfo 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 com.example.bigtable.SingerProto.SingerInfo parseFrom( - com.google.protobuf.CodedInputStream input) - throws java.io.IOException { - return com.google.protobuf.GeneratedMessage - .parseWithIOException(PARSER, input); + com.google.protobuf.CodedInputStream input) throws java.io.IOException { + return com.google.protobuf.GeneratedMessage.parseWithIOException(PARSER, input); } + public static com.example.bigtable.SingerProto.SingerInfo 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(com.example.bigtable.SingerProto.SingerInfo 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 examples.bigtable.music.SingerInfo} - */ - public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder implements + + /** Protobuf type {@code examples.bigtable.music.SingerInfo} */ + public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder + implements // @@protoc_insertion_point(builder_implements:examples.bigtable.music.SingerInfo) com.example.bigtable.SingerProto.SingerInfoOrBuilder { - public static final com.google.protobuf.Descriptors.Descriptor - getDescriptor() { - return com.example.bigtable.SingerProto.internal_static_examples_bigtable_music_SingerInfo_descriptor; + public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { + return com.example.bigtable.SingerProto + .internal_static_examples_bigtable_music_SingerInfo_descriptor; } @java.lang.Override protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return com.example.bigtable.SingerProto.internal_static_examples_bigtable_music_SingerInfo_fieldAccessorTable + return com.example.bigtable.SingerProto + .internal_static_examples_bigtable_music_SingerInfo_fieldAccessorTable .ensureFieldAccessorsInitialized( - com.example.bigtable.SingerProto.SingerInfo.class, com.example.bigtable.SingerProto.SingerInfo.Builder.class); + com.example.bigtable.SingerProto.SingerInfo.class, + com.example.bigtable.SingerProto.SingerInfo.Builder.class); } // Construct using com.example.bigtable.SingerProto.SingerInfo.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(); @@ -671,9 +694,9 @@ public Builder clear() { } @java.lang.Override - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return com.example.bigtable.SingerProto.internal_static_examples_bigtable_music_SingerInfo_descriptor; + public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { + return com.example.bigtable.SingerProto + .internal_static_examples_bigtable_music_SingerInfo_descriptor; } @java.lang.Override @@ -692,8 +715,11 @@ public com.example.bigtable.SingerProto.SingerInfo build() { @java.lang.Override public com.example.bigtable.SingerProto.SingerInfo buildPartial() { - com.example.bigtable.SingerProto.SingerInfo result = new com.example.bigtable.SingerProto.SingerInfo(this); - if (bitField0_ != 0) { buildPartial0(result); } + com.example.bigtable.SingerProto.SingerInfo result = + new com.example.bigtable.SingerProto.SingerInfo(this); + if (bitField0_ != 0) { + buildPartial0(result); + } onBuilt(); return result; } @@ -723,7 +749,7 @@ private void buildPartial0(com.example.bigtable.SingerProto.SingerInfo result) { @java.lang.Override public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof com.example.bigtable.SingerProto.SingerInfo) { - return mergeFrom((com.example.bigtable.SingerProto.SingerInfo)other); + return mergeFrom((com.example.bigtable.SingerProto.SingerInfo) other); } else { super.mergeFrom(other); return this; @@ -774,32 +800,37 @@ public Builder mergeFrom( case 0: done = true; break; - case 8: { - singerId_ = input.readInt64(); - bitField0_ |= 0x00000001; - break; - } // case 8 - case 18: { - birthDate_ = input.readStringRequireUtf8(); - bitField0_ |= 0x00000002; - break; - } // case 18 - case 26: { - nationality_ = input.readStringRequireUtf8(); - bitField0_ |= 0x00000004; - break; - } // case 26 - case 32: { - genre_ = input.readEnum(); - bitField0_ |= 0x00000008; - break; - } // case 32 - default: { - if (!super.parseUnknownField(input, extensionRegistry, tag)) { - done = true; // was an endgroup tag - } - break; - } // default: + case 8: + { + singerId_ = input.readInt64(); + bitField0_ |= 0x00000001; + break; + } // case 8 + case 18: + { + birthDate_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000002; + break; + } // case 18 + case 26: + { + nationality_ = input.readStringRequireUtf8(); + bitField0_ |= 0x00000004; + break; + } // case 26 + case 32: + { + genre_ = input.readEnum(); + bitField0_ |= 0x00000008; + break; + } // case 32 + 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) { @@ -809,27 +840,34 @@ public Builder mergeFrom( } // finally return this; } + private int bitField0_; - private long singerId_ ; + private long singerId_; + /** * optional int64 singer_id = 1; + * * @return Whether the singerId field is set. */ @java.lang.Override public boolean hasSingerId() { return ((bitField0_ & 0x00000001) != 0); } + /** * optional int64 singer_id = 1; + * * @return The singerId. */ @java.lang.Override public long getSingerId() { return singerId_; } + /** * optional int64 singer_id = 1; + * * @param value The singerId to set. * @return This builder for chaining. */ @@ -840,8 +878,10 @@ public Builder setSingerId(long value) { onChanged(); return this; } + /** * optional int64 singer_id = 1; + * * @return This builder for chaining. */ public Builder clearSingerId() { @@ -852,22 +892,25 @@ public Builder clearSingerId() { } private java.lang.Object birthDate_ = ""; + /** * optional string birth_date = 2; + * * @return Whether the birthDate field is set. */ public boolean hasBirthDate() { return ((bitField0_ & 0x00000002) != 0); } + /** * optional string birth_date = 2; + * * @return The birthDate. */ public java.lang.String getBirthDate() { java.lang.Object ref = birthDate_; 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(); birthDate_ = s; return s; @@ -875,38 +918,43 @@ public java.lang.String getBirthDate() { return (java.lang.String) ref; } } + /** * optional string birth_date = 2; + * * @return The bytes for birthDate. */ - public com.google.protobuf.ByteString - getBirthDateBytes() { + public com.google.protobuf.ByteString getBirthDateBytes() { java.lang.Object ref = birthDate_; 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); birthDate_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } + /** * optional string birth_date = 2; + * * @param value The birthDate to set. * @return This builder for chaining. */ - public Builder setBirthDate( - java.lang.String value) { - if (value == null) { throw new NullPointerException(); } + public Builder setBirthDate(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } birthDate_ = value; bitField0_ |= 0x00000002; onChanged(); return this; } + /** * optional string birth_date = 2; + * * @return This builder for chaining. */ public Builder clearBirthDate() { @@ -915,14 +963,17 @@ public Builder clearBirthDate() { onChanged(); return this; } + /** * optional string birth_date = 2; + * * @param value The bytes for birthDate to set. * @return This builder for chaining. */ - public Builder setBirthDateBytes( - com.google.protobuf.ByteString value) { - if (value == null) { throw new NullPointerException(); } + public Builder setBirthDateBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } checkByteStringIsUtf8(value); birthDate_ = value; bitField0_ |= 0x00000002; @@ -931,22 +982,25 @@ public Builder setBirthDateBytes( } private java.lang.Object nationality_ = ""; + /** * optional string nationality = 3; + * * @return Whether the nationality field is set. */ public boolean hasNationality() { return ((bitField0_ & 0x00000004) != 0); } + /** * optional string nationality = 3; + * * @return The nationality. */ public java.lang.String getNationality() { java.lang.Object ref = nationality_; 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(); nationality_ = s; return s; @@ -954,38 +1008,43 @@ public java.lang.String getNationality() { return (java.lang.String) ref; } } + /** * optional string nationality = 3; + * * @return The bytes for nationality. */ - public com.google.protobuf.ByteString - getNationalityBytes() { + public com.google.protobuf.ByteString getNationalityBytes() { java.lang.Object ref = nationality_; 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); nationality_ = b; return b; } else { return (com.google.protobuf.ByteString) ref; } } + /** * optional string nationality = 3; + * * @param value The nationality to set. * @return This builder for chaining. */ - public Builder setNationality( - java.lang.String value) { - if (value == null) { throw new NullPointerException(); } + public Builder setNationality(java.lang.String value) { + if (value == null) { + throw new NullPointerException(); + } nationality_ = value; bitField0_ |= 0x00000004; onChanged(); return this; } + /** * optional string nationality = 3; + * * @return This builder for chaining. */ public Builder clearNationality() { @@ -994,14 +1053,17 @@ public Builder clearNationality() { onChanged(); return this; } + /** * optional string nationality = 3; + * * @param value The bytes for nationality to set. * @return This builder for chaining. */ - public Builder setNationalityBytes( - com.google.protobuf.ByteString value) { - if (value == null) { throw new NullPointerException(); } + public Builder setNationalityBytes(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } checkByteStringIsUtf8(value); nationality_ = value; bitField0_ |= 0x00000004; @@ -1010,22 +1072,30 @@ public Builder setNationalityBytes( } private int genre_ = 0; + /** * optional .examples.bigtable.music.Genre genre = 4; + * * @return Whether the genre field is set. */ - @java.lang.Override public boolean hasGenre() { + @java.lang.Override + public boolean hasGenre() { return ((bitField0_ & 0x00000008) != 0); } + /** * optional .examples.bigtable.music.Genre genre = 4; + * * @return The enum numeric value on the wire for genre. */ - @java.lang.Override public int getGenreValue() { + @java.lang.Override + public int getGenreValue() { return genre_; } + /** * optional .examples.bigtable.music.Genre genre = 4; + * * @param value The enum numeric value on the wire for genre to set. * @return This builder for chaining. */ @@ -1035,29 +1105,38 @@ public Builder setGenreValue(int value) { onChanged(); return this; } + /** * optional .examples.bigtable.music.Genre genre = 4; + * * @return The genre. */ @java.lang.Override public com.example.bigtable.SingerProto.Genre getGenre() { - com.example.bigtable.SingerProto.Genre result = com.example.bigtable.SingerProto.Genre.forNumber(genre_); + com.example.bigtable.SingerProto.Genre result = + com.example.bigtable.SingerProto.Genre.forNumber(genre_); return result == null ? com.example.bigtable.SingerProto.Genre.UNRECOGNIZED : result; } + /** * optional .examples.bigtable.music.Genre genre = 4; + * * @param value The genre to set. * @return This builder for chaining. */ public Builder setGenre(com.example.bigtable.SingerProto.Genre value) { - if (value == null) { throw new NullPointerException(); } + if (value == null) { + throw new NullPointerException(); + } bitField0_ |= 0x00000008; genre_ = value.getNumber(); onChanged(); return this; } + /** * optional .examples.bigtable.music.Genre genre = 4; + * * @return This builder for chaining. */ public Builder clearGenre() { @@ -1072,6 +1151,7 @@ public Builder clearGenre() { // @@protoc_insertion_point(class_scope:examples.bigtable.music.SingerInfo) private static final com.example.bigtable.SingerProto.SingerInfo DEFAULT_INSTANCE; + static { DEFAULT_INSTANCE = new com.example.bigtable.SingerProto.SingerInfo(); } @@ -1080,27 +1160,28 @@ public static com.example.bigtable.SingerProto.SingerInfo getDefaultInstance() { return DEFAULT_INSTANCE; } - private static final com.google.protobuf.Parser - PARSER = new com.google.protobuf.AbstractParser() { - @java.lang.Override - public SingerInfo 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 SingerInfo 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; @@ -1115,43 +1196,51 @@ public com.google.protobuf.Parser getParserForType() { public com.example.bigtable.SingerProto.SingerInfo getDefaultInstanceForType() { return DEFAULT_INSTANCE; } - } private static final com.google.protobuf.Descriptors.Descriptor - internal_static_examples_bigtable_music_SingerInfo_descriptor; - private static final - com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_examples_bigtable_music_SingerInfo_descriptor; + private static final com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_examples_bigtable_music_SingerInfo_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\014singer.proto\022\027examples.bigtable.music\"" + - "\302\001\n\nSingerInfo\022\026\n\tsinger_id\030\001 \001(\003H\000\210\001\001\022\027" + - "\n\nbirth_date\030\002 \001(\tH\001\210\001\001\022\030\n\013nationality\030\003" + - " \001(\tH\002\210\001\001\0222\n\005genre\030\004 \001(\0162\036.examples.bigt" + - "able.music.GenreH\003\210\001\001B\014\n\n_singer_idB\r\n\013_" + - "birth_dateB\016\n\014_nationalityB\010\n\006_genre*.\n\005" + - "Genre\022\007\n\003POP\020\000\022\010\n\004JAZZ\020\001\022\010\n\004FOLK\020\002\022\010\n\004RO" + - "CK\020\003B%\n\024com.example.bigtableB\013SingerProt" + - "oP\000b\006proto3" + "\n" + + "\014singer.proto\022\027examples.bigtable.music\"\302\001\n\n" + + "SingerInfo\022\026\n" + + "\tsinger_id\030\001 \001(\003H\000\210\001\001\022\027\n\n" + + "birth_date\030\002 \001(\tH\001\210\001\001\022\030\n" + + "\013nationality\030\003 \001(\tH\002\210\001\001\0222\n" + + "\005genre\030\004" + + " \001(\0162\036.examples.bigtable.music.GenreH\003\210\001\001B\014\n\n" + + "_singer_idB\r\n" + + "\013_birth_dateB\016\n" + + "\014_nationalityB\010\n" + + "\006_genre*.\n" + + "\005Genre\022\007\n" + + "\003POP\020\000\022\010\n" + + "\004JAZZ\020\001\022\010\n" + + "\004FOLK\020\002\022\010\n" + + "\004ROCK\020\003B%\n" + + "\024com.example.bigtableB\013SingerProtoP\000b\006proto3" }; - descriptor = com.google.protobuf.Descriptors.FileDescriptor - .internalBuildGeneratedFileFrom(descriptorData, - new com.google.protobuf.Descriptors.FileDescriptor[] { - }); + descriptor = + com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( + descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] {}); internal_static_examples_bigtable_music_SingerInfo_descriptor = - getDescriptor().getMessageTypes().get(0); - internal_static_examples_bigtable_music_SingerInfo_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_examples_bigtable_music_SingerInfo_descriptor, - new java.lang.String[] { "SingerId", "BirthDate", "Nationality", "Genre", }); + getDescriptor().getMessageTypes().get(0); + internal_static_examples_bigtable_music_SingerInfo_fieldAccessorTable = + new com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_examples_bigtable_music_SingerInfo_descriptor, + new java.lang.String[] { + "SingerId", "BirthDate", "Nationality", "Genre", + }); descriptor.resolveAllFeaturesImmutable(); }