From 5c362119940a3257254235ca132582755264c2d7 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot <44816363+yoshi-automation@users.noreply.github.com> Date: Fri, 29 Mar 2019 01:26:57 -0700 Subject: [PATCH] Regenerate spanner client (#4810) --- .../database/v1/CreateDatabaseMetadata.java | 23 ++-- .../database/v1/CreateDatabaseRequest.java | 35 +++--- .../spanner/admin/database/v1/Database.java | 25 ++-- .../database/v1/DropDatabaseRequest.java | 23 ++-- .../database/v1/GetDatabaseDdlRequest.java | 23 ++-- .../database/v1/GetDatabaseDdlResponse.java | 31 +++-- .../admin/database/v1/GetDatabaseRequest.java | 23 ++-- .../database/v1/ListDatabasesRequest.java | 28 ++--- .../database/v1/ListDatabasesResponse.java | 38 +++--- .../v1/UpdateDatabaseDdlMetadata.java | 45 ++++--- .../database/v1/UpdateDatabaseDdlRequest.java | 35 +++--- .../instance/v1/CreateInstanceMetadata.java | 45 ++++--- .../instance/v1/CreateInstanceRequest.java | 31 +++-- .../instance/v1/DeleteInstanceRequest.java | 23 ++-- .../instance/v1/GetInstanceConfigRequest.java | 23 ++-- .../admin/instance/v1/GetInstanceRequest.java | 23 ++-- .../spanner/admin/instance/v1/Instance.java | 36 +++--- .../admin/instance/v1/InstanceConfig.java | 25 ++-- .../v1/ListInstanceConfigsRequest.java | 28 ++--- .../v1/ListInstanceConfigsResponse.java | 35 +++--- .../instance/v1/ListInstancesRequest.java | 30 +++-- .../instance/v1/ListInstancesResponse.java | 38 +++--- .../instance/v1/UpdateInstanceMetadata.java | 45 ++++--- .../instance/v1/UpdateInstanceRequest.java | 33 +++-- .../spanner/v1/BeginTransactionRequest.java | 29 +++-- .../com/google/spanner/v1/CommitRequest.java | 45 +++---- .../com/google/spanner/v1/CommitResponse.java | 27 ++-- .../spanner/v1/CreateSessionRequest.java | 29 +++-- .../spanner/v1/DeleteSessionRequest.java | 23 ++-- .../spanner/v1/ExecuteBatchDmlRequest.java | 80 ++++++------ .../spanner/v1/ExecuteBatchDmlResponse.java | 42 +++---- .../google/spanner/v1/ExecuteSqlRequest.java | 52 ++++---- .../google/spanner/v1/GetSessionRequest.java | 23 ++-- .../java/com/google/spanner/v1/KeyRange.java | 35 +++--- .../java/com/google/spanner/v1/KeySet.java | 54 ++++---- .../spanner/v1/ListSessionsRequest.java | 30 +++-- .../spanner/v1/ListSessionsResponse.java | 38 +++--- .../java/com/google/spanner/v1/Mutation.java | 111 ++++++++--------- .../google/spanner/v1/PartialResultSet.java | 53 ++++---- .../java/com/google/spanner/v1/Partition.java | 23 ++-- .../google/spanner/v1/PartitionOptions.java | 30 ++--- .../spanner/v1/PartitionQueryRequest.java | 47 ++++--- .../spanner/v1/PartitionReadRequest.java | 55 ++++----- .../google/spanner/v1/PartitionResponse.java | 42 +++---- .../java/com/google/spanner/v1/PlanNode.java | 116 ++++++++---------- .../java/com/google/spanner/v1/QueryPlan.java | 36 +++--- .../com/google/spanner/v1/ReadRequest.java | 56 ++++----- .../java/com/google/spanner/v1/ResultSet.java | 48 ++++---- .../google/spanner/v1/ResultSetMetadata.java | 33 +++-- .../com/google/spanner/v1/ResultSetStats.java | 40 +++--- .../google/spanner/v1/RollbackRequest.java | 25 ++-- .../java/com/google/spanner/v1/Session.java | 39 +++--- .../com/google/spanner/v1/StructType.java | 65 +++++----- .../com/google/spanner/v1/Transaction.java | 29 +++-- .../google/spanner/v1/TransactionOptions.java | 112 ++++++++--------- .../spanner/v1/TransactionSelector.java | 30 +++-- .../main/java/com/google/spanner/v1/Type.java | 35 +++--- .../google-cloud-spanner/synth.metadata | 10 +- 58 files changed, 1075 insertions(+), 1211 deletions(-) diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CreateDatabaseMetadata.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CreateDatabaseMetadata.java index 3febc6267989..03dcec613a97 100644 --- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CreateDatabaseMetadata.java +++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CreateDatabaseMetadata.java @@ -60,7 +60,7 @@ private CreateDatabaseMetadata( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -180,10 +180,9 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.admin.database.v1.CreateDatabaseMetadata other = (com.google.spanner.admin.database.v1.CreateDatabaseMetadata) obj; - boolean result = true; - result = result && getDatabase().equals(other.getDatabase()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDatabase().equals(other.getDatabase())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -378,35 +377,35 @@ public com.google.spanner.admin.database.v1.CreateDatabaseMetadata buildPartial( @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -552,7 +551,7 @@ public Builder setDatabaseBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CreateDatabaseRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CreateDatabaseRequest.java index 44426713446e..82792aaf6105 100644 --- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CreateDatabaseRequest.java +++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/CreateDatabaseRequest.java @@ -70,7 +70,7 @@ private CreateDatabaseRequest( case 26: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { extraStatements_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -79,7 +79,7 @@ private CreateDatabaseRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -91,7 +91,7 @@ private CreateDatabaseRequest( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { extraStatements_ = extraStatements_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -336,12 +336,11 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.admin.database.v1.CreateDatabaseRequest other = (com.google.spanner.admin.database.v1.CreateDatabaseRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getCreateStatement().equals(other.getCreateStatement()); - result = result && getExtraStatementsList().equals(other.getExtraStatementsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getCreateStatement().equals(other.getCreateStatement())) return false; + if (!getExtraStatementsList().equals(other.getExtraStatementsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -543,7 +542,7 @@ public com.google.spanner.admin.database.v1.CreateDatabaseRequest buildPartial() int to_bitField0_ = 0; result.parent_ = parent_; result.createStatement_ = createStatement_; - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { extraStatements_ = extraStatements_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000004); } @@ -555,35 +554,35 @@ public com.google.spanner.admin.database.v1.CreateDatabaseRequest buildPartial() @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -866,7 +865,7 @@ public Builder setCreateStatementBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureExtraStatementsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { extraStatements_ = new com.google.protobuf.LazyStringArrayList(extraStatements_); bitField0_ |= 0x00000004; } @@ -1034,7 +1033,7 @@ public Builder addExtraStatementsBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/Database.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/Database.java index 38a29c3d60d4..fd81b3833b4e 100644 --- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/Database.java +++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/Database.java @@ -67,7 +67,7 @@ private Database( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -382,11 +382,10 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.admin.database.v1.Database other = (com.google.spanner.admin.database.v1.Database) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && state_ == other.state_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (state_ != other.state_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -584,35 +583,35 @@ public com.google.spanner.admin.database.v1.Database buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -857,7 +856,7 @@ public Builder clearState() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/DropDatabaseRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/DropDatabaseRequest.java index 54e0f3a51c09..e16b94282dcc 100644 --- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/DropDatabaseRequest.java +++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/DropDatabaseRequest.java @@ -60,7 +60,7 @@ private DropDatabaseRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -180,10 +180,9 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.admin.database.v1.DropDatabaseRequest other = (com.google.spanner.admin.database.v1.DropDatabaseRequest) obj; - boolean result = true; - result = result && getDatabase().equals(other.getDatabase()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDatabase().equals(other.getDatabase())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -378,35 +377,35 @@ public com.google.spanner.admin.database.v1.DropDatabaseRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -552,7 +551,7 @@ public Builder setDatabaseBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseDdlRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseDdlRequest.java index 5fb9bc448afe..a453edeb6721 100644 --- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseDdlRequest.java +++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseDdlRequest.java @@ -60,7 +60,7 @@ private GetDatabaseDdlRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -180,10 +180,9 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.admin.database.v1.GetDatabaseDdlRequest other = (com.google.spanner.admin.database.v1.GetDatabaseDdlRequest) obj; - boolean result = true; - result = result && getDatabase().equals(other.getDatabase()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDatabase().equals(other.getDatabase())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -378,35 +377,35 @@ public com.google.spanner.admin.database.v1.GetDatabaseDdlRequest buildPartial() @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -552,7 +551,7 @@ public Builder setDatabaseBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseDdlResponse.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseDdlResponse.java index 04b33f68f63e..cfd704a1d9d6 100644 --- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseDdlResponse.java +++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseDdlResponse.java @@ -54,7 +54,7 @@ private GetDatabaseDdlResponse( case 10: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { statements_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -63,7 +63,7 @@ private GetDatabaseDdlResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -75,7 +75,7 @@ private GetDatabaseDdlResponse( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { statements_ = statements_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -203,10 +203,9 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.admin.database.v1.GetDatabaseDdlResponse other = (com.google.spanner.admin.database.v1.GetDatabaseDdlResponse) obj; - boolean result = true; - result = result && getStatementsList().equals(other.getStatementsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getStatementsList().equals(other.getStatementsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -397,7 +396,7 @@ public com.google.spanner.admin.database.v1.GetDatabaseDdlResponse buildPartial( com.google.spanner.admin.database.v1.GetDatabaseDdlResponse result = new com.google.spanner.admin.database.v1.GetDatabaseDdlResponse(this); int from_bitField0_ = bitField0_; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { statements_ = statements_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } @@ -408,35 +407,35 @@ public com.google.spanner.admin.database.v1.GetDatabaseDdlResponse buildPartial( @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -498,7 +497,7 @@ public Builder mergeFrom( com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureStatementsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { statements_ = new com.google.protobuf.LazyStringArrayList(statements_); bitField0_ |= 0x00000001; } @@ -648,7 +647,7 @@ public Builder addStatementsBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseRequest.java index d64aa8781d70..6f0277b44d3e 100644 --- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseRequest.java +++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/GetDatabaseRequest.java @@ -60,7 +60,7 @@ private GetDatabaseRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -182,10 +182,9 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.admin.database.v1.GetDatabaseRequest other = (com.google.spanner.admin.database.v1.GetDatabaseRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -380,35 +379,35 @@ public com.google.spanner.admin.database.v1.GetDatabaseRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -559,7 +558,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/ListDatabasesRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/ListDatabasesRequest.java index 1ecb7682365d..260fe1bb484f 100644 --- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/ListDatabasesRequest.java +++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/ListDatabasesRequest.java @@ -25,7 +25,6 @@ private ListDatabasesRequest(com.google.protobuf.GeneratedMessageV3.Builder b private ListDatabasesRequest() { parent_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -74,7 +73,7 @@ private ListDatabasesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -273,12 +272,11 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.admin.database.v1.ListDatabasesRequest other = (com.google.spanner.admin.database.v1.ListDatabasesRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -483,35 +481,35 @@ public com.google.spanner.admin.database.v1.ListDatabasesRequest buildPartial() @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -825,7 +823,7 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/ListDatabasesResponse.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/ListDatabasesResponse.java index bc25488f8d96..beeb0decddd6 100644 --- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/ListDatabasesResponse.java +++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/ListDatabasesResponse.java @@ -54,7 +54,7 @@ private ListDatabasesResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { databases_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -73,7 +73,7 @@ private ListDatabasesResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -85,7 +85,7 @@ private ListDatabasesResponse( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { databases_ = java.util.Collections.unmodifiableList(databases_); } this.unknownFields = unknownFields.build(); @@ -271,11 +271,10 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.admin.database.v1.ListDatabasesResponse other = (com.google.spanner.admin.database.v1.ListDatabasesResponse) obj; - boolean result = true; - result = result && getDatabasesList().equals(other.getDatabasesList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDatabasesList().equals(other.getDatabasesList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -478,7 +477,7 @@ public com.google.spanner.admin.database.v1.ListDatabasesResponse buildPartial() int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (databasesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { databases_ = java.util.Collections.unmodifiableList(databases_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -494,35 +493,35 @@ public com.google.spanner.admin.database.v1.ListDatabasesResponse buildPartial() @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -605,7 +604,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureDatabasesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { databases_ = new java.util.ArrayList(databases_); bitField0_ |= 0x00000001; @@ -946,10 +945,7 @@ public com.google.spanner.admin.database.v1.Database.Builder addDatabasesBuilder com.google.spanner.admin.database.v1.Database, com.google.spanner.admin.database.v1.Database.Builder, com.google.spanner.admin.database.v1.DatabaseOrBuilder>( - databases_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + databases_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); databases_ = null; } return databasesBuilder_; @@ -1061,7 +1057,7 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/UpdateDatabaseDdlMetadata.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/UpdateDatabaseDdlMetadata.java index e22ee3434b85..24eeb79671e6 100644 --- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/UpdateDatabaseDdlMetadata.java +++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/UpdateDatabaseDdlMetadata.java @@ -63,7 +63,7 @@ private UpdateDatabaseDdlMetadata( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { statements_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -72,7 +72,7 @@ private UpdateDatabaseDdlMetadata( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { commitTimestamps_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -82,7 +82,7 @@ private UpdateDatabaseDdlMetadata( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -94,10 +94,10 @@ private UpdateDatabaseDdlMetadata( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { statements_ = statements_.getUnmodifiableView(); } - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { commitTimestamps_ = java.util.Collections.unmodifiableList(commitTimestamps_); } this.unknownFields = unknownFields.build(); @@ -355,12 +355,11 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata other = (com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata) obj; - boolean result = true; - result = result && getDatabase().equals(other.getDatabase()); - result = result && getStatementsList().equals(other.getStatementsList()); - result = result && getCommitTimestampsList().equals(other.getCommitTimestampsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDatabase().equals(other.getDatabase())) return false; + if (!getStatementsList().equals(other.getStatementsList())) return false; + if (!getCommitTimestampsList().equals(other.getCommitTimestampsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -570,13 +569,13 @@ public com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata buildParti int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.database_ = database_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { statements_ = statements_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } result.statements_ = statements_; if (commitTimestampsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { commitTimestamps_ = java.util.Collections.unmodifiableList(commitTimestamps_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -591,35 +590,35 @@ public com.google.spanner.admin.database.v1.UpdateDatabaseDdlMetadata buildParti @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -808,7 +807,7 @@ public Builder setDatabaseBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureStatementsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { statements_ = new com.google.protobuf.LazyStringArrayList(statements_); bitField0_ |= 0x00000002; } @@ -960,7 +959,7 @@ public Builder addStatementsBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureCommitTimestampsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { commitTimestamps_ = new java.util.ArrayList(commitTimestamps_); bitField0_ |= 0x00000004; @@ -1336,7 +1335,7 @@ public java.util.List getCommitTimestamps com.google.protobuf.Timestamp.Builder, com.google.protobuf.TimestampOrBuilder>( commitTimestamps_, - ((bitField0_ & 0x00000004) == 0x00000004), + ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); commitTimestamps_ = null; @@ -1346,7 +1345,7 @@ public java.util.List getCommitTimestamps @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/UpdateDatabaseDdlRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/UpdateDatabaseDdlRequest.java index 2b749c8cec43..79b993ee0307 100644 --- a/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/UpdateDatabaseDdlRequest.java +++ b/google-api-grpc/proto-google-cloud-spanner-admin-database-v1/src/main/java/com/google/spanner/admin/database/v1/UpdateDatabaseDdlRequest.java @@ -76,7 +76,7 @@ private UpdateDatabaseDdlRequest( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { statements_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -92,7 +92,7 @@ private UpdateDatabaseDdlRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -104,7 +104,7 @@ private UpdateDatabaseDdlRequest( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { statements_ = statements_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -363,12 +363,11 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.admin.database.v1.UpdateDatabaseDdlRequest other = (com.google.spanner.admin.database.v1.UpdateDatabaseDdlRequest) obj; - boolean result = true; - result = result && getDatabase().equals(other.getDatabase()); - result = result && getStatementsList().equals(other.getStatementsList()); - result = result && getOperationId().equals(other.getOperationId()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDatabase().equals(other.getDatabase())) return false; + if (!getStatementsList().equals(other.getStatementsList())) return false; + if (!getOperationId().equals(other.getOperationId())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -583,7 +582,7 @@ public com.google.spanner.admin.database.v1.UpdateDatabaseDdlRequest buildPartia int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.database_ = database_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { statements_ = statements_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } @@ -596,35 +595,35 @@ public com.google.spanner.admin.database.v1.UpdateDatabaseDdlRequest buildPartia @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -790,7 +789,7 @@ public Builder setDatabaseBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureStatementsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { statements_ = new com.google.protobuf.LazyStringArrayList(statements_); bitField0_ |= 0x00000002; } @@ -1115,7 +1114,7 @@ public Builder setOperationIdBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/CreateInstanceMetadata.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/CreateInstanceMetadata.java index fbceded49f19..651dbd355a8c 100644 --- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/CreateInstanceMetadata.java +++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/CreateInstanceMetadata.java @@ -112,7 +112,7 @@ private CreateInstanceMetadata( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -377,25 +377,24 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.admin.instance.v1.CreateInstanceMetadata other = (com.google.spanner.admin.instance.v1.CreateInstanceMetadata) obj; - boolean result = true; - result = result && (hasInstance() == other.hasInstance()); + if (hasInstance() != other.hasInstance()) return false; if (hasInstance()) { - result = result && getInstance().equals(other.getInstance()); + if (!getInstance().equals(other.getInstance())) return false; } - result = result && (hasStartTime() == other.hasStartTime()); + if (hasStartTime() != other.hasStartTime()) return false; if (hasStartTime()) { - result = result && getStartTime().equals(other.getStartTime()); + if (!getStartTime().equals(other.getStartTime())) return false; } - result = result && (hasCancelTime() == other.hasCancelTime()); + if (hasCancelTime() != other.hasCancelTime()) return false; if (hasCancelTime()) { - result = result && getCancelTime().equals(other.getCancelTime()); + if (!getCancelTime().equals(other.getCancelTime())) return false; } - result = result && (hasEndTime() == other.hasEndTime()); + if (hasEndTime() != other.hasEndTime()) return false; if (hasEndTime()) { - result = result && getEndTime().equals(other.getEndTime()); + if (!getEndTime().equals(other.getEndTime())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -645,35 +644,35 @@ public com.google.spanner.admin.instance.v1.CreateInstanceMetadata buildPartial( @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -731,7 +730,7 @@ public Builder mergeFrom( return this; } - private com.google.spanner.admin.instance.v1.Instance instance_ = null; + private com.google.spanner.admin.instance.v1.Instance instance_; private com.google.protobuf.SingleFieldBuilderV3< com.google.spanner.admin.instance.v1.Instance, com.google.spanner.admin.instance.v1.Instance.Builder, @@ -913,7 +912,7 @@ public com.google.spanner.admin.instance.v1.InstanceOrBuilder getInstanceOrBuild return instanceBuilder_; } - private com.google.protobuf.Timestamp startTime_ = null; + private com.google.protobuf.Timestamp startTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1106,7 +1105,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { return startTimeBuilder_; } - private com.google.protobuf.Timestamp cancelTime_ = null; + private com.google.protobuf.Timestamp cancelTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1303,7 +1302,7 @@ public com.google.protobuf.TimestampOrBuilder getCancelTimeOrBuilder() { return cancelTimeBuilder_; } - private com.google.protobuf.Timestamp endTime_ = null; + private com.google.protobuf.Timestamp endTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1480,7 +1479,7 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/CreateInstanceRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/CreateInstanceRequest.java index f02fe2d4cbd9..d275f86408de 100644 --- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/CreateInstanceRequest.java +++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/CreateInstanceRequest.java @@ -84,7 +84,7 @@ private CreateInstanceRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -309,15 +309,14 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.admin.instance.v1.CreateInstanceRequest other = (com.google.spanner.admin.instance.v1.CreateInstanceRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getInstanceId().equals(other.getInstanceId()); - result = result && (hasInstance() == other.hasInstance()); + if (!getParent().equals(other.getParent())) return false; + if (!getInstanceId().equals(other.getInstanceId())) return false; + if (hasInstance() != other.hasInstance()) return false; if (hasInstance()) { - result = result && getInstance().equals(other.getInstance()); + if (!getInstance().equals(other.getInstance())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -532,35 +531,35 @@ public com.google.spanner.admin.instance.v1.CreateInstanceRequest buildPartial() @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -820,7 +819,7 @@ public Builder setInstanceIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.spanner.admin.instance.v1.Instance instance_ = null; + private com.google.spanner.admin.instance.v1.Instance instance_; private com.google.protobuf.SingleFieldBuilderV3< com.google.spanner.admin.instance.v1.Instance, com.google.spanner.admin.instance.v1.Instance.Builder, @@ -1013,7 +1012,7 @@ public com.google.spanner.admin.instance.v1.InstanceOrBuilder getInstanceOrBuild @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/DeleteInstanceRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/DeleteInstanceRequest.java index c219c203493f..0c054dbfdd9f 100644 --- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/DeleteInstanceRequest.java +++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/DeleteInstanceRequest.java @@ -60,7 +60,7 @@ private DeleteInstanceRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -182,10 +182,9 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.admin.instance.v1.DeleteInstanceRequest other = (com.google.spanner.admin.instance.v1.DeleteInstanceRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -380,35 +379,35 @@ public com.google.spanner.admin.instance.v1.DeleteInstanceRequest buildPartial() @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -559,7 +558,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/GetInstanceConfigRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/GetInstanceConfigRequest.java index fda3a526d95d..4f6af7ffeac2 100644 --- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/GetInstanceConfigRequest.java +++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/GetInstanceConfigRequest.java @@ -60,7 +60,7 @@ private GetInstanceConfigRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -182,10 +182,9 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.admin.instance.v1.GetInstanceConfigRequest other = (com.google.spanner.admin.instance.v1.GetInstanceConfigRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -381,35 +380,35 @@ public com.google.spanner.admin.instance.v1.GetInstanceConfigRequest buildPartia @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -562,7 +561,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/GetInstanceRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/GetInstanceRequest.java index 0b52fff5f09c..a967996962fc 100644 --- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/GetInstanceRequest.java +++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/GetInstanceRequest.java @@ -60,7 +60,7 @@ private GetInstanceRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -182,10 +182,9 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.admin.instance.v1.GetInstanceRequest other = (com.google.spanner.admin.instance.v1.GetInstanceRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -380,35 +379,35 @@ public com.google.spanner.admin.instance.v1.GetInstanceRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -559,7 +558,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/Instance.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/Instance.java index 1b9e977cb9da..d9c3e6db9915 100644 --- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/Instance.java +++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/Instance.java @@ -26,7 +26,6 @@ private Instance() { name_ = ""; config_ = ""; displayName_ = ""; - nodeCount_ = 0; state_ = 0; } @@ -89,7 +88,7 @@ private Instance( } case 58: { - if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (!((mutable_bitField0_ & 0x00000020) != 0)) { labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry); mutable_bitField0_ |= 0x00000020; @@ -102,7 +101,7 @@ private Instance( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -743,15 +742,14 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.admin.instance.v1.Instance other = (com.google.spanner.admin.instance.v1.Instance) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getConfig().equals(other.getConfig()); - result = result && getDisplayName().equals(other.getDisplayName()); - result = result && (getNodeCount() == other.getNodeCount()); - result = result && state_ == other.state_; - result = result && internalGetLabels().equals(other.internalGetLabels()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getConfig().equals(other.getConfig())) return false; + if (!getDisplayName().equals(other.getDisplayName())) return false; + if (getNodeCount() != other.getNodeCount()) return false; + if (state_ != other.state_) return false; + if (!internalGetLabels().equals(other.internalGetLabels())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -994,35 +992,35 @@ public com.google.spanner.admin.instance.v1.Instance buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1831,7 +1829,7 @@ public Builder putAllLabels(java.util.Map va @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/InstanceConfig.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/InstanceConfig.java index 944a7e05f733..47df2adbbebb 100644 --- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/InstanceConfig.java +++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/InstanceConfig.java @@ -68,7 +68,7 @@ private InstanceConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -241,11 +241,10 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.admin.instance.v1.InstanceConfig other = (com.google.spanner.admin.instance.v1.InstanceConfig) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getDisplayName().equals(other.getDisplayName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getDisplayName().equals(other.getDisplayName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -444,35 +443,35 @@ public com.google.spanner.admin.instance.v1.InstanceConfig buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -726,7 +725,7 @@ public Builder setDisplayNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstanceConfigsRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstanceConfigsRequest.java index 12edebdff61f..0b83f9d37a22 100644 --- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstanceConfigsRequest.java +++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstanceConfigsRequest.java @@ -25,7 +25,6 @@ private ListInstanceConfigsRequest(com.google.protobuf.GeneratedMessageV3.Builde private ListInstanceConfigsRequest() { parent_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -74,7 +73,7 @@ private ListInstanceConfigsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -275,12 +274,11 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.admin.instance.v1.ListInstanceConfigsRequest other = (com.google.spanner.admin.instance.v1.ListInstanceConfigsRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -486,35 +484,35 @@ public com.google.spanner.admin.instance.v1.ListInstanceConfigsRequest buildPart @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -836,7 +834,7 @@ public Builder setPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstanceConfigsResponse.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstanceConfigsResponse.java index eaf0e4a0459c..7e7fd5e10292 100644 --- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstanceConfigsResponse.java +++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstanceConfigsResponse.java @@ -54,7 +54,7 @@ private ListInstanceConfigsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { instanceConfigs_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -74,7 +74,7 @@ private ListInstanceConfigsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -86,7 +86,7 @@ private ListInstanceConfigsResponse( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { instanceConfigs_ = java.util.Collections.unmodifiableList(instanceConfigs_); } this.unknownFields = unknownFields.build(); @@ -274,11 +274,10 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.admin.instance.v1.ListInstanceConfigsResponse other = (com.google.spanner.admin.instance.v1.ListInstanceConfigsResponse) obj; - boolean result = true; - result = result && getInstanceConfigsList().equals(other.getInstanceConfigsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getInstanceConfigsList().equals(other.getInstanceConfigsList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -482,7 +481,7 @@ public com.google.spanner.admin.instance.v1.ListInstanceConfigsResponse buildPar int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (instanceConfigsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { instanceConfigs_ = java.util.Collections.unmodifiableList(instanceConfigs_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -498,35 +497,35 @@ public com.google.spanner.admin.instance.v1.ListInstanceConfigsResponse buildPar @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -612,7 +611,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureInstanceConfigsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { instanceConfigs_ = new java.util.ArrayList( instanceConfigs_); @@ -962,7 +961,7 @@ public com.google.spanner.admin.instance.v1.InstanceConfig.Builder addInstanceCo com.google.spanner.admin.instance.v1.InstanceConfig.Builder, com.google.spanner.admin.instance.v1.InstanceConfigOrBuilder>( instanceConfigs_, - ((bitField0_ & 0x00000001) == 0x00000001), + ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); instanceConfigs_ = null; @@ -1076,7 +1075,7 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstancesRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstancesRequest.java index ac9fa7de10e7..9327871c0598 100644 --- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstancesRequest.java +++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstancesRequest.java @@ -25,7 +25,6 @@ private ListInstancesRequest(com.google.protobuf.GeneratedMessageV3.Builder b private ListInstancesRequest() { parent_ = ""; - pageSize_ = 0; pageToken_ = ""; filter_ = ""; } @@ -82,7 +81,7 @@ private ListInstancesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -360,13 +359,12 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.admin.instance.v1.ListInstancesRequest other = (com.google.spanner.admin.instance.v1.ListInstancesRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && getFilter().equals(other.getFilter()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!getFilter().equals(other.getFilter())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -576,35 +574,35 @@ public com.google.spanner.admin.instance.v1.ListInstancesRequest buildPartial() @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1091,7 +1089,7 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstancesResponse.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstancesResponse.java index 76f0f0b50e43..a28ed998c51c 100644 --- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstancesResponse.java +++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/ListInstancesResponse.java @@ -54,7 +54,7 @@ private ListInstancesResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { instances_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -73,7 +73,7 @@ private ListInstancesResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -85,7 +85,7 @@ private ListInstancesResponse( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { instances_ = java.util.Collections.unmodifiableList(instances_); } this.unknownFields = unknownFields.build(); @@ -271,11 +271,10 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.admin.instance.v1.ListInstancesResponse other = (com.google.spanner.admin.instance.v1.ListInstancesResponse) obj; - boolean result = true; - result = result && getInstancesList().equals(other.getInstancesList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getInstancesList().equals(other.getInstancesList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -478,7 +477,7 @@ public com.google.spanner.admin.instance.v1.ListInstancesResponse buildPartial() int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (instancesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { instances_ = java.util.Collections.unmodifiableList(instances_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -494,35 +493,35 @@ public com.google.spanner.admin.instance.v1.ListInstancesResponse buildPartial() @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -605,7 +604,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureInstancesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { instances_ = new java.util.ArrayList(instances_); bitField0_ |= 0x00000001; @@ -946,10 +945,7 @@ public com.google.spanner.admin.instance.v1.Instance.Builder addInstancesBuilder com.google.spanner.admin.instance.v1.Instance, com.google.spanner.admin.instance.v1.Instance.Builder, com.google.spanner.admin.instance.v1.InstanceOrBuilder>( - instances_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + instances_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); instances_ = null; } return instancesBuilder_; @@ -1061,7 +1057,7 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/UpdateInstanceMetadata.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/UpdateInstanceMetadata.java index 2eec77b9db35..2cde99910b15 100644 --- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/UpdateInstanceMetadata.java +++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/UpdateInstanceMetadata.java @@ -112,7 +112,7 @@ private UpdateInstanceMetadata( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -377,25 +377,24 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.admin.instance.v1.UpdateInstanceMetadata other = (com.google.spanner.admin.instance.v1.UpdateInstanceMetadata) obj; - boolean result = true; - result = result && (hasInstance() == other.hasInstance()); + if (hasInstance() != other.hasInstance()) return false; if (hasInstance()) { - result = result && getInstance().equals(other.getInstance()); + if (!getInstance().equals(other.getInstance())) return false; } - result = result && (hasStartTime() == other.hasStartTime()); + if (hasStartTime() != other.hasStartTime()) return false; if (hasStartTime()) { - result = result && getStartTime().equals(other.getStartTime()); + if (!getStartTime().equals(other.getStartTime())) return false; } - result = result && (hasCancelTime() == other.hasCancelTime()); + if (hasCancelTime() != other.hasCancelTime()) return false; if (hasCancelTime()) { - result = result && getCancelTime().equals(other.getCancelTime()); + if (!getCancelTime().equals(other.getCancelTime())) return false; } - result = result && (hasEndTime() == other.hasEndTime()); + if (hasEndTime() != other.hasEndTime()) return false; if (hasEndTime()) { - result = result && getEndTime().equals(other.getEndTime()); + if (!getEndTime().equals(other.getEndTime())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -645,35 +644,35 @@ public com.google.spanner.admin.instance.v1.UpdateInstanceMetadata buildPartial( @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -731,7 +730,7 @@ public Builder mergeFrom( return this; } - private com.google.spanner.admin.instance.v1.Instance instance_ = null; + private com.google.spanner.admin.instance.v1.Instance instance_; private com.google.protobuf.SingleFieldBuilderV3< com.google.spanner.admin.instance.v1.Instance, com.google.spanner.admin.instance.v1.Instance.Builder, @@ -913,7 +912,7 @@ public com.google.spanner.admin.instance.v1.InstanceOrBuilder getInstanceOrBuild return instanceBuilder_; } - private com.google.protobuf.Timestamp startTime_ = null; + private com.google.protobuf.Timestamp startTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1106,7 +1105,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { return startTimeBuilder_; } - private com.google.protobuf.Timestamp cancelTime_ = null; + private com.google.protobuf.Timestamp cancelTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1303,7 +1302,7 @@ public com.google.protobuf.TimestampOrBuilder getCancelTimeOrBuilder() { return cancelTimeBuilder_; } - private com.google.protobuf.Timestamp endTime_ = null; + private com.google.protobuf.Timestamp endTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1480,7 +1479,7 @@ public com.google.protobuf.TimestampOrBuilder getEndTimeOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/UpdateInstanceRequest.java b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/UpdateInstanceRequest.java index 95c4d05be7b3..bdbfeb12c16d 100644 --- a/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/UpdateInstanceRequest.java +++ b/google-api-grpc/proto-google-cloud-spanner-admin-instance-v1/src/main/java/com/google/spanner/admin/instance/v1/UpdateInstanceRequest.java @@ -82,7 +82,7 @@ private UpdateInstanceRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -269,17 +269,16 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.admin.instance.v1.UpdateInstanceRequest other = (com.google.spanner.admin.instance.v1.UpdateInstanceRequest) obj; - boolean result = true; - result = result && (hasInstance() == other.hasInstance()); + if (hasInstance() != other.hasInstance()) return false; if (hasInstance()) { - result = result && getInstance().equals(other.getInstance()); + if (!getInstance().equals(other.getInstance())) return false; } - result = result && (hasFieldMask() == other.hasFieldMask()); + if (hasFieldMask() != other.hasFieldMask()) return false; if (hasFieldMask()) { - result = result && getFieldMask().equals(other.getFieldMask()); + if (!getFieldMask().equals(other.getFieldMask())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -499,35 +498,35 @@ public com.google.spanner.admin.instance.v1.UpdateInstanceRequest buildPartial() @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -579,7 +578,7 @@ public Builder mergeFrom( return this; } - private com.google.spanner.admin.instance.v1.Instance instance_ = null; + private com.google.spanner.admin.instance.v1.Instance instance_; private com.google.protobuf.SingleFieldBuilderV3< com.google.spanner.admin.instance.v1.Instance, com.google.spanner.admin.instance.v1.Instance.Builder, @@ -788,7 +787,7 @@ public com.google.spanner.admin.instance.v1.InstanceOrBuilder getInstanceOrBuild return instanceBuilder_; } - private com.google.protobuf.FieldMask fieldMask_ = null; + private com.google.protobuf.FieldMask fieldMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, @@ -1010,7 +1009,7 @@ public com.google.protobuf.FieldMaskOrBuilder getFieldMaskOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BeginTransactionRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BeginTransactionRequest.java index 022ade621cfb..95555cd22142 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BeginTransactionRequest.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/BeginTransactionRequest.java @@ -76,7 +76,7 @@ private BeginTransactionRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -243,14 +243,13 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.v1.BeginTransactionRequest other = (com.google.spanner.v1.BeginTransactionRequest) obj; - boolean result = true; - result = result && getSession().equals(other.getSession()); - result = result && (hasOptions() == other.hasOptions()); + if (!getSession().equals(other.getSession())) return false; + if (hasOptions() != other.hasOptions()) return false; if (hasOptions()) { - result = result && getOptions().equals(other.getOptions()); + if (!getOptions().equals(other.getOptions())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -459,35 +458,35 @@ public com.google.spanner.v1.BeginTransactionRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -632,7 +631,7 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.spanner.v1.TransactionOptions options_ = null; + private com.google.spanner.v1.TransactionOptions options_; private com.google.protobuf.SingleFieldBuilderV3< com.google.spanner.v1.TransactionOptions, com.google.spanner.v1.TransactionOptions.Builder, @@ -815,7 +814,7 @@ public com.google.spanner.v1.TransactionOptionsOrBuilder getOptionsOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitRequest.java index d99866162b8f..fcc2e18c3aeb 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitRequest.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitRequest.java @@ -82,7 +82,7 @@ private CommitRequest( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { mutations_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; } @@ -92,7 +92,7 @@ private CommitRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -104,7 +104,7 @@ private CommitRequest( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { mutations_ = java.util.Collections.unmodifiableList(mutations_); } this.unknownFields = unknownFields.build(); @@ -436,23 +436,21 @@ public boolean equals(final java.lang.Object obj) { } com.google.spanner.v1.CommitRequest other = (com.google.spanner.v1.CommitRequest) obj; - boolean result = true; - result = result && getSession().equals(other.getSession()); - result = result && getMutationsList().equals(other.getMutationsList()); - result = result && getTransactionCase().equals(other.getTransactionCase()); - if (!result) return false; + if (!getSession().equals(other.getSession())) return false; + if (!getMutationsList().equals(other.getMutationsList())) return false; + if (!getTransactionCase().equals(other.getTransactionCase())) return false; switch (transactionCase_) { case 2: - result = result && getTransactionId().equals(other.getTransactionId()); + if (!getTransactionId().equals(other.getTransactionId())) return false; break; case 3: - result = result && getSingleUseTransaction().equals(other.getSingleUseTransaction()); + if (!getSingleUseTransaction().equals(other.getSingleUseTransaction())) return false; break; case 0: default: } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -676,7 +674,7 @@ public com.google.spanner.v1.CommitRequest buildPartial() { } } if (mutationsBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { mutations_ = java.util.Collections.unmodifiableList(mutations_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -692,35 +690,35 @@ public com.google.spanner.v1.CommitRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1250,7 +1248,7 @@ public com.google.spanner.v1.TransactionOptionsOrBuilder getSingleUseTransaction java.util.Collections.emptyList(); private void ensureMutationsIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { mutations_ = new java.util.ArrayList(mutations_); bitField0_ |= 0x00000008; } @@ -1622,10 +1620,7 @@ public java.util.List getMutationsBuilde com.google.spanner.v1.Mutation, com.google.spanner.v1.Mutation.Builder, com.google.spanner.v1.MutationOrBuilder>( - mutations_, - ((bitField0_ & 0x00000008) == 0x00000008), - getParentForChildren(), - isClean()); + mutations_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); mutations_ = null; } return mutationsBuilder_; @@ -1633,7 +1628,7 @@ public java.util.List getMutationsBuilde @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitResponse.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitResponse.java index 8de541149849..5335d7d6e1ba 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitResponse.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CommitResponse.java @@ -65,7 +65,7 @@ private CommitResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -182,13 +182,12 @@ public boolean equals(final java.lang.Object obj) { } com.google.spanner.v1.CommitResponse other = (com.google.spanner.v1.CommitResponse) obj; - boolean result = true; - result = result && (hasCommitTimestamp() == other.hasCommitTimestamp()); + if (hasCommitTimestamp() != other.hasCommitTimestamp()) return false; if (hasCommitTimestamp()) { - result = result && getCommitTimestamp().equals(other.getCommitTimestamp()); + if (!getCommitTimestamp().equals(other.getCommitTimestamp())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -389,35 +388,35 @@ public com.google.spanner.v1.CommitResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -464,7 +463,7 @@ public Builder mergeFrom( return this; } - private com.google.protobuf.Timestamp commitTimestamp_ = null; + private com.google.protobuf.Timestamp commitTimestamp_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -647,7 +646,7 @@ public com.google.protobuf.TimestampOrBuilder getCommitTimestampOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CreateSessionRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CreateSessionRequest.java index 66d41a8f17b9..6bd99902b5e2 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CreateSessionRequest.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/CreateSessionRequest.java @@ -74,7 +74,7 @@ private CreateSessionRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -239,14 +239,13 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.v1.CreateSessionRequest other = (com.google.spanner.v1.CreateSessionRequest) obj; - boolean result = true; - result = result && getDatabase().equals(other.getDatabase()); - result = result && (hasSession() == other.hasSession()); + if (!getDatabase().equals(other.getDatabase())) return false; + if (hasSession() != other.hasSession()) return false; if (hasSession()) { - result = result && getSession().equals(other.getSession()); + if (!getSession().equals(other.getSession())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -454,35 +453,35 @@ public com.google.spanner.v1.CreateSessionRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -627,7 +626,7 @@ public Builder setDatabaseBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.spanner.v1.Session session_ = null; + private com.google.spanner.v1.Session session_; private com.google.protobuf.SingleFieldBuilderV3< com.google.spanner.v1.Session, com.google.spanner.v1.Session.Builder, @@ -804,7 +803,7 @@ public com.google.spanner.v1.SessionOrBuilder getSessionOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DeleteSessionRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DeleteSessionRequest.java index ee1c9acb319f..07d9c0ee915e 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DeleteSessionRequest.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/DeleteSessionRequest.java @@ -59,7 +59,7 @@ private DeleteSessionRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -179,10 +179,9 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.v1.DeleteSessionRequest other = (com.google.spanner.v1.DeleteSessionRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -375,35 +374,35 @@ public com.google.spanner.v1.DeleteSessionRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -547,7 +546,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlRequest.java index 5832f27b8f19..c490eca6a52c 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlRequest.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlRequest.java @@ -25,7 +25,6 @@ private ExecuteBatchDmlRequest(com.google.protobuf.GeneratedMessageV3.Builder private ExecuteBatchDmlRequest() { session_ = ""; statements_ = java.util.Collections.emptyList(); - seqno_ = 0L; } @java.lang.Override @@ -77,7 +76,7 @@ private ExecuteBatchDmlRequest( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { statements_ = new java.util.ArrayList< com.google.spanner.v1.ExecuteBatchDmlRequest.Statement>(); @@ -96,7 +95,7 @@ private ExecuteBatchDmlRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -108,7 +107,7 @@ private ExecuteBatchDmlRequest( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { statements_ = java.util.Collections.unmodifiableList(statements_); } this.unknownFields = unknownFields.build(); @@ -373,7 +372,7 @@ private Statement( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { paramTypes_ = com.google.protobuf.MapField.newMapField( ParamTypesDefaultEntryHolder.defaultEntry); @@ -389,7 +388,7 @@ private Statement( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -732,15 +731,14 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.v1.ExecuteBatchDmlRequest.Statement other = (com.google.spanner.v1.ExecuteBatchDmlRequest.Statement) obj; - boolean result = true; - result = result && getSql().equals(other.getSql()); - result = result && (hasParams() == other.hasParams()); + if (!getSql().equals(other.getSql())) return false; + if (hasParams() != other.hasParams()) return false; if (hasParams()) { - result = result && getParams().equals(other.getParams()); + if (!getParams().equals(other.getParams())) return false; } - result = result && internalGetParamTypes().equals(other.internalGetParamTypes()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!internalGetParamTypes().equals(other.internalGetParamTypes())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -981,23 +979,23 @@ public com.google.spanner.v1.ExecuteBatchDmlRequest.Statement buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -1005,13 +1003,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1161,7 +1159,7 @@ public Builder setSqlBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.Struct params_ = null; + private com.google.protobuf.Struct params_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Struct, com.google.protobuf.Struct.Builder, @@ -1630,7 +1628,7 @@ public Builder putAllParamTypes( @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1937,16 +1935,15 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.v1.ExecuteBatchDmlRequest other = (com.google.spanner.v1.ExecuteBatchDmlRequest) obj; - boolean result = true; - result = result && getSession().equals(other.getSession()); - result = result && (hasTransaction() == other.hasTransaction()); + if (!getSession().equals(other.getSession())) return false; + if (hasTransaction() != other.hasTransaction()) return false; if (hasTransaction()) { - result = result && getTransaction().equals(other.getTransaction()); + if (!getTransaction().equals(other.getTransaction())) return false; } - result = result && getStatementsList().equals(other.getStatementsList()); - result = result && (getSeqno() == other.getSeqno()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getStatementsList().equals(other.getStatementsList())) return false; + if (getSeqno() != other.getSeqno()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -2167,7 +2164,7 @@ public com.google.spanner.v1.ExecuteBatchDmlRequest buildPartial() { result.transaction_ = transactionBuilder_.build(); } if (statementsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { statements_ = java.util.Collections.unmodifiableList(statements_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -2183,35 +2180,35 @@ public com.google.spanner.v1.ExecuteBatchDmlRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -2388,7 +2385,7 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.spanner.v1.TransactionSelector transaction_ = null; + private com.google.spanner.v1.TransactionSelector transaction_; private com.google.protobuf.SingleFieldBuilderV3< com.google.spanner.v1.TransactionSelector, com.google.spanner.v1.TransactionSelector.Builder, @@ -2592,7 +2589,7 @@ public com.google.spanner.v1.TransactionSelectorOrBuilder getTransactionOrBuilde java.util.Collections.emptyList(); private void ensureStatementsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { statements_ = new java.util.ArrayList( statements_); @@ -3014,10 +3011,7 @@ public com.google.spanner.v1.ExecuteBatchDmlRequest.Statement.Builder addStateme com.google.spanner.v1.ExecuteBatchDmlRequest.Statement, com.google.spanner.v1.ExecuteBatchDmlRequest.Statement.Builder, com.google.spanner.v1.ExecuteBatchDmlRequest.StatementOrBuilder>( - statements_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + statements_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); statements_ = null; } return statementsBuilder_; @@ -3078,7 +3072,7 @@ public Builder clearSeqno() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlResponse.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlResponse.java index b639f98a5a1e..fe7ec065e240 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlResponse.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteBatchDmlResponse.java @@ -67,7 +67,7 @@ private ExecuteBatchDmlResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { resultSets_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -91,7 +91,7 @@ private ExecuteBatchDmlResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -103,7 +103,7 @@ private ExecuteBatchDmlResponse( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { resultSets_ = java.util.Collections.unmodifiableList(resultSets_); } this.unknownFields = unknownFields.build(); @@ -309,14 +309,13 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.v1.ExecuteBatchDmlResponse other = (com.google.spanner.v1.ExecuteBatchDmlResponse) obj; - boolean result = true; - result = result && getResultSetsList().equals(other.getResultSetsList()); - result = result && (hasStatus() == other.hasStatus()); + if (!getResultSetsList().equals(other.getResultSetsList())) return false; + if (hasStatus() != other.hasStatus()) return false; if (hasStatus()) { - result = result && getStatus().equals(other.getStatus()); + if (!getStatus().equals(other.getStatus())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -538,7 +537,7 @@ public com.google.spanner.v1.ExecuteBatchDmlResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (resultSetsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { resultSets_ = java.util.Collections.unmodifiableList(resultSets_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -558,35 +557,35 @@ public com.google.spanner.v1.ExecuteBatchDmlResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -666,7 +665,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureResultSetsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { resultSets_ = new java.util.ArrayList(resultSets_); bitField0_ |= 0x00000001; } @@ -1094,16 +1093,13 @@ public java.util.List getResultSetsBuil com.google.spanner.v1.ResultSet, com.google.spanner.v1.ResultSet.Builder, com.google.spanner.v1.ResultSetOrBuilder>( - resultSets_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + resultSets_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); resultSets_ = null; } return resultSetsBuilder_; } - private com.google.rpc.Status status_ = null; + private com.google.rpc.Status status_; private com.google.protobuf.SingleFieldBuilderV3< com.google.rpc.Status, com.google.rpc.Status.Builder, com.google.rpc.StatusOrBuilder> statusBuilder_; @@ -1283,7 +1279,7 @@ public com.google.rpc.StatusOrBuilder getStatusOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequest.java index 8fffb5183831..51c4ff16f00d 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequest.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ExecuteSqlRequest.java @@ -29,7 +29,6 @@ private ExecuteSqlRequest() { resumeToken_ = com.google.protobuf.ByteString.EMPTY; queryMode_ = 0; partitionToken_ = com.google.protobuf.ByteString.EMPTY; - seqno_ = 0L; } @java.lang.Override @@ -102,7 +101,7 @@ private ExecuteSqlRequest( } case 42: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { paramTypes_ = com.google.protobuf.MapField.newMapField( ParamTypesDefaultEntryHolder.defaultEntry); @@ -140,7 +139,7 @@ private ExecuteSqlRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -878,24 +877,23 @@ public boolean equals(final java.lang.Object obj) { } com.google.spanner.v1.ExecuteSqlRequest other = (com.google.spanner.v1.ExecuteSqlRequest) obj; - boolean result = true; - result = result && getSession().equals(other.getSession()); - result = result && (hasTransaction() == other.hasTransaction()); + if (!getSession().equals(other.getSession())) return false; + if (hasTransaction() != other.hasTransaction()) return false; if (hasTransaction()) { - result = result && getTransaction().equals(other.getTransaction()); + if (!getTransaction().equals(other.getTransaction())) return false; } - result = result && getSql().equals(other.getSql()); - result = result && (hasParams() == other.hasParams()); + if (!getSql().equals(other.getSql())) return false; + if (hasParams() != other.hasParams()) return false; if (hasParams()) { - result = result && getParams().equals(other.getParams()); - } - result = result && internalGetParamTypes().equals(other.internalGetParamTypes()); - result = result && getResumeToken().equals(other.getResumeToken()); - result = result && queryMode_ == other.queryMode_; - result = result && getPartitionToken().equals(other.getPartitionToken()); - result = result && (getSeqno() == other.getSeqno()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParams().equals(other.getParams())) return false; + } + if (!internalGetParamTypes().equals(other.internalGetParamTypes())) return false; + if (!getResumeToken().equals(other.getResumeToken())) return false; + if (queryMode_ != other.queryMode_) return false; + if (!getPartitionToken().equals(other.getPartitionToken())) return false; + if (getSeqno() != other.getSeqno()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1174,35 +1172,35 @@ public com.google.spanner.v1.ExecuteSqlRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1369,7 +1367,7 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.spanner.v1.TransactionSelector transaction_ = null; + private com.google.spanner.v1.TransactionSelector transaction_; private com.google.protobuf.SingleFieldBuilderV3< com.google.spanner.v1.TransactionSelector, com.google.spanner.v1.TransactionSelector.Builder, @@ -1717,7 +1715,7 @@ public Builder setSqlBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.Struct params_ = null; + private com.google.protobuf.Struct params_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Struct, com.google.protobuf.Struct.Builder, @@ -2476,7 +2474,7 @@ public Builder clearSeqno() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/GetSessionRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/GetSessionRequest.java index 792d74a4e9e3..c727fdc368c8 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/GetSessionRequest.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/GetSessionRequest.java @@ -59,7 +59,7 @@ private GetSessionRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -178,10 +178,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.spanner.v1.GetSessionRequest other = (com.google.spanner.v1.GetSessionRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -374,35 +373,35 @@ public com.google.spanner.v1.GetSessionRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -546,7 +545,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeyRange.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeyRange.java index dda0584fc6d5..e539f54a4b7c 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeyRange.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeyRange.java @@ -170,7 +170,7 @@ private KeyRange( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -538,33 +538,30 @@ public boolean equals(final java.lang.Object obj) { } com.google.spanner.v1.KeyRange other = (com.google.spanner.v1.KeyRange) obj; - boolean result = true; - result = result && getStartKeyTypeCase().equals(other.getStartKeyTypeCase()); - if (!result) return false; + if (!getStartKeyTypeCase().equals(other.getStartKeyTypeCase())) return false; switch (startKeyTypeCase_) { case 1: - result = result && getStartClosed().equals(other.getStartClosed()); + if (!getStartClosed().equals(other.getStartClosed())) return false; break; case 2: - result = result && getStartOpen().equals(other.getStartOpen()); + if (!getStartOpen().equals(other.getStartOpen())) return false; break; case 0: default: } - result = result && getEndKeyTypeCase().equals(other.getEndKeyTypeCase()); - if (!result) return false; + if (!getEndKeyTypeCase().equals(other.getEndKeyTypeCase())) return false; switch (endKeyTypeCase_) { case 3: - result = result && getEndClosed().equals(other.getEndClosed()); + if (!getEndClosed().equals(other.getEndClosed())) return false; break; case 4: - result = result && getEndOpen().equals(other.getEndOpen()); + if (!getEndOpen().equals(other.getEndOpen())) return false; break; case 0: default: } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -865,35 +862,35 @@ public com.google.spanner.v1.KeyRange buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1829,7 +1826,7 @@ public com.google.protobuf.ListValueOrBuilder getEndOpenOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeySet.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeySet.java index af991409c024..6f0fb5eddb84 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeySet.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/KeySet.java @@ -30,7 +30,6 @@ private KeySet(com.google.protobuf.GeneratedMessageV3.Builder builder) { private KeySet() { keys_ = java.util.Collections.emptyList(); ranges_ = java.util.Collections.emptyList(); - all_ = false; } @java.lang.Override @@ -59,7 +58,7 @@ private KeySet( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { keys_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -69,7 +68,7 @@ private KeySet( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { ranges_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -84,7 +83,7 @@ private KeySet( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -96,10 +95,10 @@ private KeySet( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { keys_ = java.util.Collections.unmodifiableList(keys_); } - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { ranges_ = java.util.Collections.unmodifiableList(ranges_); } this.unknownFields = unknownFields.build(); @@ -341,12 +340,11 @@ public boolean equals(final java.lang.Object obj) { } com.google.spanner.v1.KeySet other = (com.google.spanner.v1.KeySet) obj; - boolean result = true; - result = result && getKeysList().equals(other.getKeysList()); - result = result && getRangesList().equals(other.getRangesList()); - result = result && (getAll() == other.getAll()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getKeysList().equals(other.getKeysList())) return false; + if (!getRangesList().equals(other.getRangesList())) return false; + if (getAll() != other.getAll()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -558,7 +556,7 @@ public com.google.spanner.v1.KeySet buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (keysBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { keys_ = java.util.Collections.unmodifiableList(keys_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -567,7 +565,7 @@ public com.google.spanner.v1.KeySet buildPartial() { result.keys_ = keysBuilder_.build(); } if (rangesBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { ranges_ = java.util.Collections.unmodifiableList(ranges_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -583,35 +581,35 @@ public com.google.spanner.v1.KeySet buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -717,7 +715,7 @@ public Builder mergeFrom( private java.util.List keys_ = java.util.Collections.emptyList(); private void ensureKeysIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { keys_ = new java.util.ArrayList(keys_); bitField0_ |= 0x00000001; } @@ -1104,10 +1102,7 @@ public java.util.List getKeysBuilderList( com.google.protobuf.ListValue, com.google.protobuf.ListValue.Builder, com.google.protobuf.ListValueOrBuilder>( - keys_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + keys_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); keys_ = null; } return keysBuilder_; @@ -1117,7 +1112,7 @@ public java.util.List getKeysBuilderList( java.util.Collections.emptyList(); private void ensureRangesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { ranges_ = new java.util.ArrayList(ranges_); bitField0_ |= 0x00000002; } @@ -1471,10 +1466,7 @@ public java.util.List getRangesBuilderLi com.google.spanner.v1.KeyRange, com.google.spanner.v1.KeyRange.Builder, com.google.spanner.v1.KeyRangeOrBuilder>( - ranges_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + ranges_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); ranges_ = null; } return rangesBuilder_; @@ -1532,7 +1524,7 @@ public Builder clearAll() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsRequest.java index 1916bd3377ce..fec0731fa6d9 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsRequest.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsRequest.java @@ -24,7 +24,6 @@ private ListSessionsRequest(com.google.protobuf.GeneratedMessageV3.Builder bu private ListSessionsRequest() { database_ = ""; - pageSize_ = 0; pageToken_ = ""; filter_ = ""; } @@ -81,7 +80,7 @@ private ListSessionsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -339,13 +338,12 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.v1.ListSessionsRequest other = (com.google.spanner.v1.ListSessionsRequest) obj; - boolean result = true; - result = result && getDatabase().equals(other.getDatabase()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && getFilter().equals(other.getFilter()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDatabase().equals(other.getDatabase())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!getFilter().equals(other.getFilter())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -553,35 +551,35 @@ public com.google.spanner.v1.ListSessionsRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1016,7 +1014,7 @@ public Builder setFilterBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsResponse.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsResponse.java index 534cdddd7ac4..9ae9f7ee3187 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsResponse.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ListSessionsResponse.java @@ -53,7 +53,7 @@ private ListSessionsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { sessions_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -70,7 +70,7 @@ private ListSessionsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -82,7 +82,7 @@ private ListSessionsResponse( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { sessions_ = java.util.Collections.unmodifiableList(sessions_); } this.unknownFields = unknownFields.build(); @@ -268,11 +268,10 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.v1.ListSessionsResponse other = (com.google.spanner.v1.ListSessionsResponse) obj; - boolean result = true; - result = result && getSessionsList().equals(other.getSessionsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSessionsList().equals(other.getSessionsList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -473,7 +472,7 @@ public com.google.spanner.v1.ListSessionsResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (sessionsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { sessions_ = java.util.Collections.unmodifiableList(sessions_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -489,35 +488,35 @@ public com.google.spanner.v1.ListSessionsResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -598,7 +597,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureSessionsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { sessions_ = new java.util.ArrayList(sessions_); bitField0_ |= 0x00000001; } @@ -934,10 +933,7 @@ public java.util.List getSessionsBuilderL com.google.spanner.v1.Session, com.google.spanner.v1.Session.Builder, com.google.spanner.v1.SessionOrBuilder>( - sessions_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + sessions_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); sessions_ = null; } return sessionsBuilder_; @@ -1049,7 +1045,7 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Mutation.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Mutation.java index 9f3acf4fc54c..02200909b2d6 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Mutation.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Mutation.java @@ -132,7 +132,7 @@ private Mutation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -404,7 +404,7 @@ private Write( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { columns_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -413,7 +413,7 @@ private Write( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { values_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -423,7 +423,7 @@ private Write( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -435,10 +435,10 @@ private Write( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { columns_ = columns_.getUnmodifiableView(); } - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { values_ = java.util.Collections.unmodifiableList(values_); } this.unknownFields = unknownFields.build(); @@ -742,12 +742,11 @@ public boolean equals(final java.lang.Object obj) { } com.google.spanner.v1.Mutation.Write other = (com.google.spanner.v1.Mutation.Write) obj; - boolean result = true; - result = result && getTable().equals(other.getTable()); - result = result && getColumnsList().equals(other.getColumnsList()); - result = result && getValuesList().equals(other.getValuesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTable().equals(other.getTable())) return false; + if (!getColumnsList().equals(other.getColumnsList())) return false; + if (!getValuesList().equals(other.getValuesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -959,13 +958,13 @@ public com.google.spanner.v1.Mutation.Write buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.table_ = table_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { columns_ = columns_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } result.columns_ = columns_; if (valuesBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { values_ = java.util.Collections.unmodifiableList(values_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -980,23 +979,23 @@ public com.google.spanner.v1.Mutation.Write buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -1004,13 +1003,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1195,7 +1194,7 @@ public Builder setTableBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureColumnsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { columns_ = new com.google.protobuf.LazyStringArrayList(columns_); bitField0_ |= 0x00000002; } @@ -1374,7 +1373,7 @@ public Builder addColumnsBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureValuesIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { values_ = new java.util.ArrayList(values_); bitField0_ |= 0x00000004; } @@ -1872,10 +1871,7 @@ public java.util.List getValuesBuilderLis com.google.protobuf.ListValue, com.google.protobuf.ListValue.Builder, com.google.protobuf.ListValueOrBuilder>( - values_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + values_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); values_ = null; } return valuesBuilder_; @@ -1884,7 +1880,7 @@ public java.util.List getValuesBuilderLis @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -2070,7 +2066,7 @@ private Delete( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -2243,14 +2239,13 @@ public boolean equals(final java.lang.Object obj) { } com.google.spanner.v1.Mutation.Delete other = (com.google.spanner.v1.Mutation.Delete) obj; - boolean result = true; - result = result && getTable().equals(other.getTable()); - result = result && (hasKeySet() == other.hasKeySet()); + if (!getTable().equals(other.getTable())) return false; + if (hasKeySet() != other.hasKeySet()) return false; if (hasKeySet()) { - result = result && getKeySet().equals(other.getKeySet()); + if (!getKeySet().equals(other.getKeySet())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -2460,23 +2455,23 @@ public com.google.spanner.v1.Mutation.Delete buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -2484,13 +2479,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -2635,7 +2630,7 @@ public Builder setTableBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.spanner.v1.KeySet keySet_ = null; + private com.google.spanner.v1.KeySet keySet_; private com.google.protobuf.SingleFieldBuilderV3< com.google.spanner.v1.KeySet, com.google.spanner.v1.KeySet.Builder, @@ -2840,7 +2835,7 @@ public com.google.spanner.v1.KeySetOrBuilder getKeySetOrBuilder() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -3263,30 +3258,28 @@ public boolean equals(final java.lang.Object obj) { } com.google.spanner.v1.Mutation other = (com.google.spanner.v1.Mutation) obj; - boolean result = true; - result = result && getOperationCase().equals(other.getOperationCase()); - if (!result) return false; + if (!getOperationCase().equals(other.getOperationCase())) return false; switch (operationCase_) { case 1: - result = result && getInsert().equals(other.getInsert()); + if (!getInsert().equals(other.getInsert())) return false; break; case 2: - result = result && getUpdate().equals(other.getUpdate()); + if (!getUpdate().equals(other.getUpdate())) return false; break; case 3: - result = result && getInsertOrUpdate().equals(other.getInsertOrUpdate()); + if (!getInsertOrUpdate().equals(other.getInsertOrUpdate())) return false; break; case 4: - result = result && getReplace().equals(other.getReplace()); + if (!getReplace().equals(other.getReplace())) return false; break; case 5: - result = result && getDelete().equals(other.getDelete()); + if (!getDelete().equals(other.getDelete())) return false; break; case 0: default: } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -3535,35 +3528,35 @@ public com.google.spanner.v1.Mutation buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -4740,7 +4733,7 @@ public com.google.spanner.v1.Mutation.DeleteOrBuilder getDeleteOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartialResultSet.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartialResultSet.java index 04e051a1138b..893424f98f0c 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartialResultSet.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartialResultSet.java @@ -26,7 +26,6 @@ private PartialResultSet(com.google.protobuf.GeneratedMessageV3.Builder build private PartialResultSet() { values_ = java.util.Collections.emptyList(); - chunkedValue_ = false; resumeToken_ = com.google.protobuf.ByteString.EMPTY; } @@ -72,7 +71,7 @@ private PartialResultSet( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { values_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -107,7 +106,7 @@ private PartialResultSet( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -119,7 +118,7 @@ private PartialResultSet( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { values_ = java.util.Collections.unmodifiableList(values_); } this.unknownFields = unknownFields.build(); @@ -701,20 +700,19 @@ public boolean equals(final java.lang.Object obj) { } com.google.spanner.v1.PartialResultSet other = (com.google.spanner.v1.PartialResultSet) obj; - boolean result = true; - result = result && (hasMetadata() == other.hasMetadata()); + if (hasMetadata() != other.hasMetadata()) return false; if (hasMetadata()) { - result = result && getMetadata().equals(other.getMetadata()); + if (!getMetadata().equals(other.getMetadata())) return false; } - result = result && getValuesList().equals(other.getValuesList()); - result = result && (getChunkedValue() == other.getChunkedValue()); - result = result && getResumeToken().equals(other.getResumeToken()); - result = result && (hasStats() == other.hasStats()); + if (!getValuesList().equals(other.getValuesList())) return false; + if (getChunkedValue() != other.getChunkedValue()) return false; + if (!getResumeToken().equals(other.getResumeToken())) return false; + if (hasStats() != other.hasStats()) return false; if (hasStats()) { - result = result && getStats().equals(other.getStats()); + if (!getStats().equals(other.getStats())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -946,7 +944,7 @@ public com.google.spanner.v1.PartialResultSet buildPartial() { result.metadata_ = metadataBuilder_.build(); } if (valuesBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { values_ = java.util.Collections.unmodifiableList(values_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -968,35 +966,35 @@ public com.google.spanner.v1.PartialResultSet buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1081,7 +1079,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.spanner.v1.ResultSetMetadata metadata_ = null; + private com.google.spanner.v1.ResultSetMetadata metadata_; private com.google.protobuf.SingleFieldBuilderV3< com.google.spanner.v1.ResultSetMetadata, com.google.spanner.v1.ResultSetMetadata.Builder, @@ -1274,7 +1272,7 @@ public com.google.spanner.v1.ResultSetMetadataOrBuilder getMetadataOrBuilder() { private java.util.List values_ = java.util.Collections.emptyList(); private void ensureValuesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { values_ = new java.util.ArrayList(values_); bitField0_ |= 0x00000002; } @@ -2669,10 +2667,7 @@ public java.util.List getValuesBuilderList() com.google.protobuf.Value, com.google.protobuf.Value.Builder, com.google.protobuf.ValueOrBuilder>( - values_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + values_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); values_ = null; } return valuesBuilder_; @@ -2790,7 +2785,7 @@ public Builder clearResumeToken() { return this; } - private com.google.spanner.v1.ResultSetStats stats_ = null; + private com.google.spanner.v1.ResultSetStats stats_; private com.google.protobuf.SingleFieldBuilderV3< com.google.spanner.v1.ResultSetStats, com.google.spanner.v1.ResultSetStats.Builder, @@ -3005,7 +3000,7 @@ public com.google.spanner.v1.ResultSetStatsOrBuilder getStatsOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Partition.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Partition.java index edb012256aad..bceca12a2da8 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Partition.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Partition.java @@ -58,7 +58,7 @@ private Partition( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -150,10 +150,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.spanner.v1.Partition other = (com.google.spanner.v1.Partition) obj; - boolean result = true; - result = result && getPartitionToken().equals(other.getPartitionToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getPartitionToken().equals(other.getPartitionToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -344,35 +343,35 @@ public com.google.spanner.v1.Partition buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -474,7 +473,7 @@ public Builder clearPartitionToken() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionOptions.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionOptions.java index 59c9a65b934b..01ed1f8a2c3f 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionOptions.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionOptions.java @@ -23,10 +23,7 @@ private PartitionOptions(com.google.protobuf.GeneratedMessageV3.Builder build super(builder); } - private PartitionOptions() { - partitionSizeBytes_ = 0L; - maxPartitions_ = 0L; - } + private PartitionOptions() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -64,7 +61,7 @@ private PartitionOptions( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -186,11 +183,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.spanner.v1.PartitionOptions other = (com.google.spanner.v1.PartitionOptions) obj; - boolean result = true; - result = result && (getPartitionSizeBytes() == other.getPartitionSizeBytes()); - result = result && (getMaxPartitions() == other.getMaxPartitions()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getPartitionSizeBytes() != other.getPartitionSizeBytes()) return false; + if (getMaxPartitions() != other.getMaxPartitions()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -389,35 +385,35 @@ public com.google.spanner.v1.PartitionOptions buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -587,7 +583,7 @@ public Builder clearMaxPartitions() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionQueryRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionQueryRequest.java index a48d4cd868c0..1c17f0ae9867 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionQueryRequest.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionQueryRequest.java @@ -97,7 +97,7 @@ private PartitionQueryRequest( } case 42: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { paramTypes_ = com.google.protobuf.MapField.newMapField( ParamTypesDefaultEntryHolder.defaultEntry); @@ -129,7 +129,7 @@ private PartitionQueryRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -639,24 +639,23 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.v1.PartitionQueryRequest other = (com.google.spanner.v1.PartitionQueryRequest) obj; - boolean result = true; - result = result && getSession().equals(other.getSession()); - result = result && (hasTransaction() == other.hasTransaction()); + if (!getSession().equals(other.getSession())) return false; + if (hasTransaction() != other.hasTransaction()) return false; if (hasTransaction()) { - result = result && getTransaction().equals(other.getTransaction()); + if (!getTransaction().equals(other.getTransaction())) return false; } - result = result && getSql().equals(other.getSql()); - result = result && (hasParams() == other.hasParams()); + if (!getSql().equals(other.getSql())) return false; + if (hasParams() != other.hasParams()) return false; if (hasParams()) { - result = result && getParams().equals(other.getParams()); + if (!getParams().equals(other.getParams())) return false; } - result = result && internalGetParamTypes().equals(other.internalGetParamTypes()); - result = result && (hasPartitionOptions() == other.hasPartitionOptions()); + if (!internalGetParamTypes().equals(other.internalGetParamTypes())) return false; + if (hasPartitionOptions() != other.hasPartitionOptions()) return false; if (hasPartitionOptions()) { - result = result && getPartitionOptions().equals(other.getPartitionOptions()); + if (!getPartitionOptions().equals(other.getPartitionOptions())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -929,35 +928,35 @@ public com.google.spanner.v1.PartitionQueryRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1115,7 +1114,7 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.spanner.v1.TransactionSelector transaction_ = null; + private com.google.spanner.v1.TransactionSelector transaction_; private com.google.protobuf.SingleFieldBuilderV3< com.google.spanner.v1.TransactionSelector, com.google.spanner.v1.TransactionSelector.Builder, @@ -1445,7 +1444,7 @@ public Builder setSqlBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.Struct params_ = null; + private com.google.protobuf.Struct params_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Struct, com.google.protobuf.Struct.Builder, @@ -1916,7 +1915,7 @@ public Builder putAllParamTypes( return this; } - private com.google.spanner.v1.PartitionOptions partitionOptions_ = null; + private com.google.spanner.v1.PartitionOptions partitionOptions_; private com.google.protobuf.SingleFieldBuilderV3< com.google.spanner.v1.PartitionOptions, com.google.spanner.v1.PartitionOptions.Builder, @@ -2100,7 +2099,7 @@ public com.google.spanner.v1.PartitionOptionsOrBuilder getPartitionOptionsOrBuil @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionReadRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionReadRequest.java index 138ae9a4fe5a..3d237e943cef 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionReadRequest.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionReadRequest.java @@ -93,7 +93,7 @@ private PartitionReadRequest( case 42: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { columns_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000010; } @@ -132,7 +132,7 @@ private PartitionReadRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -144,7 +144,7 @@ private PartitionReadRequest( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (((mutable_bitField0_ & 0x00000010) != 0)) { columns_ = columns_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -596,25 +596,24 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.v1.PartitionReadRequest other = (com.google.spanner.v1.PartitionReadRequest) obj; - boolean result = true; - result = result && getSession().equals(other.getSession()); - result = result && (hasTransaction() == other.hasTransaction()); + if (!getSession().equals(other.getSession())) return false; + if (hasTransaction() != other.hasTransaction()) return false; if (hasTransaction()) { - result = result && getTransaction().equals(other.getTransaction()); + if (!getTransaction().equals(other.getTransaction())) return false; } - result = result && getTable().equals(other.getTable()); - result = result && getIndex().equals(other.getIndex()); - result = result && getColumnsList().equals(other.getColumnsList()); - result = result && (hasKeySet() == other.hasKeySet()); + if (!getTable().equals(other.getTable())) return false; + if (!getIndex().equals(other.getIndex())) return false; + if (!getColumnsList().equals(other.getColumnsList())) return false; + if (hasKeySet() != other.hasKeySet()) return false; if (hasKeySet()) { - result = result && getKeySet().equals(other.getKeySet()); + if (!getKeySet().equals(other.getKeySet())) return false; } - result = result && (hasPartitionOptions() == other.hasPartitionOptions()); + if (hasPartitionOptions() != other.hasPartitionOptions()) return false; if (hasPartitionOptions()) { - result = result && getPartitionOptions().equals(other.getPartitionOptions()); + if (!getPartitionOptions().equals(other.getPartitionOptions())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -854,7 +853,7 @@ public com.google.spanner.v1.PartitionReadRequest buildPartial() { } result.table_ = table_; result.index_ = index_; - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000010) != 0)) { columns_ = columns_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000010); } @@ -876,35 +875,35 @@ public com.google.spanner.v1.PartitionReadRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1075,7 +1074,7 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.spanner.v1.TransactionSelector transaction_ = null; + private com.google.spanner.v1.TransactionSelector transaction_; private com.google.protobuf.SingleFieldBuilderV3< com.google.spanner.v1.TransactionSelector, com.google.spanner.v1.TransactionSelector.Builder, @@ -1483,7 +1482,7 @@ public Builder setIndexBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureColumnsIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { + if (!((bitField0_ & 0x00000010) != 0)) { columns_ = new com.google.protobuf.LazyStringArrayList(columns_); bitField0_ |= 0x00000010; } @@ -1631,7 +1630,7 @@ public Builder addColumnsBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.spanner.v1.KeySet keySet_ = null; + private com.google.spanner.v1.KeySet keySet_; private com.google.protobuf.SingleFieldBuilderV3< com.google.spanner.v1.KeySet, com.google.spanner.v1.KeySet.Builder, @@ -1878,7 +1877,7 @@ public com.google.spanner.v1.KeySetOrBuilder getKeySetOrBuilder() { return keySetBuilder_; } - private com.google.spanner.v1.PartitionOptions partitionOptions_ = null; + private com.google.spanner.v1.PartitionOptions partitionOptions_; private com.google.protobuf.SingleFieldBuilderV3< com.google.spanner.v1.PartitionOptions, com.google.spanner.v1.PartitionOptions.Builder, @@ -2062,7 +2061,7 @@ public com.google.spanner.v1.PartitionOptionsOrBuilder getPartitionOptionsOrBuil @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionResponse.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionResponse.java index 9d794b7f8866..fdea4ca390be 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionResponse.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PartitionResponse.java @@ -53,7 +53,7 @@ private PartitionResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { partitions_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -78,7 +78,7 @@ private PartitionResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -90,7 +90,7 @@ private PartitionResponse( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { partitions_ = java.util.Collections.unmodifiableList(partitions_); } this.unknownFields = unknownFields.build(); @@ -269,14 +269,13 @@ public boolean equals(final java.lang.Object obj) { } com.google.spanner.v1.PartitionResponse other = (com.google.spanner.v1.PartitionResponse) obj; - boolean result = true; - result = result && getPartitionsList().equals(other.getPartitionsList()); - result = result && (hasTransaction() == other.hasTransaction()); + if (!getPartitionsList().equals(other.getPartitionsList())) return false; + if (hasTransaction() != other.hasTransaction()) return false; if (hasTransaction()) { - result = result && getTransaction().equals(other.getTransaction()); + if (!getTransaction().equals(other.getTransaction())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -484,7 +483,7 @@ public com.google.spanner.v1.PartitionResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (partitionsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { partitions_ = java.util.Collections.unmodifiableList(partitions_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -504,35 +503,35 @@ public com.google.spanner.v1.PartitionResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -612,7 +611,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensurePartitionsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { partitions_ = new java.util.ArrayList(partitions_); bitField0_ |= 0x00000001; } @@ -950,16 +949,13 @@ public java.util.List getPartitionsBuil com.google.spanner.v1.Partition, com.google.spanner.v1.Partition.Builder, com.google.spanner.v1.PartitionOrBuilder>( - partitions_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + partitions_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); partitions_ = null; } return partitionsBuilder_; } - private com.google.spanner.v1.Transaction transaction_ = null; + private com.google.spanner.v1.Transaction transaction_; private com.google.protobuf.SingleFieldBuilderV3< com.google.spanner.v1.Transaction, com.google.spanner.v1.Transaction.Builder, @@ -1142,7 +1138,7 @@ public com.google.spanner.v1.TransactionOrBuilder getTransactionOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PlanNode.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PlanNode.java index f7f3bc778644..653d1d0b7233 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PlanNode.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/PlanNode.java @@ -24,7 +24,6 @@ private PlanNode(com.google.protobuf.GeneratedMessageV3.Builder builder) { } private PlanNode() { - index_ = 0; kind_ = 0; displayName_ = ""; childLinks_ = java.util.Collections.emptyList(); @@ -75,7 +74,7 @@ private PlanNode( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { childLinks_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; } @@ -132,7 +131,7 @@ private PlanNode( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -144,7 +143,7 @@ private PlanNode( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { childLinks_ = java.util.Collections.unmodifiableList(childLinks_); } this.unknownFields = unknownFields.build(); @@ -421,7 +420,6 @@ private ChildLink(com.google.protobuf.GeneratedMessageV3.Builder builder) { } private ChildLink() { - childIndex_ = 0; type_ = ""; variable_ = ""; } @@ -471,7 +469,7 @@ private ChildLink( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -681,12 +679,11 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.v1.PlanNode.ChildLink other = (com.google.spanner.v1.PlanNode.ChildLink) obj; - boolean result = true; - result = result && (getChildIndex() == other.getChildIndex()); - result = result && getType().equals(other.getType()); - result = result && getVariable().equals(other.getVariable()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getChildIndex() != other.getChildIndex()) return false; + if (!getType().equals(other.getType())) return false; + if (!getVariable().equals(other.getVariable())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -892,23 +889,23 @@ public com.google.spanner.v1.PlanNode.ChildLink buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -916,13 +913,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1262,7 +1259,7 @@ public Builder setVariableBytes(com.google.protobuf.ByteString value) { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1468,7 +1465,7 @@ private ShortRepresentation( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { subqueries_ = com.google.protobuf.MapField.newMapField( SubqueriesDefaultEntryHolder.defaultEntry); @@ -1483,7 +1480,7 @@ private ShortRepresentation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -1738,11 +1735,10 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.v1.PlanNode.ShortRepresentation other = (com.google.spanner.v1.PlanNode.ShortRepresentation) obj; - boolean result = true; - result = result && getDescription().equals(other.getDescription()); - result = result && internalGetSubqueries().equals(other.internalGetSubqueries()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDescription().equals(other.getDescription())) return false; + if (!internalGetSubqueries().equals(other.internalGetSubqueries())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1968,23 +1964,23 @@ public com.google.spanner.v1.PlanNode.ShortRepresentation buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -1992,13 +1988,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -2328,7 +2324,7 @@ public Builder putAllSubqueries(java.util.Map(childLinks_); bitField0_ |= 0x00000008; @@ -3759,16 +3754,13 @@ public com.google.spanner.v1.PlanNode.ChildLink.Builder addChildLinksBuilder(int com.google.spanner.v1.PlanNode.ChildLink, com.google.spanner.v1.PlanNode.ChildLink.Builder, com.google.spanner.v1.PlanNode.ChildLinkOrBuilder>( - childLinks_, - ((bitField0_ & 0x00000008) == 0x00000008), - getParentForChildren(), - isClean()); + childLinks_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); childLinks_ = null; } return childLinksBuilder_; } - private com.google.spanner.v1.PlanNode.ShortRepresentation shortRepresentation_ = null; + private com.google.spanner.v1.PlanNode.ShortRepresentation shortRepresentation_; private com.google.protobuf.SingleFieldBuilderV3< com.google.spanner.v1.PlanNode.ShortRepresentation, com.google.spanner.v1.PlanNode.ShortRepresentation.Builder, @@ -3963,7 +3955,7 @@ public Builder clearShortRepresentation() { return shortRepresentationBuilder_; } - private com.google.protobuf.Struct metadata_ = null; + private com.google.protobuf.Struct metadata_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Struct, com.google.protobuf.Struct.Builder, @@ -4192,7 +4184,7 @@ public com.google.protobuf.StructOrBuilder getMetadataOrBuilder() { return metadataBuilder_; } - private com.google.protobuf.Struct executionStats_ = null; + private com.google.protobuf.Struct executionStats_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Struct, com.google.protobuf.Struct.Builder, @@ -4402,7 +4394,7 @@ public com.google.protobuf.StructOrBuilder getExecutionStatsOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlan.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlan.java index 37b85ca89aaf..a095939a8bcf 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlan.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/QueryPlan.java @@ -52,7 +52,7 @@ private QueryPlan( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { planNodes_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -62,7 +62,7 @@ private QueryPlan( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -74,7 +74,7 @@ private QueryPlan( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { planNodes_ = java.util.Collections.unmodifiableList(planNodes_); } this.unknownFields = unknownFields.build(); @@ -214,10 +214,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.spanner.v1.QueryPlan other = (com.google.spanner.v1.QueryPlan) obj; - boolean result = true; - result = result && getPlanNodesList().equals(other.getPlanNodesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getPlanNodesList().equals(other.getPlanNodesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -410,7 +409,7 @@ public com.google.spanner.v1.QueryPlan buildPartial() { com.google.spanner.v1.QueryPlan result = new com.google.spanner.v1.QueryPlan(this); int from_bitField0_ = bitField0_; if (planNodesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { planNodes_ = java.util.Collections.unmodifiableList(planNodes_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -424,35 +423,35 @@ public com.google.spanner.v1.QueryPlan buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -529,7 +528,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensurePlanNodesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { planNodes_ = new java.util.ArrayList(planNodes_); bitField0_ |= 0x00000001; } @@ -901,10 +900,7 @@ public java.util.List getPlanNodesBuilde com.google.spanner.v1.PlanNode, com.google.spanner.v1.PlanNode.Builder, com.google.spanner.v1.PlanNodeOrBuilder>( - planNodes_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + planNodes_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); planNodes_ = null; } return planNodesBuilder_; @@ -912,7 +908,7 @@ public java.util.List getPlanNodesBuilde @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ReadRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ReadRequest.java index 5810ca5714ee..63f41e257b38 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ReadRequest.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ReadRequest.java @@ -28,7 +28,6 @@ private ReadRequest() { table_ = ""; index_ = ""; columns_ = com.google.protobuf.LazyStringArrayList.EMPTY; - limit_ = 0L; resumeToken_ = com.google.protobuf.ByteString.EMPTY; partitionToken_ = com.google.protobuf.ByteString.EMPTY; } @@ -97,7 +96,7 @@ private ReadRequest( case 42: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { columns_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000010; } @@ -135,7 +134,7 @@ private ReadRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -147,7 +146,7 @@ private ReadRequest( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (((mutable_bitField0_ & 0x00000010) != 0)) { columns_ = columns_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -639,24 +638,23 @@ public boolean equals(final java.lang.Object obj) { } com.google.spanner.v1.ReadRequest other = (com.google.spanner.v1.ReadRequest) obj; - boolean result = true; - result = result && getSession().equals(other.getSession()); - result = result && (hasTransaction() == other.hasTransaction()); + if (!getSession().equals(other.getSession())) return false; + if (hasTransaction() != other.hasTransaction()) return false; if (hasTransaction()) { - result = result && getTransaction().equals(other.getTransaction()); + if (!getTransaction().equals(other.getTransaction())) return false; } - result = result && getTable().equals(other.getTable()); - result = result && getIndex().equals(other.getIndex()); - result = result && getColumnsList().equals(other.getColumnsList()); - result = result && (hasKeySet() == other.hasKeySet()); + if (!getTable().equals(other.getTable())) return false; + if (!getIndex().equals(other.getIndex())) return false; + if (!getColumnsList().equals(other.getColumnsList())) return false; + if (hasKeySet() != other.hasKeySet()) return false; if (hasKeySet()) { - result = result && getKeySet().equals(other.getKeySet()); + if (!getKeySet().equals(other.getKeySet())) return false; } - result = result && (getLimit() == other.getLimit()); - result = result && getResumeToken().equals(other.getResumeToken()); - result = result && getPartitionToken().equals(other.getPartitionToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getLimit() != other.getLimit()) return false; + if (!getResumeToken().equals(other.getResumeToken())) return false; + if (!getPartitionToken().equals(other.getPartitionToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -897,7 +895,7 @@ public com.google.spanner.v1.ReadRequest buildPartial() { } result.table_ = table_; result.index_ = index_; - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000010) != 0)) { columns_ = columns_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000010); } @@ -917,35 +915,35 @@ public com.google.spanner.v1.ReadRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1122,7 +1120,7 @@ public Builder setSessionBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.spanner.v1.TransactionSelector transaction_ = null; + private com.google.spanner.v1.TransactionSelector transaction_; private com.google.protobuf.SingleFieldBuilderV3< com.google.spanner.v1.TransactionSelector, com.google.spanner.v1.TransactionSelector.Builder, @@ -1530,7 +1528,7 @@ public Builder setIndexBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureColumnsIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { + if (!((bitField0_ & 0x00000010) != 0)) { columns_ = new com.google.protobuf.LazyStringArrayList(columns_); bitField0_ |= 0x00000010; } @@ -1678,7 +1676,7 @@ public Builder addColumnsBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.spanner.v1.KeySet keySet_ = null; + private com.google.spanner.v1.KeySet keySet_; private com.google.protobuf.SingleFieldBuilderV3< com.google.spanner.v1.KeySet, com.google.spanner.v1.KeySet.Builder, @@ -2140,7 +2138,7 @@ public Builder clearPartitionToken() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSet.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSet.java index 2b24e26e2710..3a87d49cf9fe 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSet.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSet.java @@ -69,7 +69,7 @@ private ResultSet( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { rows_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -95,7 +95,7 @@ private ResultSet( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -107,7 +107,7 @@ private ResultSet( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { rows_ = java.util.Collections.unmodifiableList(rows_); } this.unknownFields = unknownFields.build(); @@ -373,18 +373,17 @@ public boolean equals(final java.lang.Object obj) { } com.google.spanner.v1.ResultSet other = (com.google.spanner.v1.ResultSet) obj; - boolean result = true; - result = result && (hasMetadata() == other.hasMetadata()); + if (hasMetadata() != other.hasMetadata()) return false; if (hasMetadata()) { - result = result && getMetadata().equals(other.getMetadata()); + if (!getMetadata().equals(other.getMetadata())) return false; } - result = result && getRowsList().equals(other.getRowsList()); - result = result && (hasStats() == other.hasStats()); + if (!getRowsList().equals(other.getRowsList())) return false; + if (hasStats() != other.hasStats()) return false; if (hasStats()) { - result = result && getStats().equals(other.getStats()); + if (!getStats().equals(other.getStats())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -604,7 +603,7 @@ public com.google.spanner.v1.ResultSet buildPartial() { result.metadata_ = metadataBuilder_.build(); } if (rowsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { rows_ = java.util.Collections.unmodifiableList(rows_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -624,35 +623,35 @@ public com.google.spanner.v1.ResultSet buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -731,7 +730,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.spanner.v1.ResultSetMetadata metadata_ = null; + private com.google.spanner.v1.ResultSetMetadata metadata_; private com.google.protobuf.SingleFieldBuilderV3< com.google.spanner.v1.ResultSetMetadata, com.google.spanner.v1.ResultSetMetadata.Builder, @@ -915,7 +914,7 @@ public com.google.spanner.v1.ResultSetMetadataOrBuilder getMetadataOrBuilder() { private java.util.List rows_ = java.util.Collections.emptyList(); private void ensureRowsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { rows_ = new java.util.ArrayList(rows_); bitField0_ |= 0x00000002; } @@ -1320,16 +1319,13 @@ public java.util.List getRowsBuilderList( com.google.protobuf.ListValue, com.google.protobuf.ListValue.Builder, com.google.protobuf.ListValueOrBuilder>( - rows_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + rows_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); rows_ = null; } return rowsBuilder_; } - private com.google.spanner.v1.ResultSetStats stats_ = null; + private com.google.spanner.v1.ResultSetStats stats_; private com.google.protobuf.SingleFieldBuilderV3< com.google.spanner.v1.ResultSetStats, com.google.spanner.v1.ResultSetStats.Builder, @@ -1580,7 +1576,7 @@ public com.google.spanner.v1.ResultSetStatsOrBuilder getStatsOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetMetadata.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetMetadata.java index dad9a92d2122..2e65cbd7cfbf 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetMetadata.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetMetadata.java @@ -81,7 +81,7 @@ private ResultSetMetadata( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -264,17 +264,16 @@ public boolean equals(final java.lang.Object obj) { } com.google.spanner.v1.ResultSetMetadata other = (com.google.spanner.v1.ResultSetMetadata) obj; - boolean result = true; - result = result && (hasRowType() == other.hasRowType()); + if (hasRowType() != other.hasRowType()) return false; if (hasRowType()) { - result = result && getRowType().equals(other.getRowType()); + if (!getRowType().equals(other.getRowType())) return false; } - result = result && (hasTransaction() == other.hasTransaction()); + if (hasTransaction() != other.hasTransaction()) return false; if (hasTransaction()) { - result = result && getTransaction().equals(other.getTransaction()); + if (!getTransaction().equals(other.getTransaction())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -493,35 +492,35 @@ public com.google.spanner.v1.ResultSetMetadata buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -571,7 +570,7 @@ public Builder mergeFrom( return this; } - private com.google.spanner.v1.StructType rowType_ = null; + private com.google.spanner.v1.StructType rowType_; private com.google.protobuf.SingleFieldBuilderV3< com.google.spanner.v1.StructType, com.google.spanner.v1.StructType.Builder, @@ -800,7 +799,7 @@ public com.google.spanner.v1.StructTypeOrBuilder getRowTypeOrBuilder() { return rowTypeBuilder_; } - private com.google.spanner.v1.Transaction transaction_ = null; + private com.google.spanner.v1.Transaction transaction_; private com.google.protobuf.SingleFieldBuilderV3< com.google.spanner.v1.Transaction, com.google.spanner.v1.Transaction.Builder, @@ -992,7 +991,7 @@ public com.google.spanner.v1.TransactionOrBuilder getTransactionOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetStats.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetStats.java index d68915ed3b10..feb212c191be 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetStats.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/ResultSetStats.java @@ -93,7 +93,7 @@ private ResultSetStats( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -368,29 +368,27 @@ public boolean equals(final java.lang.Object obj) { } com.google.spanner.v1.ResultSetStats other = (com.google.spanner.v1.ResultSetStats) obj; - boolean result = true; - result = result && (hasQueryPlan() == other.hasQueryPlan()); + if (hasQueryPlan() != other.hasQueryPlan()) return false; if (hasQueryPlan()) { - result = result && getQueryPlan().equals(other.getQueryPlan()); + if (!getQueryPlan().equals(other.getQueryPlan())) return false; } - result = result && (hasQueryStats() == other.hasQueryStats()); + if (hasQueryStats() != other.hasQueryStats()) return false; if (hasQueryStats()) { - result = result && getQueryStats().equals(other.getQueryStats()); + if (!getQueryStats().equals(other.getQueryStats())) return false; } - result = result && getRowCountCase().equals(other.getRowCountCase()); - if (!result) return false; + if (!getRowCountCase().equals(other.getRowCountCase())) return false; switch (rowCountCase_) { case 3: - result = result && (getRowCountExact() == other.getRowCountExact()); + if (getRowCountExact() != other.getRowCountExact()) return false; break; case 4: - result = result && (getRowCountLowerBound() == other.getRowCountLowerBound()); + if (getRowCountLowerBound() != other.getRowCountLowerBound()) return false; break; case 0: default: } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -628,35 +626,35 @@ public com.google.spanner.v1.ResultSetStats buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -736,7 +734,7 @@ public Builder clearRowCount() { return this; } - private com.google.spanner.v1.QueryPlan queryPlan_ = null; + private com.google.spanner.v1.QueryPlan queryPlan_; private com.google.protobuf.SingleFieldBuilderV3< com.google.spanner.v1.QueryPlan, com.google.spanner.v1.QueryPlan.Builder, @@ -926,7 +924,7 @@ public com.google.spanner.v1.QueryPlanOrBuilder getQueryPlanOrBuilder() { return queryPlanBuilder_; } - private com.google.protobuf.Struct queryStats_ = null; + private com.google.protobuf.Struct queryStats_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Struct, com.google.protobuf.Struct.Builder, @@ -1265,7 +1263,7 @@ public Builder clearRowCountLowerBound() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RollbackRequest.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RollbackRequest.java index 762e85397107..df81180aa33d 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RollbackRequest.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/RollbackRequest.java @@ -65,7 +65,7 @@ private RollbackRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -205,11 +205,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.spanner.v1.RollbackRequest other = (com.google.spanner.v1.RollbackRequest) obj; - boolean result = true; - result = result && getSession().equals(other.getSession()); - result = result && getTransactionId().equals(other.getTransactionId()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSession().equals(other.getSession())) return false; + if (!getTransactionId().equals(other.getTransactionId())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -406,35 +405,35 @@ public com.google.spanner.v1.RollbackRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -628,7 +627,7 @@ public Builder clearTransactionId() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Session.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Session.java index e36a11ab0217..ae9b2ee6f0dc 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Session.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Session.java @@ -59,7 +59,7 @@ private Session( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry); mutable_bitField0_ |= 0x00000002; @@ -102,7 +102,7 @@ private Session( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -458,19 +458,18 @@ public boolean equals(final java.lang.Object obj) { } com.google.spanner.v1.Session other = (com.google.spanner.v1.Session) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && internalGetLabels().equals(other.internalGetLabels()); - result = result && (hasCreateTime() == other.hasCreateTime()); + if (!getName().equals(other.getName())) return false; + if (!internalGetLabels().equals(other.internalGetLabels())) return false; + if (hasCreateTime() != other.hasCreateTime()) return false; if (hasCreateTime()) { - result = result && getCreateTime().equals(other.getCreateTime()); + if (!getCreateTime().equals(other.getCreateTime())) return false; } - result = result && (hasApproximateLastUseTime() == other.hasApproximateLastUseTime()); + if (hasApproximateLastUseTime() != other.hasApproximateLastUseTime()) return false; if (hasApproximateLastUseTime()) { - result = result && getApproximateLastUseTime().equals(other.getApproximateLastUseTime()); + if (!getApproximateLastUseTime().equals(other.getApproximateLastUseTime())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -720,35 +719,35 @@ public com.google.spanner.v1.Session buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1098,7 +1097,7 @@ public Builder putAllLabels(java.util.Map va return this; } - private com.google.protobuf.Timestamp createTime_ = null; + private com.google.protobuf.Timestamp createTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1277,7 +1276,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { return createTimeBuilder_; } - private com.google.protobuf.Timestamp approximateLastUseTime_ = null; + private com.google.protobuf.Timestamp approximateLastUseTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1470,7 +1469,7 @@ public com.google.protobuf.TimestampOrBuilder getApproximateLastUseTimeOrBuilder @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/StructType.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/StructType.java index 27288fddb5fe..3fb6e052cfda 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/StructType.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/StructType.java @@ -53,7 +53,7 @@ private StructType( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { fields_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -64,7 +64,7 @@ private StructType( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -76,7 +76,7 @@ private StructType( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { fields_ = java.util.Collections.unmodifiableList(fields_); } this.unknownFields = unknownFields.build(); @@ -236,7 +236,7 @@ private Field( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -412,14 +412,13 @@ public boolean equals(final java.lang.Object obj) { } com.google.spanner.v1.StructType.Field other = (com.google.spanner.v1.StructType.Field) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (hasType() == other.hasType()); + if (!getName().equals(other.getName())) return false; + if (hasType() != other.hasType()) return false; if (hasType()) { - result = result && getType().equals(other.getType()); + if (!getType().equals(other.getType())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -629,23 +628,23 @@ public com.google.spanner.v1.StructType.Field buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -653,13 +652,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -834,7 +833,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.spanner.v1.Type type_ = null; + private com.google.spanner.v1.Type type_; private com.google.protobuf.SingleFieldBuilderV3< com.google.spanner.v1.Type, com.google.spanner.v1.Type.Builder, @@ -1011,7 +1010,7 @@ public com.google.spanner.v1.TypeOrBuilder getTypeOrBuilder() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1193,10 +1192,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.spanner.v1.StructType other = (com.google.spanner.v1.StructType) obj; - boolean result = true; - result = result && getFieldsList().equals(other.getFieldsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getFieldsList().equals(other.getFieldsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1391,7 +1389,7 @@ public com.google.spanner.v1.StructType buildPartial() { com.google.spanner.v1.StructType result = new com.google.spanner.v1.StructType(this); int from_bitField0_ = bitField0_; if (fieldsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { fields_ = java.util.Collections.unmodifiableList(fields_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -1405,35 +1403,35 @@ public com.google.spanner.v1.StructType buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1510,7 +1508,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureFieldsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { fields_ = new java.util.ArrayList(fields_); bitField0_ |= 0x00000001; } @@ -1938,10 +1936,7 @@ public java.util.List getFieldsB com.google.spanner.v1.StructType.Field, com.google.spanner.v1.StructType.Field.Builder, com.google.spanner.v1.StructType.FieldOrBuilder>( - fields_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + fields_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); fields_ = null; } return fieldsBuilder_; @@ -1949,7 +1944,7 @@ public java.util.List getFieldsB @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Transaction.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Transaction.java index 6da11c03622f..f69670659009 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Transaction.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Transaction.java @@ -72,7 +72,7 @@ private Transaction( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -228,14 +228,13 @@ public boolean equals(final java.lang.Object obj) { } com.google.spanner.v1.Transaction other = (com.google.spanner.v1.Transaction) obj; - boolean result = true; - result = result && getId().equals(other.getId()); - result = result && (hasReadTimestamp() == other.hasReadTimestamp()); + if (!getId().equals(other.getId())) return false; + if (hasReadTimestamp() != other.hasReadTimestamp()) return false; if (hasReadTimestamp()) { - result = result && getReadTimestamp().equals(other.getReadTimestamp()); + if (!getReadTimestamp().equals(other.getReadTimestamp())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -441,35 +440,35 @@ public com.google.spanner.v1.Transaction buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -584,7 +583,7 @@ public Builder clearId() { return this; } - private com.google.protobuf.Timestamp readTimestamp_ = null; + private com.google.protobuf.Timestamp readTimestamp_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -803,7 +802,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimestampOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionOptions.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionOptions.java index 2261ce7b867a..a3dd01ccfe9f 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionOptions.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionOptions.java @@ -324,7 +324,7 @@ private TransactionOptions( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -407,7 +407,7 @@ private ReadWrite( break; default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -478,9 +478,8 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.v1.TransactionOptions.ReadWrite other = (com.google.spanner.v1.TransactionOptions.ReadWrite) obj; - boolean result = true; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -671,23 +670,23 @@ public com.google.spanner.v1.TransactionOptions.ReadWrite buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -695,13 +694,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -750,7 +749,7 @@ public Builder mergeFrom( @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -849,7 +848,7 @@ private PartitionedDml( break; default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -920,9 +919,8 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.v1.TransactionOptions.PartitionedDml other = (com.google.spanner.v1.TransactionOptions.PartitionedDml) obj; - boolean result = true; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1113,23 +1111,23 @@ public com.google.spanner.v1.TransactionOptions.PartitionedDml buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -1137,13 +1135,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1192,7 +1190,7 @@ public Builder mergeFrom( @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1516,9 +1514,7 @@ private ReadOnly(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private ReadOnly() { - returnReadTimestamp_ = false; - } + private ReadOnly() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -1617,7 +1613,7 @@ private ReadOnly( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -2093,31 +2089,29 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.v1.TransactionOptions.ReadOnly other = (com.google.spanner.v1.TransactionOptions.ReadOnly) obj; - boolean result = true; - result = result && (getReturnReadTimestamp() == other.getReturnReadTimestamp()); - result = result && getTimestampBoundCase().equals(other.getTimestampBoundCase()); - if (!result) return false; + if (getReturnReadTimestamp() != other.getReturnReadTimestamp()) return false; + if (!getTimestampBoundCase().equals(other.getTimestampBoundCase())) return false; switch (timestampBoundCase_) { case 1: - result = result && (getStrong() == other.getStrong()); + if (getStrong() != other.getStrong()) return false; break; case 2: - result = result && getMinReadTimestamp().equals(other.getMinReadTimestamp()); + if (!getMinReadTimestamp().equals(other.getMinReadTimestamp())) return false; break; case 3: - result = result && getMaxStaleness().equals(other.getMaxStaleness()); + if (!getMaxStaleness().equals(other.getMaxStaleness())) return false; break; case 4: - result = result && getReadTimestamp().equals(other.getReadTimestamp()); + if (!getReadTimestamp().equals(other.getReadTimestamp())) return false; break; case 5: - result = result && getExactStaleness().equals(other.getExactStaleness()); + if (!getExactStaleness().equals(other.getExactStaleness())) return false; break; case 0: default: } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -2370,23 +2364,23 @@ public com.google.spanner.v1.TransactionOptions.ReadOnly buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -2394,13 +2388,13 @@ public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -3699,7 +3693,7 @@ public Builder clearReturnReadTimestamp() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -4013,24 +4007,22 @@ public boolean equals(final java.lang.Object obj) { } com.google.spanner.v1.TransactionOptions other = (com.google.spanner.v1.TransactionOptions) obj; - boolean result = true; - result = result && getModeCase().equals(other.getModeCase()); - if (!result) return false; + if (!getModeCase().equals(other.getModeCase())) return false; switch (modeCase_) { case 1: - result = result && getReadWrite().equals(other.getReadWrite()); + if (!getReadWrite().equals(other.getReadWrite())) return false; break; case 3: - result = result && getPartitionedDml().equals(other.getPartitionedDml()); + if (!getPartitionedDml().equals(other.getPartitionedDml())) return false; break; case 2: - result = result && getReadOnly().equals(other.getReadOnly()); + if (!getReadOnly().equals(other.getReadOnly())) return false; break; case 0: default: } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -4477,35 +4469,35 @@ public com.google.spanner.v1.TransactionOptions buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -5278,7 +5270,7 @@ public com.google.spanner.v1.TransactionOptions.ReadOnlyOrBuilder getReadOnlyOrB @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionSelector.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionSelector.java index 32af17db0702..ab385584cc1d 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionSelector.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/TransactionSelector.java @@ -92,7 +92,7 @@ private TransactionSelector( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -350,24 +350,22 @@ public boolean equals(final java.lang.Object obj) { com.google.spanner.v1.TransactionSelector other = (com.google.spanner.v1.TransactionSelector) obj; - boolean result = true; - result = result && getSelectorCase().equals(other.getSelectorCase()); - if (!result) return false; + if (!getSelectorCase().equals(other.getSelectorCase())) return false; switch (selectorCase_) { case 1: - result = result && getSingleUse().equals(other.getSingleUse()); + if (!getSingleUse().equals(other.getSingleUse())) return false; break; case 2: - result = result && getId().equals(other.getId()); + if (!getId().equals(other.getId())) return false; break; case 3: - result = result && getBegin().equals(other.getBegin()); + if (!getBegin().equals(other.getBegin())) return false; break; case 0: default: } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -595,35 +593,35 @@ public com.google.spanner.v1.TransactionSelector buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1202,7 +1200,7 @@ public com.google.spanner.v1.TransactionOptionsOrBuilder getBeginOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Type.java b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Type.java index 48340185acc2..d4c944b815fa 100644 --- a/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Type.java +++ b/google-api-grpc/proto-google-cloud-spanner-v1/src/main/java/com/google/spanner/v1/Type.java @@ -90,7 +90,7 @@ private Type( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -298,18 +298,17 @@ public boolean equals(final java.lang.Object obj) { } com.google.spanner.v1.Type other = (com.google.spanner.v1.Type) obj; - boolean result = true; - result = result && code_ == other.code_; - result = result && (hasArrayElementType() == other.hasArrayElementType()); + if (code_ != other.code_) return false; + if (hasArrayElementType() != other.hasArrayElementType()) return false; if (hasArrayElementType()) { - result = result && getArrayElementType().equals(other.getArrayElementType()); + if (!getArrayElementType().equals(other.getArrayElementType())) return false; } - result = result && (hasStructType() == other.hasStructType()); + if (hasStructType() != other.hasStructType()) return false; if (hasStructType()) { - result = result && getStructType().equals(other.getStructType()); + if (!getStructType().equals(other.getStructType())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -528,35 +527,35 @@ public com.google.spanner.v1.Type buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -684,7 +683,7 @@ public Builder clearCode() { return this; } - private com.google.spanner.v1.Type arrayElementType_ = null; + private com.google.spanner.v1.Type arrayElementType_; private com.google.protobuf.SingleFieldBuilderV3< com.google.spanner.v1.Type, com.google.spanner.v1.Type.Builder, @@ -883,7 +882,7 @@ public com.google.spanner.v1.TypeOrBuilder getArrayElementTypeOrBuilder() { return arrayElementTypeBuilder_; } - private com.google.spanner.v1.StructType structType_ = null; + private com.google.spanner.v1.StructType structType_; private com.google.protobuf.SingleFieldBuilderV3< com.google.spanner.v1.StructType, com.google.spanner.v1.StructType.Builder, @@ -1084,7 +1083,7 @@ public com.google.spanner.v1.StructTypeOrBuilder getStructTypeOrBuilder() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-cloud-clients/google-cloud-spanner/synth.metadata b/google-cloud-clients/google-cloud-spanner/synth.metadata index f0bc523f5b19..562c7c2b3190 100644 --- a/google-cloud-clients/google-cloud-spanner/synth.metadata +++ b/google-cloud-clients/google-cloud-spanner/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-03-28T07:55:17.523663Z", + "updateTime": "2019-03-29T07:55:57.058527Z", "sources": [ { "generator": { "name": "artman", - "version": "0.16.20", - "dockerImage": "googleapis/artman@sha256:e3c054a2fb85a12481c722af616c7fb6f1d02d862248385eecbec3e4240ebd1e" + "version": "0.16.21", + "dockerImage": "googleapis/artman@sha256:854131ec1af7b3a313253474c24748dc0acd217a58a0b74dbfb559f340a15d78" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "6a84b3267b0a95e922608b9891219075047eee29", - "internalRef": "240640999" + "sha": "37386f1ebcaed51bcb7d15d00124d22c38606e45", + "internalRef": "240841842" } } ],