From 136d70d1cf1905e05f870ac7e797595746315ee4 Mon Sep 17 00:00:00 2001 From: yoshi-automation Date: Fri, 29 Mar 2019 00:36:09 -0700 Subject: [PATCH] Regenerate bigtable client --- .../google/bigtable/admin/v2/AppProfile.java | 83 ++++---- .../admin/v2/CheckConsistencyRequest.java | 25 ++- .../admin/v2/CheckConsistencyResponse.java | 27 ++- .../com/google/bigtable/admin/v2/Cluster.java | 32 ++-- .../bigtable/admin/v2/ColumnFamily.java | 27 ++- .../admin/v2/CreateAppProfileRequest.java | 34 ++-- .../admin/v2/CreateClusterMetadata.java | 39 ++-- .../admin/v2/CreateClusterRequest.java | 31 ++- .../admin/v2/CreateInstanceMetadata.java | 39 ++-- .../admin/v2/CreateInstanceRequest.java | 35 ++-- .../v2/CreateTableFromSnapshotMetadata.java | 39 ++-- .../v2/CreateTableFromSnapshotRequest.java | 27 ++- .../bigtable/admin/v2/CreateTableRequest.java | 66 ++++--- .../admin/v2/DeleteAppProfileRequest.java | 26 ++- .../admin/v2/DeleteClusterRequest.java | 23 ++- .../admin/v2/DeleteInstanceRequest.java | 23 ++- .../admin/v2/DeleteSnapshotRequest.java | 23 ++- .../bigtable/admin/v2/DeleteTableRequest.java | 23 ++- .../admin/v2/DropRowRangeRequest.java | 30 ++- .../com/google/bigtable/admin/v2/GcRule.java | 104 +++++----- .../v2/GenerateConsistencyTokenRequest.java | 23 ++- .../v2/GenerateConsistencyTokenResponse.java | 23 ++- .../admin/v2/GetAppProfileRequest.java | 23 ++- .../bigtable/admin/v2/GetClusterRequest.java | 23 ++- .../bigtable/admin/v2/GetInstanceRequest.java | 23 ++- .../bigtable/admin/v2/GetSnapshotRequest.java | 23 ++- .../bigtable/admin/v2/GetTableRequest.java | 25 ++- .../google/bigtable/admin/v2/Instance.java | 33 ++-- .../admin/v2/ListAppProfilesRequest.java | 28 ++- .../admin/v2/ListAppProfilesResponse.java | 48 +++-- .../admin/v2/ListClustersRequest.java | 25 ++- .../admin/v2/ListClustersResponse.java | 48 +++-- .../admin/v2/ListInstancesRequest.java | 25 ++- .../admin/v2/ListInstancesResponse.java | 48 +++-- .../admin/v2/ListSnapshotsRequest.java | 28 ++- .../admin/v2/ListSnapshotsResponse.java | 38 ++-- .../bigtable/admin/v2/ListTablesRequest.java | 30 ++- .../bigtable/admin/v2/ListTablesResponse.java | 38 ++-- .../admin/v2/ModifyColumnFamiliesRequest.java | 67 ++++--- .../v2/PartialUpdateInstanceRequest.java | 33 ++-- .../google/bigtable/admin/v2/Snapshot.java | 48 +++-- .../admin/v2/SnapshotTableMetadata.java | 39 ++-- .../admin/v2/SnapshotTableRequest.java | 35 ++-- .../com/google/bigtable/admin/v2/Table.java | 56 +++--- .../admin/v2/UpdateAppProfileMetadata.java | 21 +- .../admin/v2/UpdateAppProfileRequest.java | 39 ++-- .../admin/v2/UpdateClusterMetadata.java | 39 ++-- .../admin/v2/UpdateInstanceMetadata.java | 39 ++-- .../java/com/google/bigtable/v2/Cell.java | 36 ++-- .../bigtable/v2/CheckAndMutateRowRequest.java | 57 +++--- .../v2/CheckAndMutateRowResponse.java | 27 ++- .../java/com/google/bigtable/v2/Column.java | 38 ++-- .../com/google/bigtable/v2/ColumnRange.java | 37 ++-- .../java/com/google/bigtable/v2/Family.java | 38 ++-- .../google/bigtable/v2/MutateRowRequest.java | 42 ++-- .../google/bigtable/v2/MutateRowResponse.java | 21 +- .../google/bigtable/v2/MutateRowsRequest.java | 78 ++++---- .../bigtable/v2/MutateRowsResponse.java | 69 +++---- .../java/com/google/bigtable/v2/Mutation.java | 137 +++++++------- .../v2/ReadModifyWriteRowRequest.java | 42 ++-- .../v2/ReadModifyWriteRowResponse.java | 27 ++- .../bigtable/v2/ReadModifyWriteRule.java | 32 ++-- .../google/bigtable/v2/ReadRowsRequest.java | 40 ++-- .../google/bigtable/v2/ReadRowsResponse.java | 100 +++++----- .../main/java/com/google/bigtable/v2/Row.java | 38 ++-- .../com/google/bigtable/v2/RowFilter.java | 179 ++++++++---------- .../java/com/google/bigtable/v2/RowRange.java | 35 ++-- .../java/com/google/bigtable/v2/RowSet.java | 52 +++-- .../bigtable/v2/SampleRowKeysRequest.java | 25 ++- .../bigtable/v2/SampleRowKeysResponse.java | 26 ++- .../google/bigtable/v2/TimestampRange.java | 30 ++- .../com/google/bigtable/v2/ValueRange.java | 35 ++-- .../google-cloud-bigtable/synth.metadata | 10 +- 73 files changed, 1395 insertions(+), 1580 deletions(-) diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfile.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfile.java index 3e9015752d60..95728aa69b7f 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfile.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/AppProfile.java @@ -120,7 +120,7 @@ private AppProfile( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -205,7 +205,7 @@ private MultiClusterRoutingUseAny( break; default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -276,9 +276,8 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny other = (com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny) obj; - boolean result = true; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -476,23 +475,23 @@ public com.google.bigtable.admin.v2.AppProfile.MultiClusterRoutingUseAny buildPa @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 @@ -500,13 +499,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 @@ -559,7 +558,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 @@ -673,7 +672,6 @@ private SingleClusterRouting(com.google.protobuf.GeneratedMessageV3.Builder b private SingleClusterRouting() { clusterId_ = ""; - allowTransactionalWrites_ = false; } @java.lang.Override @@ -714,7 +712,7 @@ private SingleClusterRouting( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -857,11 +855,10 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.AppProfile.SingleClusterRouting other = (com.google.bigtable.admin.v2.AppProfile.SingleClusterRouting) obj; - boolean result = true; - result = result && getClusterId().equals(other.getClusterId()); - result = result && (getAllowTransactionalWrites() == other.getAllowTransactionalWrites()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getClusterId().equals(other.getClusterId())) return false; + if (getAllowTransactionalWrites() != other.getAllowTransactionalWrites()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1065,23 +1062,23 @@ public com.google.bigtable.admin.v2.AppProfile.SingleClusterRouting 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 @@ -1089,13 +1086,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 @@ -1297,7 +1294,7 @@ public Builder clearAllowTransactionalWrites() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1711,25 +1708,23 @@ public boolean equals(final java.lang.Object obj) { } com.google.bigtable.admin.v2.AppProfile other = (com.google.bigtable.admin.v2.AppProfile) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getEtag().equals(other.getEtag()); - result = result && getDescription().equals(other.getDescription()); - result = result && getRoutingPolicyCase().equals(other.getRoutingPolicyCase()); - if (!result) return false; + if (!getName().equals(other.getName())) return false; + if (!getEtag().equals(other.getEtag())) return false; + if (!getDescription().equals(other.getDescription())) return false; + if (!getRoutingPolicyCase().equals(other.getRoutingPolicyCase())) return false; switch (routingPolicyCase_) { case 5: - result = - result && getMultiClusterRoutingUseAny().equals(other.getMultiClusterRoutingUseAny()); + if (!getMultiClusterRoutingUseAny().equals(other.getMultiClusterRoutingUseAny())) + return false; break; case 6: - result = result && getSingleClusterRouting().equals(other.getSingleClusterRouting()); + if (!getSingleClusterRouting().equals(other.getSingleClusterRouting())) 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 @@ -1962,35 +1957,35 @@ public com.google.bigtable.admin.v2.AppProfile 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 @@ -2856,7 +2851,7 @@ public Builder clearSingleClusterRouting() { @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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequest.java index 142a03f72b70..cac7924768e0 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequest.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyRequest.java @@ -68,7 +68,7 @@ private CheckConsistencyRequest( } 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.bigtable.admin.v2.CheckConsistencyRequest other = (com.google.bigtable.admin.v2.CheckConsistencyRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getConsistencyToken().equals(other.getConsistencyToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getConsistencyToken().equals(other.getConsistencyToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -444,35 +443,35 @@ public com.google.bigtable.admin.v2.CheckConsistencyRequest 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 setConsistencyTokenBytes(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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyResponse.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyResponse.java index 3eafe891d693..a5ff7912ffc1 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyResponse.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CheckConsistencyResponse.java @@ -23,9 +23,7 @@ private CheckConsistencyResponse(com.google.protobuf.GeneratedMessageV3.Builder< super(builder); } - private CheckConsistencyResponse() { - consistent_ = false; - } + private CheckConsistencyResponse() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -58,7 +56,7 @@ private CheckConsistencyResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -151,10 +149,9 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.CheckConsistencyResponse other = (com.google.bigtable.admin.v2.CheckConsistencyResponse) obj; - boolean result = true; - result = result && (getConsistent() == other.getConsistent()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getConsistent() != other.getConsistent()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -349,35 +346,35 @@ public com.google.bigtable.admin.v2.CheckConsistencyResponse 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 @@ -475,7 +472,7 @@ public Builder clearConsistent() { @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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Cluster.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Cluster.java index 0f62fe8120f8..5e92a59e7aa4 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Cluster.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Cluster.java @@ -28,7 +28,6 @@ private Cluster() { name_ = ""; location_ = ""; state_ = 0; - serveNodes_ = 0; defaultStorageType_ = 0; } @@ -91,7 +90,7 @@ private Cluster( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -576,14 +575,13 @@ public boolean equals(final java.lang.Object obj) { } com.google.bigtable.admin.v2.Cluster other = (com.google.bigtable.admin.v2.Cluster) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getLocation().equals(other.getLocation()); - result = result && state_ == other.state_; - result = result && (getServeNodes() == other.getServeNodes()); - result = result && defaultStorageType_ == other.defaultStorageType_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getLocation().equals(other.getLocation())) return false; + if (state_ != other.state_) return false; + if (getServeNodes() != other.getServeNodes()) return false; + if (defaultStorageType_ != other.defaultStorageType_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -796,35 +794,35 @@ public com.google.bigtable.admin.v2.Cluster 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 @@ -1319,7 +1317,7 @@ public Builder clearDefaultStorageType() { @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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ColumnFamily.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ColumnFamily.java index 928815e27038..e5f7b8836b6c 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ColumnFamily.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ColumnFamily.java @@ -66,7 +66,7 @@ private ColumnFamily( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -194,13 +194,12 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.ColumnFamily other = (com.google.bigtable.admin.v2.ColumnFamily) obj; - boolean result = true; - result = result && (hasGcRule() == other.hasGcRule()); + if (hasGcRule() != other.hasGcRule()) return false; if (hasGcRule()) { - result = result && getGcRule().equals(other.getGcRule()); + if (!getGcRule().equals(other.getGcRule())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -403,35 +402,35 @@ public com.google.bigtable.admin.v2.ColumnFamily 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 @@ -478,7 +477,7 @@ public Builder mergeFrom( return this; } - private com.google.bigtable.admin.v2.GcRule gcRule_ = null; + private com.google.bigtable.admin.v2.GcRule gcRule_; private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.admin.v2.GcRule, com.google.bigtable.admin.v2.GcRule.Builder, @@ -693,7 +692,7 @@ public com.google.bigtable.admin.v2.GcRuleOrBuilder getGcRuleOrBuilder() { @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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateAppProfileRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateAppProfileRequest.java index 1da42d505ef3..337b8f11ba50 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateAppProfileRequest.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/CreateAppProfileRequest.java @@ -25,7 +25,6 @@ private CreateAppProfileRequest(com.google.protobuf.GeneratedMessageV3.Builder(); @@ -98,7 +98,7 @@ private CreateTableRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -110,7 +110,7 @@ private CreateTableRequest( } 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)) { initialSplits_ = java.util.Collections.unmodifiableList(initialSplits_); } this.unknownFields = unknownFields.build(); @@ -203,7 +203,7 @@ private Split( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -295,10 +295,9 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.CreateTableRequest.Split other = (com.google.bigtable.admin.v2.CreateTableRequest.Split) obj; - boolean result = true; - result = result && getKey().equals(other.getKey()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getKey().equals(other.getKey())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -494,23 +493,23 @@ public com.google.bigtable.admin.v2.CreateTableRequest.Split 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 @@ -518,13 +517,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 @@ -623,7 +622,7 @@ public Builder clearKey() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -996,16 +995,15 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.CreateTableRequest other = (com.google.bigtable.admin.v2.CreateTableRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getTableId().equals(other.getTableId()); - result = result && (hasTable() == other.hasTable()); + if (!getParent().equals(other.getParent())) return false; + if (!getTableId().equals(other.getTableId())) return false; + if (hasTable() != other.hasTable()) return false; if (hasTable()) { - result = result && getTable().equals(other.getTable()); + if (!getTable().equals(other.getTable())) return false; } - result = result && getInitialSplitsList().equals(other.getInitialSplitsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getInitialSplitsList().equals(other.getInitialSplitsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1228,7 +1226,7 @@ public com.google.bigtable.admin.v2.CreateTableRequest buildPartial() { result.table_ = tableBuilder_.build(); } if (initialSplitsBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { initialSplits_ = java.util.Collections.unmodifiableList(initialSplits_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -1243,35 +1241,35 @@ public com.google.bigtable.admin.v2.CreateTableRequest 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 @@ -1554,7 +1552,7 @@ public Builder setTableIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.bigtable.admin.v2.Table table_ = null; + private com.google.bigtable.admin.v2.Table table_; private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.admin.v2.Table, com.google.bigtable.admin.v2.Table.Builder, @@ -1733,7 +1731,7 @@ public com.google.bigtable.admin.v2.TableOrBuilder getTableOrBuilder() { java.util.Collections.emptyList(); private void ensureInitialSplitsIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { initialSplits_ = new java.util.ArrayList( initialSplits_); @@ -2318,7 +2316,7 @@ public com.google.bigtable.admin.v2.CreateTableRequest.Split.Builder addInitialS com.google.bigtable.admin.v2.CreateTableRequest.Split.Builder, com.google.bigtable.admin.v2.CreateTableRequest.SplitOrBuilder>( initialSplits_, - ((bitField0_ & 0x00000008) == 0x00000008), + ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); initialSplits_ = null; @@ -2328,7 +2326,7 @@ public com.google.bigtable.admin.v2.CreateTableRequest.Split.Builder addInitialS @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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteAppProfileRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteAppProfileRequest.java index 83762c48998a..ade1caf8782c 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteAppProfileRequest.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/DeleteAppProfileRequest.java @@ -24,7 +24,6 @@ private DeleteAppProfileRequest(com.google.protobuf.GeneratedMessageV3.Builder(); mutable_bitField0_ |= 0x00000001; } @@ -250,7 +250,7 @@ private Intersection( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -262,7 +262,7 @@ private Intersection( } 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)) { rules_ = java.util.Collections.unmodifiableList(rules_); } this.unknownFields = unknownFields.build(); @@ -394,10 +394,9 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.GcRule.Intersection other = (com.google.bigtable.admin.v2.GcRule.Intersection) obj; - boolean result = true; - result = result && getRulesList().equals(other.getRulesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getRulesList().equals(other.getRulesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -595,7 +594,7 @@ public com.google.bigtable.admin.v2.GcRule.Intersection buildPartial() { new com.google.bigtable.admin.v2.GcRule.Intersection(this); int from_bitField0_ = bitField0_; if (rulesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { rules_ = java.util.Collections.unmodifiableList(rules_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -609,23 +608,23 @@ public com.google.bigtable.admin.v2.GcRule.Intersection 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 @@ -633,13 +632,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 @@ -718,7 +717,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureRulesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { rules_ = new java.util.ArrayList(rules_); bitField0_ |= 0x00000001; } @@ -1056,10 +1055,7 @@ public java.util.List getRulesBuild com.google.bigtable.admin.v2.GcRule, com.google.bigtable.admin.v2.GcRule.Builder, com.google.bigtable.admin.v2.GcRuleOrBuilder>( - rules_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + rules_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); rules_ = null; } return rulesBuilder_; @@ -1068,7 +1064,7 @@ public java.util.List getRulesBuild @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1222,7 +1218,7 @@ private Union( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { rules_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -1233,7 +1229,7 @@ private Union( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -1245,7 +1241,7 @@ private Union( } 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)) { rules_ = java.util.Collections.unmodifiableList(rules_); } this.unknownFields = unknownFields.build(); @@ -1377,10 +1373,9 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.GcRule.Union other = (com.google.bigtable.admin.v2.GcRule.Union) obj; - boolean result = true; - result = result && getRulesList().equals(other.getRulesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getRulesList().equals(other.getRulesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1578,7 +1573,7 @@ public com.google.bigtable.admin.v2.GcRule.Union buildPartial() { new com.google.bigtable.admin.v2.GcRule.Union(this); int from_bitField0_ = bitField0_; if (rulesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { rules_ = java.util.Collections.unmodifiableList(rules_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -1592,23 +1587,23 @@ public com.google.bigtable.admin.v2.GcRule.Union 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 @@ -1616,13 +1611,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 @@ -1699,7 +1694,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureRulesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { rules_ = new java.util.ArrayList(rules_); bitField0_ |= 0x00000001; } @@ -2037,10 +2032,7 @@ public java.util.List getRulesBuild com.google.bigtable.admin.v2.GcRule, com.google.bigtable.admin.v2.GcRule.Builder, com.google.bigtable.admin.v2.GcRuleOrBuilder>( - rules_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + rules_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); rules_ = null; } return rulesBuilder_; @@ -2049,7 +2041,7 @@ public java.util.List getRulesBuild @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -2369,27 +2361,25 @@ public boolean equals(final java.lang.Object obj) { } com.google.bigtable.admin.v2.GcRule other = (com.google.bigtable.admin.v2.GcRule) obj; - boolean result = true; - result = result && getRuleCase().equals(other.getRuleCase()); - if (!result) return false; + if (!getRuleCase().equals(other.getRuleCase())) return false; switch (ruleCase_) { case 1: - result = result && (getMaxNumVersions() == other.getMaxNumVersions()); + if (getMaxNumVersions() != other.getMaxNumVersions()) return false; break; case 2: - result = result && getMaxAge().equals(other.getMaxAge()); + if (!getMaxAge().equals(other.getMaxAge())) return false; break; case 3: - result = result && getIntersection().equals(other.getIntersection()); + if (!getIntersection().equals(other.getIntersection())) return false; break; case 4: - result = result && getUnion().equals(other.getUnion()); + if (!getUnion().equals(other.getUnion())) 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 @@ -2622,35 +2612,35 @@ public com.google.bigtable.admin.v2.GcRule 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 @@ -3402,7 +3392,7 @@ public com.google.bigtable.admin.v2.GcRule.UnionOrBuilder getUnionOrBuilder() { @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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenRequest.java index 08359b7d4215..b565e784d303 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenRequest.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenRequest.java @@ -61,7 +61,7 @@ private GenerateConsistencyTokenRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -185,10 +185,9 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.GenerateConsistencyTokenRequest other = (com.google.bigtable.admin.v2.GenerateConsistencyTokenRequest) 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 @@ -384,35 +383,35 @@ public com.google.bigtable.admin.v2.GenerateConsistencyTokenRequest 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 @@ -569,7 +568,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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenResponse.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenResponse.java index defa335aa6c3..b89ec3556b64 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenResponse.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GenerateConsistencyTokenResponse.java @@ -61,7 +61,7 @@ private GenerateConsistencyTokenResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -181,10 +181,9 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.GenerateConsistencyTokenResponse other = (com.google.bigtable.admin.v2.GenerateConsistencyTokenResponse) obj; - boolean result = true; - result = result && getConsistencyToken().equals(other.getConsistencyToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getConsistencyToken().equals(other.getConsistencyToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -380,35 +379,35 @@ public com.google.bigtable.admin.v2.GenerateConsistencyTokenResponse 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 @@ -556,7 +555,7 @@ public Builder setConsistencyTokenBytes(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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetAppProfileRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetAppProfileRequest.java index a5f8e783e164..c902bb2d6542 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetAppProfileRequest.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetAppProfileRequest.java @@ -59,7 +59,7 @@ private GetAppProfileRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -181,10 +181,9 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.GetAppProfileRequest other = (com.google.bigtable.admin.v2.GetAppProfileRequest) 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 @@ -377,35 +376,35 @@ public com.google.bigtable.admin.v2.GetAppProfileRequest 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 @@ -556,7 +555,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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetClusterRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetClusterRequest.java index 26f50fbf8b4c..795f33880cb5 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetClusterRequest.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetClusterRequest.java @@ -59,7 +59,7 @@ private GetClusterRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -181,10 +181,9 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.GetClusterRequest other = (com.google.bigtable.admin.v2.GetClusterRequest) 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 @@ -377,35 +376,35 @@ public com.google.bigtable.admin.v2.GetClusterRequest 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 @@ -554,7 +553,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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetInstanceRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetInstanceRequest.java index f59011cd444f..e37c4ab7f0b0 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetInstanceRequest.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetInstanceRequest.java @@ -59,7 +59,7 @@ private GetInstanceRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -181,10 +181,9 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.GetInstanceRequest other = (com.google.bigtable.admin.v2.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 @@ -377,35 +376,35 @@ public com.google.bigtable.admin.v2.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 @@ -555,7 +554,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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetSnapshotRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetSnapshotRequest.java index 4ca3d38b4117..5355d6e19f32 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetSnapshotRequest.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetSnapshotRequest.java @@ -64,7 +64,7 @@ private GetSnapshotRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -188,10 +188,9 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.GetSnapshotRequest other = (com.google.bigtable.admin.v2.GetSnapshotRequest) 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 @@ -389,35 +388,35 @@ public com.google.bigtable.admin.v2.GetSnapshotRequest 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 @@ -572,7 +571,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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetTableRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetTableRequest.java index 7f4fe2a2d064..99f626290c8f 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetTableRequest.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/GetTableRequest.java @@ -68,7 +68,7 @@ private GetTableRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -230,11 +230,10 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.GetTableRequest other = (com.google.bigtable.admin.v2.GetTableRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && view_ == other.view_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (view_ != other.view_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -433,35 +432,35 @@ public com.google.bigtable.admin.v2.GetTableRequest 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 @@ -699,7 +698,7 @@ public Builder clearView() { @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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Instance.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Instance.java index 19d52381c3f7..b20616cf7c95 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Instance.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Instance.java @@ -86,7 +86,7 @@ private Instance( } case 42: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry); mutable_bitField0_ |= 0x00000010; @@ -99,7 +99,7 @@ private Instance( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -814,14 +814,13 @@ public boolean equals(final java.lang.Object obj) { } com.google.bigtable.admin.v2.Instance other = (com.google.bigtable.admin.v2.Instance) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getDisplayName().equals(other.getDisplayName()); - result = result && state_ == other.state_; - result = result && type_ == other.type_; - result = result && internalGetLabels().equals(other.internalGetLabels()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getDisplayName().equals(other.getDisplayName())) return false; + if (state_ != other.state_) return false; + if (type_ != other.type_) return false; + if (!internalGetLabels().equals(other.internalGetLabels())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1061,35 +1060,35 @@ public com.google.bigtable.admin.v2.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 @@ -1732,7 +1731,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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesRequest.java index 1f0d4c5ffcab..f8bc65a09a58 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesRequest.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesRequest.java @@ -24,7 +24,6 @@ private ListAppProfilesRequest(com.google.protobuf.GeneratedMessageV3.Builder private ListAppProfilesRequest() { parent_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -73,7 +72,7 @@ private ListAppProfilesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -272,12 +271,11 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.ListAppProfilesRequest other = (com.google.bigtable.admin.v2.ListAppProfilesRequest) 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 @@ -480,35 +478,35 @@ public com.google.bigtable.admin.v2.ListAppProfilesRequest 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 @@ -822,7 +820,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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesResponse.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesResponse.java index f2f3baf44f1b..3d932a625ec4 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesResponse.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListAppProfilesResponse.java @@ -54,7 +54,7 @@ private ListAppProfilesResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { appProfiles_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -73,7 +73,7 @@ private ListAppProfilesResponse( case 26: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { failedLocations_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -82,7 +82,7 @@ private ListAppProfilesResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -94,10 +94,10 @@ private ListAppProfilesResponse( } 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)) { appProfiles_ = java.util.Collections.unmodifiableList(appProfiles_); } - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (((mutable_bitField0_ & 0x00000004) != 0)) { failedLocations_ = failedLocations_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -357,12 +357,11 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.ListAppProfilesResponse other = (com.google.bigtable.admin.v2.ListAppProfilesResponse) obj; - boolean result = true; - result = result && getAppProfilesList().equals(other.getAppProfilesList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && getFailedLocationsList().equals(other.getFailedLocationsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getAppProfilesList().equals(other.getAppProfilesList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!getFailedLocationsList().equals(other.getFailedLocationsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -569,7 +568,7 @@ public com.google.bigtable.admin.v2.ListAppProfilesResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (appProfilesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { appProfiles_ = java.util.Collections.unmodifiableList(appProfiles_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -578,7 +577,7 @@ public com.google.bigtable.admin.v2.ListAppProfilesResponse buildPartial() { result.appProfiles_ = appProfilesBuilder_.build(); } result.nextPageToken_ = nextPageToken_; - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { failedLocations_ = failedLocations_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000004); } @@ -590,35 +589,35 @@ public com.google.bigtable.admin.v2.ListAppProfilesResponse 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 @@ -711,7 +710,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureAppProfilesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { appProfiles_ = new java.util.ArrayList(appProfiles_); bitField0_ |= 0x00000001; @@ -1051,10 +1050,7 @@ public com.google.bigtable.admin.v2.AppProfile.Builder addAppProfilesBuilder(int com.google.bigtable.admin.v2.AppProfile, com.google.bigtable.admin.v2.AppProfile.Builder, com.google.bigtable.admin.v2.AppProfileOrBuilder>( - appProfiles_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + appProfiles_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); appProfiles_ = null; } return appProfilesBuilder_; @@ -1168,7 +1164,7 @@ public Builder setNextPageTokenBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureFailedLocationsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { failedLocations_ = new com.google.protobuf.LazyStringArrayList(failedLocations_); bitField0_ |= 0x00000004; } @@ -1336,7 +1332,7 @@ public Builder addFailedLocationsBytes(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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersRequest.java index da6ab8809702..4b616554bcac 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersRequest.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersRequest.java @@ -67,7 +67,7 @@ private ListClustersRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -242,11 +242,10 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.ListClustersRequest other = (com.google.bigtable.admin.v2.ListClustersRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -444,35 +443,35 @@ public com.google.bigtable.admin.v2.ListClustersRequest 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 @@ -730,7 +729,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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersResponse.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersResponse.java index d506e17ce45a..570c8635f196 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersResponse.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListClustersResponse.java @@ -54,7 +54,7 @@ private ListClustersResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { clusters_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -66,7 +66,7 @@ private ListClustersResponse( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { failedLocations_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -82,7 +82,7 @@ private ListClustersResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -94,10 +94,10 @@ private ListClustersResponse( } 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)) { clusters_ = java.util.Collections.unmodifiableList(clusters_); } - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { failedLocations_ = failedLocations_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -357,12 +357,11 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.ListClustersResponse other = (com.google.bigtable.admin.v2.ListClustersResponse) obj; - boolean result = true; - result = result && getClustersList().equals(other.getClustersList()); - result = result && getFailedLocationsList().equals(other.getFailedLocationsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getClustersList().equals(other.getClustersList())) return false; + if (!getFailedLocationsList().equals(other.getFailedLocationsList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -569,7 +568,7 @@ public com.google.bigtable.admin.v2.ListClustersResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (clustersBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { clusters_ = java.util.Collections.unmodifiableList(clusters_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -577,7 +576,7 @@ public com.google.bigtable.admin.v2.ListClustersResponse buildPartial() { } else { result.clusters_ = clustersBuilder_.build(); } - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { failedLocations_ = failedLocations_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } @@ -590,35 +589,35 @@ public com.google.bigtable.admin.v2.ListClustersResponse 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 @@ -711,7 +710,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureClustersIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { clusters_ = new java.util.ArrayList(clusters_); bitField0_ |= 0x00000001; } @@ -1049,10 +1048,7 @@ public java.util.List getClustersB com.google.bigtable.admin.v2.Cluster, com.google.bigtable.admin.v2.Cluster.Builder, com.google.bigtable.admin.v2.ClusterOrBuilder>( - clusters_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + clusters_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); clusters_ = null; } return clustersBuilder_; @@ -1062,7 +1058,7 @@ public java.util.List getClustersB com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureFailedLocationsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { failedLocations_ = new com.google.protobuf.LazyStringArrayList(failedLocations_); bitField0_ |= 0x00000002; } @@ -1333,7 +1329,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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesRequest.java index bb75eb541029..77b51ced5fb7 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesRequest.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesRequest.java @@ -67,7 +67,7 @@ private ListInstancesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -238,11 +238,10 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.ListInstancesRequest other = (com.google.bigtable.admin.v2.ListInstancesRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getParent().equals(other.getParent())) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -440,35 +439,35 @@ public com.google.bigtable.admin.v2.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 @@ -717,7 +716,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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesResponse.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesResponse.java index f88a381fd71a..bef1785f924d 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListInstancesResponse.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/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; } @@ -66,7 +66,7 @@ private ListInstancesResponse( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { failedLocations_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -82,7 +82,7 @@ private ListInstancesResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -94,10 +94,10 @@ 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_); } - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { failedLocations_ = failedLocations_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -361,12 +361,11 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.ListInstancesResponse other = (com.google.bigtable.admin.v2.ListInstancesResponse) obj; - boolean result = true; - result = result && getInstancesList().equals(other.getInstancesList()); - result = result && getFailedLocationsList().equals(other.getFailedLocationsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getInstancesList().equals(other.getInstancesList())) return false; + if (!getFailedLocationsList().equals(other.getFailedLocationsList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -573,7 +572,7 @@ public com.google.bigtable.admin.v2.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); } @@ -581,7 +580,7 @@ public com.google.bigtable.admin.v2.ListInstancesResponse buildPartial() { } else { result.instances_ = instancesBuilder_.build(); } - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { failedLocations_ = failedLocations_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } @@ -594,35 +593,35 @@ public com.google.bigtable.admin.v2.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 @@ -715,7 +714,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; } @@ -1053,10 +1052,7 @@ public java.util.List getInstance com.google.bigtable.admin.v2.Instance, com.google.bigtable.admin.v2.Instance.Builder, com.google.bigtable.admin.v2.InstanceOrBuilder>( - instances_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + instances_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); instances_ = null; } return instancesBuilder_; @@ -1066,7 +1062,7 @@ public java.util.List getInstance com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureFailedLocationsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { failedLocations_ = new com.google.protobuf.LazyStringArrayList(failedLocations_); bitField0_ |= 0x00000002; } @@ -1346,7 +1342,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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsRequest.java index 7c56723226fe..4a7b8e90083f 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsRequest.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsRequest.java @@ -29,7 +29,6 @@ private ListSnapshotsRequest(com.google.protobuf.GeneratedMessageV3.Builder b private ListSnapshotsRequest() { parent_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -78,7 +77,7 @@ private ListSnapshotsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -277,12 +276,11 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.ListSnapshotsRequest other = (com.google.bigtable.admin.v2.ListSnapshotsRequest) 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 @@ -490,35 +488,35 @@ public com.google.bigtable.admin.v2.ListSnapshotsRequest 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 @@ -832,7 +830,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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsResponse.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsResponse.java index 090071aa6d77..3c3f21e390f5 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsResponse.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListSnapshotsResponse.java @@ -58,7 +58,7 @@ private ListSnapshotsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { snapshots_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -76,7 +76,7 @@ private ListSnapshotsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -88,7 +88,7 @@ private ListSnapshotsResponse( } 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)) { snapshots_ = java.util.Collections.unmodifiableList(snapshots_); } this.unknownFields = unknownFields.build(); @@ -274,11 +274,10 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.ListSnapshotsResponse other = (com.google.bigtable.admin.v2.ListSnapshotsResponse) obj; - boolean result = true; - result = result && getSnapshotsList().equals(other.getSnapshotsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getSnapshotsList().equals(other.getSnapshotsList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -484,7 +483,7 @@ public com.google.bigtable.admin.v2.ListSnapshotsResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (snapshotsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { snapshots_ = java.util.Collections.unmodifiableList(snapshots_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -500,35 +499,35 @@ public com.google.bigtable.admin.v2.ListSnapshotsResponse 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 @@ -611,7 +610,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureSnapshotsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { snapshots_ = new java.util.ArrayList(snapshots_); bitField0_ |= 0x00000001; } @@ -949,10 +948,7 @@ public java.util.List getSnapshot com.google.bigtable.admin.v2.Snapshot, com.google.bigtable.admin.v2.Snapshot.Builder, com.google.bigtable.admin.v2.SnapshotOrBuilder>( - snapshots_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + snapshots_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); snapshots_ = null; } return snapshotsBuilder_; @@ -1064,7 +1060,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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesRequest.java index a810c2fc9a88..a2ba7af882d1 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesRequest.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesRequest.java @@ -26,7 +26,6 @@ private ListTablesRequest(com.google.protobuf.GeneratedMessageV3.Builder buil private ListTablesRequest() { parent_ = ""; view_ = 0; - pageSize_ = 0; pageToken_ = ""; } @@ -82,7 +81,7 @@ private ListTablesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -313,13 +312,12 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.ListTablesRequest other = (com.google.bigtable.admin.v2.ListTablesRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && view_ == other.view_; - 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 (view_ != other.view_) 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 @@ -528,35 +526,35 @@ public com.google.bigtable.admin.v2.ListTablesRequest 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 @@ -937,7 +935,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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesResponse.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesResponse.java index e1764dfdc55e..c1b98466348c 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesResponse.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ListTablesResponse.java @@ -54,7 +54,7 @@ private ListTablesResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { tables_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -72,7 +72,7 @@ private ListTablesResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -84,7 +84,7 @@ private ListTablesResponse( } 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)) { tables_ = java.util.Collections.unmodifiableList(tables_); } this.unknownFields = unknownFields.build(); @@ -270,11 +270,10 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.ListTablesResponse other = (com.google.bigtable.admin.v2.ListTablesResponse) obj; - boolean result = true; - result = result && getTablesList().equals(other.getTablesList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTablesList().equals(other.getTablesList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -476,7 +475,7 @@ public com.google.bigtable.admin.v2.ListTablesResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (tablesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { tables_ = java.util.Collections.unmodifiableList(tables_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -492,35 +491,35 @@ public com.google.bigtable.admin.v2.ListTablesResponse 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 @@ -602,7 +601,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureTablesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { tables_ = new java.util.ArrayList(tables_); bitField0_ |= 0x00000001; } @@ -940,10 +939,7 @@ public java.util.List getTablesBuild com.google.bigtable.admin.v2.Table, com.google.bigtable.admin.v2.Table.Builder, com.google.bigtable.admin.v2.TableOrBuilder>( - tables_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + tables_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); tables_ = null; } return tablesBuilder_; @@ -1055,7 +1051,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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ModifyColumnFamiliesRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ModifyColumnFamiliesRequest.java index 0e5ec3d3712f..b60c27457069 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ModifyColumnFamiliesRequest.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/ModifyColumnFamiliesRequest.java @@ -61,7 +61,7 @@ private ModifyColumnFamiliesRequest( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { modifications_ = new java.util.ArrayList< com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification>(); @@ -76,7 +76,7 @@ private ModifyColumnFamiliesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -88,7 +88,7 @@ private ModifyColumnFamiliesRequest( } 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)) { modifications_ = java.util.Collections.unmodifiableList(modifications_); } this.unknownFields = unknownFields.build(); @@ -314,7 +314,7 @@ private Modification( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -613,25 +613,23 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification other = (com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification) obj; - boolean result = true; - result = result && getId().equals(other.getId()); - result = result && getModCase().equals(other.getModCase()); - if (!result) return false; + if (!getId().equals(other.getId())) return false; + if (!getModCase().equals(other.getModCase())) return false; switch (modCase_) { case 2: - result = result && getCreate().equals(other.getCreate()); + if (!getCreate().equals(other.getCreate())) return false; break; case 3: - result = result && getUpdate().equals(other.getUpdate()); + if (!getUpdate().equals(other.getUpdate())) return false; break; case 4: - result = result && (getDrop() == other.getDrop()); + if (getDrop() != other.getDrop()) 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 @@ -869,23 +867,23 @@ public com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification bui @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 @@ -893,13 +891,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 @@ -1557,7 +1555,7 @@ public Builder clearDrop() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1803,11 +1801,10 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest other = (com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getModificationsList().equals(other.getModificationsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getModificationsList().equals(other.getModificationsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -2011,7 +2008,7 @@ public com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest buildPartial() { int to_bitField0_ = 0; result.name_ = name_; if (modificationsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { modifications_ = java.util.Collections.unmodifiableList(modifications_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -2026,35 +2023,35 @@ public com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest 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 @@ -2241,7 +2238,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { modifications_ = java.util.Collections.emptyList(); private void ensureModificationsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { modifications_ = new java.util.ArrayList< com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification>( @@ -2699,7 +2696,7 @@ public Builder removeModifications(int index) { com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.Modification.Builder, com.google.bigtable.admin.v2.ModifyColumnFamiliesRequest.ModificationOrBuilder>( modifications_, - ((bitField0_ & 0x00000002) == 0x00000002), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); modifications_ = null; @@ -2709,7 +2706,7 @@ public Builder removeModifications(int index) { @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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/PartialUpdateInstanceRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/PartialUpdateInstanceRequest.java index 552982a8b1dd..d338a810c544 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/PartialUpdateInstanceRequest.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/PartialUpdateInstanceRequest.java @@ -81,7 +81,7 @@ private PartialUpdateInstanceRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -247,17 +247,16 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.PartialUpdateInstanceRequest other = (com.google.bigtable.admin.v2.PartialUpdateInstanceRequest) 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 && (hasUpdateMask() == other.hasUpdateMask()); + if (hasUpdateMask() != other.hasUpdateMask()) return false; if (hasUpdateMask()) { - result = result && getUpdateMask().equals(other.getUpdateMask()); + if (!getUpdateMask().equals(other.getUpdateMask())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -476,35 +475,35 @@ public com.google.bigtable.admin.v2.PartialUpdateInstanceRequest 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 @@ -556,7 +555,7 @@ public Builder mergeFrom( return this; } - private com.google.bigtable.admin.v2.Instance instance_ = null; + private com.google.bigtable.admin.v2.Instance instance_; private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.admin.v2.Instance, com.google.bigtable.admin.v2.Instance.Builder, @@ -737,7 +736,7 @@ public com.google.bigtable.admin.v2.InstanceOrBuilder getInstanceOrBuilder() { return instanceBuilder_; } - private com.google.protobuf.FieldMask updateMask_ = null; + private com.google.protobuf.FieldMask updateMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.FieldMask, com.google.protobuf.FieldMask.Builder, @@ -927,7 +926,7 @@ public com.google.protobuf.FieldMaskOrBuilder getUpdateMaskOrBuilder() { @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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Snapshot.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Snapshot.java index 2923ae00d53b..1d40c2978506 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Snapshot.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Snapshot.java @@ -29,7 +29,6 @@ private Snapshot(com.google.protobuf.GeneratedMessageV3.Builder builder) { private Snapshot() { name_ = ""; - dataSizeBytes_ = 0L; state_ = 0; description_ = ""; } @@ -131,7 +130,7 @@ private Snapshot( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -670,25 +669,24 @@ public boolean equals(final java.lang.Object obj) { } com.google.bigtable.admin.v2.Snapshot other = (com.google.bigtable.admin.v2.Snapshot) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (hasSourceTable() == other.hasSourceTable()); + if (!getName().equals(other.getName())) return false; + if (hasSourceTable() != other.hasSourceTable()) return false; if (hasSourceTable()) { - result = result && getSourceTable().equals(other.getSourceTable()); + if (!getSourceTable().equals(other.getSourceTable())) return false; } - result = result && (getDataSizeBytes() == other.getDataSizeBytes()); - result = result && (hasCreateTime() == other.hasCreateTime()); + if (getDataSizeBytes() != other.getDataSizeBytes()) 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 && (hasDeleteTime() == other.hasDeleteTime()); + if (hasDeleteTime() != other.hasDeleteTime()) return false; if (hasDeleteTime()) { - result = result && getDeleteTime().equals(other.getDeleteTime()); + if (!getDeleteTime().equals(other.getDeleteTime())) return false; } - result = result && state_ == other.state_; - result = result && getDescription().equals(other.getDescription()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (state_ != other.state_) return false; + if (!getDescription().equals(other.getDescription())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -945,35 +943,35 @@ public com.google.bigtable.admin.v2.Snapshot 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 @@ -1149,7 +1147,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.bigtable.admin.v2.Table sourceTable_ = null; + private com.google.bigtable.admin.v2.Table sourceTable_; private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.admin.v2.Table, com.google.bigtable.admin.v2.Table.Builder, @@ -1392,7 +1390,7 @@ public Builder clearDataSizeBytes() { 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, @@ -1580,7 +1578,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { return createTimeBuilder_; } - private com.google.protobuf.Timestamp deleteTime_ = null; + private com.google.protobuf.Timestamp deleteTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1968,7 +1966,7 @@ public Builder setDescriptionBytes(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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableMetadata.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableMetadata.java index f07b0d4641ac..d97adbec1b3b 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableMetadata.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableMetadata.java @@ -101,7 +101,7 @@ private SnapshotTableMetadata( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -309,21 +309,20 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.SnapshotTableMetadata other = (com.google.bigtable.admin.v2.SnapshotTableMetadata) obj; - boolean result = true; - result = result && (hasOriginalRequest() == other.hasOriginalRequest()); + if (hasOriginalRequest() != other.hasOriginalRequest()) return false; if (hasOriginalRequest()) { - result = result && getOriginalRequest().equals(other.getOriginalRequest()); + if (!getOriginalRequest().equals(other.getOriginalRequest())) return false; } - result = result && (hasRequestTime() == other.hasRequestTime()); + if (hasRequestTime() != other.hasRequestTime()) return false; if (hasRequestTime()) { - result = result && getRequestTime().equals(other.getRequestTime()); + if (!getRequestTime().equals(other.getRequestTime())) return false; } - result = result && (hasFinishTime() == other.hasFinishTime()); + if (hasFinishTime() != other.hasFinishTime()) return false; if (hasFinishTime()) { - result = result && getFinishTime().equals(other.getFinishTime()); + if (!getFinishTime().equals(other.getFinishTime())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -560,35 +559,35 @@ public com.google.bigtable.admin.v2.SnapshotTableMetadata 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 @@ -643,7 +642,7 @@ public Builder mergeFrom( return this; } - private com.google.bigtable.admin.v2.SnapshotTableRequest originalRequest_ = null; + private com.google.bigtable.admin.v2.SnapshotTableRequest originalRequest_; private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.admin.v2.SnapshotTableRequest, com.google.bigtable.admin.v2.SnapshotTableRequest.Builder, @@ -826,7 +825,7 @@ public com.google.bigtable.admin.v2.SnapshotTableRequest.Builder getOriginalRequ return originalRequestBuilder_; } - private com.google.protobuf.Timestamp requestTime_ = null; + private com.google.protobuf.Timestamp requestTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1007,7 +1006,7 @@ public com.google.protobuf.TimestampOrBuilder getRequestTimeOrBuilder() { return requestTimeBuilder_; } - private com.google.protobuf.Timestamp finishTime_ = null; + private com.google.protobuf.Timestamp finishTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1188,7 +1187,7 @@ public com.google.protobuf.TimestampOrBuilder getFinishTimeOrBuilder() { @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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequest.java index 4ceeeb22a86a..77b180e3135b 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequest.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/SnapshotTableRequest.java @@ -102,7 +102,7 @@ private SnapshotTableRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -437,17 +437,16 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.SnapshotTableRequest other = (com.google.bigtable.admin.v2.SnapshotTableRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getCluster().equals(other.getCluster()); - result = result && getSnapshotId().equals(other.getSnapshotId()); - result = result && (hasTtl() == other.hasTtl()); + if (!getName().equals(other.getName())) return false; + if (!getCluster().equals(other.getCluster())) return false; + if (!getSnapshotId().equals(other.getSnapshotId())) return false; + if (hasTtl() != other.hasTtl()) return false; if (hasTtl()) { - result = result && getTtl().equals(other.getTtl()); + if (!getTtl().equals(other.getTtl())) return false; } - result = result && getDescription().equals(other.getDescription()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDescription().equals(other.getDescription())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -675,35 +674,35 @@ public com.google.bigtable.admin.v2.SnapshotTableRequest 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 @@ -1085,7 +1084,7 @@ public Builder setSnapshotIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.protobuf.Duration ttl_ = null; + private com.google.protobuf.Duration ttl_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Duration, com.google.protobuf.Duration.Builder, @@ -1381,7 +1380,7 @@ public Builder setDescriptionBytes(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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Table.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Table.java index 12c2ae09426e..ac97e95dd376 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Table.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/Table.java @@ -61,7 +61,7 @@ private Table( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { clusterStates_ = com.google.protobuf.MapField.newMapField( ClusterStatesDefaultEntryHolder.defaultEntry); @@ -80,7 +80,7 @@ private Table( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { columnFamilies_ = com.google.protobuf.MapField.newMapField( ColumnFamiliesDefaultEntryHolder.defaultEntry); @@ -106,7 +106,7 @@ private Table( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -557,7 +557,7 @@ private ClusterState( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -881,10 +881,9 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.Table.ClusterState other = (com.google.bigtable.admin.v2.Table.ClusterState) obj; - boolean result = true; - result = result && replicationState_ == other.replicationState_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (replicationState_ != other.replicationState_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1079,23 +1078,23 @@ public com.google.bigtable.admin.v2.Table.ClusterState 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 @@ -1103,13 +1102,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 @@ -1252,7 +1251,7 @@ public Builder clearReplicationState() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1716,13 +1715,12 @@ public boolean equals(final java.lang.Object obj) { } com.google.bigtable.admin.v2.Table other = (com.google.bigtable.admin.v2.Table) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && internalGetClusterStates().equals(other.internalGetClusterStates()); - result = result && internalGetColumnFamilies().equals(other.internalGetColumnFamilies()); - result = result && granularity_ == other.granularity_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!internalGetClusterStates().equals(other.internalGetClusterStates())) return false; + if (!internalGetColumnFamilies().equals(other.internalGetColumnFamilies())) return false; + if (granularity_ != other.granularity_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1960,35 +1958,35 @@ public com.google.bigtable.admin.v2.Table 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 @@ -2642,7 +2640,7 @@ public Builder clearGranularity() { @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-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileMetadata.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileMetadata.java index 56221920e9c0..2261b00083e5 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileMetadata.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileMetadata.java @@ -49,7 +49,7 @@ private UpdateAppProfileMetadata( break; default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -120,9 +120,8 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.admin.v2.UpdateAppProfileMetadata other = (com.google.bigtable.admin.v2.UpdateAppProfileMetadata) obj; - boolean result = true; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -311,35 +310,35 @@ public com.google.bigtable.admin.v2.UpdateAppProfileMetadata 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 @@ -387,7 +386,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 diff --git a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileRequest.java b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileRequest.java index e687832e6853..2c187481e3de 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileRequest.java +++ b/google-api-grpc/proto-google-cloud-bigtable-admin-v2/src/main/java/com/google/bigtable/admin/v2/UpdateAppProfileRequest.java @@ -22,9 +22,7 @@ private UpdateAppProfileRequest(com.google.protobuf.GeneratedMessageV3.Builder builder) { } private Cell() { - timestampMicros_ = 0L; value_ = com.google.protobuf.ByteString.EMPTY; labels_ = com.google.protobuf.LazyStringArrayList.EMPTY; } @@ -65,7 +64,7 @@ private Cell( case 26: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { labels_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -74,7 +73,7 @@ private Cell( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -86,7 +85,7 @@ private Cell( } 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)) { labels_ = labels_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -257,12 +256,11 @@ public boolean equals(final java.lang.Object obj) { } com.google.bigtable.v2.Cell other = (com.google.bigtable.v2.Cell) obj; - boolean result = true; - result = result && (getTimestampMicros() == other.getTimestampMicros()); - result = result && getValue().equals(other.getValue()); - result = result && getLabelsList().equals(other.getLabelsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getTimestampMicros() != other.getTimestampMicros()) return false; + if (!getValue().equals(other.getValue())) return false; + if (!getLabelsList().equals(other.getLabelsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -457,7 +455,7 @@ public com.google.bigtable.v2.Cell buildPartial() { int to_bitField0_ = 0; result.timestampMicros_ = timestampMicros_; result.value_ = value_; - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { labels_ = labels_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000004); } @@ -469,35 +467,35 @@ public com.google.bigtable.v2.Cell 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 @@ -675,7 +673,7 @@ public Builder clearValue() { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureLabelsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { labels_ = new com.google.protobuf.LazyStringArrayList(labels_); bitField0_ |= 0x00000004; } @@ -816,7 +814,7 @@ public Builder addLabelsBytes(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-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowRequest.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowRequest.java index 6f59fd58cefe..f5344aca46ab 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowRequest.java +++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowRequest.java @@ -68,7 +68,7 @@ private CheckAndMutateRowRequest( } case 34: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { trueMutations_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000010; } @@ -78,7 +78,7 @@ private CheckAndMutateRowRequest( } case 42: { - if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (!((mutable_bitField0_ & 0x00000020) != 0)) { falseMutations_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000020; } @@ -110,7 +110,7 @@ private CheckAndMutateRowRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -122,10 +122,10 @@ private CheckAndMutateRowRequest( } 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)) { trueMutations_ = java.util.Collections.unmodifiableList(trueMutations_); } - if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (((mutable_bitField0_ & 0x00000020) != 0)) { falseMutations_ = java.util.Collections.unmodifiableList(falseMutations_); } this.unknownFields = unknownFields.build(); @@ -551,18 +551,17 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.v2.CheckAndMutateRowRequest other = (com.google.bigtable.v2.CheckAndMutateRowRequest) obj; - boolean result = true; - result = result && getTableName().equals(other.getTableName()); - result = result && getAppProfileId().equals(other.getAppProfileId()); - result = result && getRowKey().equals(other.getRowKey()); - result = result && (hasPredicateFilter() == other.hasPredicateFilter()); + if (!getTableName().equals(other.getTableName())) return false; + if (!getAppProfileId().equals(other.getAppProfileId())) return false; + if (!getRowKey().equals(other.getRowKey())) return false; + if (hasPredicateFilter() != other.hasPredicateFilter()) return false; if (hasPredicateFilter()) { - result = result && getPredicateFilter().equals(other.getPredicateFilter()); + if (!getPredicateFilter().equals(other.getPredicateFilter())) return false; } - result = result && getTrueMutationsList().equals(other.getTrueMutationsList()); - result = result && getFalseMutationsList().equals(other.getFalseMutationsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTrueMutationsList().equals(other.getTrueMutationsList())) return false; + if (!getFalseMutationsList().equals(other.getFalseMutationsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -800,7 +799,7 @@ public com.google.bigtable.v2.CheckAndMutateRowRequest buildPartial() { result.predicateFilter_ = predicateFilterBuilder_.build(); } if (trueMutationsBuilder_ == null) { - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000010) != 0)) { trueMutations_ = java.util.Collections.unmodifiableList(trueMutations_); bitField0_ = (bitField0_ & ~0x00000010); } @@ -809,7 +808,7 @@ public com.google.bigtable.v2.CheckAndMutateRowRequest buildPartial() { result.trueMutations_ = trueMutationsBuilder_.build(); } if (falseMutationsBuilder_ == null) { - if (((bitField0_ & 0x00000020) == 0x00000020)) { + if (((bitField0_ & 0x00000020) != 0)) { falseMutations_ = java.util.Collections.unmodifiableList(falseMutations_); bitField0_ = (bitField0_ & ~0x00000020); } @@ -824,35 +823,35 @@ public com.google.bigtable.v2.CheckAndMutateRowRequest 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 @@ -1222,7 +1221,7 @@ public Builder clearRowKey() { return this; } - private com.google.bigtable.v2.RowFilter predicateFilter_ = null; + private com.google.bigtable.v2.RowFilter predicateFilter_; private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.v2.RowFilter, com.google.bigtable.v2.RowFilter.Builder, @@ -1434,7 +1433,7 @@ public com.google.bigtable.v2.RowFilterOrBuilder getPredicateFilterOrBuilder() { java.util.Collections.emptyList(); private void ensureTrueMutationsIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { + if (!((bitField0_ & 0x00000010) != 0)) { trueMutations_ = new java.util.ArrayList(trueMutations_); bitField0_ |= 0x00000010; } @@ -1845,7 +1844,7 @@ public java.util.List getTrueMutationsB com.google.bigtable.v2.Mutation.Builder, com.google.bigtable.v2.MutationOrBuilder>( trueMutations_, - ((bitField0_ & 0x00000010) == 0x00000010), + ((bitField0_ & 0x00000010) != 0), getParentForChildren(), isClean()); trueMutations_ = null; @@ -1857,7 +1856,7 @@ public java.util.List getTrueMutationsB java.util.Collections.emptyList(); private void ensureFalseMutationsIsMutable() { - if (!((bitField0_ & 0x00000020) == 0x00000020)) { + if (!((bitField0_ & 0x00000020) != 0)) { falseMutations_ = new java.util.ArrayList(falseMutations_); bitField0_ |= 0x00000020; } @@ -2268,7 +2267,7 @@ public java.util.List getFalseMutations com.google.bigtable.v2.Mutation.Builder, com.google.bigtable.v2.MutationOrBuilder>( falseMutations_, - ((bitField0_ & 0x00000020) == 0x00000020), + ((bitField0_ & 0x00000020) != 0), getParentForChildren(), isClean()); falseMutations_ = null; @@ -2278,7 +2277,7 @@ public java.util.List getFalseMutations @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-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowResponse.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowResponse.java index 288b4d80ce6a..6670c4448ef3 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowResponse.java +++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/CheckAndMutateRowResponse.java @@ -22,9 +22,7 @@ private CheckAndMutateRowResponse(com.google.protobuf.GeneratedMessageV3.Builder super(builder); } - private CheckAndMutateRowResponse() { - predicateMatched_ = false; - } + private CheckAndMutateRowResponse() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -57,7 +55,7 @@ private CheckAndMutateRowResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -150,10 +148,9 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.v2.CheckAndMutateRowResponse other = (com.google.bigtable.v2.CheckAndMutateRowResponse) obj; - boolean result = true; - result = result && (getPredicateMatched() == other.getPredicateMatched()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getPredicateMatched() != other.getPredicateMatched()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -346,35 +343,35 @@ public com.google.bigtable.v2.CheckAndMutateRowResponse 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 @@ -471,7 +468,7 @@ public Builder clearPredicateMatched() { @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-bigtable-v2/src/main/java/com/google/bigtable/v2/Column.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Column.java index 0331feb0cbe7..0473456bb731 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Column.java +++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Column.java @@ -59,7 +59,7 @@ private Column( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { cells_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -69,7 +69,7 @@ private Column( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -81,7 +81,7 @@ private Column( } 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)) { cells_ = java.util.Collections.unmodifiableList(cells_); } this.unknownFields = unknownFields.build(); @@ -235,11 +235,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.bigtable.v2.Column other = (com.google.bigtable.v2.Column) obj; - boolean result = true; - result = result && getQualifier().equals(other.getQualifier()); - result = result && getCellsList().equals(other.getCellsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getQualifier().equals(other.getQualifier())) return false; + if (!getCellsList().equals(other.getCellsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -437,7 +436,7 @@ public com.google.bigtable.v2.Column buildPartial() { int to_bitField0_ = 0; result.qualifier_ = qualifier_; if (cellsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { cells_ = java.util.Collections.unmodifiableList(cells_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -452,35 +451,35 @@ public com.google.bigtable.v2.Column 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 @@ -618,7 +617,7 @@ public Builder clearQualifier() { private java.util.List cells_ = java.util.Collections.emptyList(); private void ensureCellsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { cells_ = new java.util.ArrayList(cells_); bitField0_ |= 0x00000002; } @@ -951,10 +950,7 @@ public java.util.List getCellsBuilderList() com.google.bigtable.v2.Cell, com.google.bigtable.v2.Cell.Builder, com.google.bigtable.v2.CellOrBuilder>( - cells_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + cells_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); cells_ = null; } return cellsBuilder_; @@ -962,7 +958,7 @@ public java.util.List getCellsBuilderList() @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-bigtable-v2/src/main/java/com/google/bigtable/v2/ColumnRange.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ColumnRange.java index c7831e83425e..f6f54cd2416c 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ColumnRange.java +++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ColumnRange.java @@ -86,7 +86,7 @@ private ColumnRange( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -385,34 +385,31 @@ public boolean equals(final java.lang.Object obj) { } com.google.bigtable.v2.ColumnRange other = (com.google.bigtable.v2.ColumnRange) obj; - boolean result = true; - result = result && getFamilyName().equals(other.getFamilyName()); - result = result && getStartQualifierCase().equals(other.getStartQualifierCase()); - if (!result) return false; + if (!getFamilyName().equals(other.getFamilyName())) return false; + if (!getStartQualifierCase().equals(other.getStartQualifierCase())) return false; switch (startQualifierCase_) { case 2: - result = result && getStartQualifierClosed().equals(other.getStartQualifierClosed()); + if (!getStartQualifierClosed().equals(other.getStartQualifierClosed())) return false; break; case 3: - result = result && getStartQualifierOpen().equals(other.getStartQualifierOpen()); + if (!getStartQualifierOpen().equals(other.getStartQualifierOpen())) return false; break; case 0: default: } - result = result && getEndQualifierCase().equals(other.getEndQualifierCase()); - if (!result) return false; + if (!getEndQualifierCase().equals(other.getEndQualifierCase())) return false; switch (endQualifierCase_) { case 4: - result = result && getEndQualifierClosed().equals(other.getEndQualifierClosed()); + if (!getEndQualifierClosed().equals(other.getEndQualifierClosed())) return false; break; case 5: - result = result && getEndQualifierOpen().equals(other.getEndQualifierOpen()); + if (!getEndQualifierOpen().equals(other.getEndQualifierOpen())) 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 @@ -648,35 +645,35 @@ public com.google.bigtable.v2.ColumnRange 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 @@ -1084,7 +1081,7 @@ public Builder clearEndQualifierOpen() { @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-bigtable-v2/src/main/java/com/google/bigtable/v2/Family.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Family.java index 26f9dc200286..c7538e4a2c79 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Family.java +++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Family.java @@ -61,7 +61,7 @@ private Family( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { columns_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -71,7 +71,7 @@ private Family( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -83,7 +83,7 @@ private Family( } 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_ = java.util.Collections.unmodifiableList(columns_); } this.unknownFields = unknownFields.build(); @@ -272,11 +272,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.bigtable.v2.Family other = (com.google.bigtable.v2.Family) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getColumnsList().equals(other.getColumnsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getColumnsList().equals(other.getColumnsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -474,7 +473,7 @@ public com.google.bigtable.v2.Family buildPartial() { int to_bitField0_ = 0; result.name_ = name_; if (columnsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { columns_ = java.util.Collections.unmodifiableList(columns_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -489,35 +488,35 @@ public com.google.bigtable.v2.Family 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 +716,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureColumnsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { columns_ = new java.util.ArrayList(columns_); bitField0_ |= 0x00000002; } @@ -1053,10 +1052,7 @@ public java.util.List getColumnsBuilderLi com.google.bigtable.v2.Column, com.google.bigtable.v2.Column.Builder, com.google.bigtable.v2.ColumnOrBuilder>( - columns_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + columns_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); columns_ = null; } return columnsBuilder_; @@ -1064,7 +1060,7 @@ public java.util.List getColumnsBuilderLi @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-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowRequest.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowRequest.java index 39ac0a8b1d19..327676fcd3ae 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowRequest.java +++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowRequest.java @@ -67,7 +67,7 @@ private MutateRowRequest( } case 26: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { mutations_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; } @@ -84,7 +84,7 @@ private MutateRowRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -96,7 +96,7 @@ private MutateRowRequest( } 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(); @@ -363,13 +363,12 @@ public boolean equals(final java.lang.Object obj) { } com.google.bigtable.v2.MutateRowRequest other = (com.google.bigtable.v2.MutateRowRequest) obj; - boolean result = true; - result = result && getTableName().equals(other.getTableName()); - result = result && getAppProfileId().equals(other.getAppProfileId()); - result = result && getRowKey().equals(other.getRowKey()); - result = result && getMutationsList().equals(other.getMutationsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTableName().equals(other.getTableName())) return false; + if (!getAppProfileId().equals(other.getAppProfileId())) return false; + if (!getRowKey().equals(other.getRowKey())) return false; + if (!getMutationsList().equals(other.getMutationsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -581,7 +580,7 @@ public com.google.bigtable.v2.MutateRowRequest buildPartial() { result.appProfileId_ = appProfileId_; result.rowKey_ = rowKey_; if (mutationsBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { mutations_ = java.util.Collections.unmodifiableList(mutations_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -596,35 +595,35 @@ public com.google.bigtable.v2.MutateRowRequest 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 @@ -962,7 +961,7 @@ public Builder clearRowKey() { java.util.Collections.emptyList(); private void ensureMutationsIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { mutations_ = new java.util.ArrayList(mutations_); bitField0_ |= 0x00000008; } @@ -1336,10 +1335,7 @@ public java.util.List getMutationsBuild com.google.bigtable.v2.Mutation, com.google.bigtable.v2.Mutation.Builder, com.google.bigtable.v2.MutationOrBuilder>( - mutations_, - ((bitField0_ & 0x00000008) == 0x00000008), - getParentForChildren(), - isClean()); + mutations_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); mutations_ = null; } return mutationsBuilder_; @@ -1347,7 +1343,7 @@ public java.util.List getMutationsBuild @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-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowResponse.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowResponse.java index 763e24309ac2..cfd25ab06210 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowResponse.java +++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowResponse.java @@ -49,7 +49,7 @@ private MutateRowResponse( break; default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -119,9 +119,8 @@ public boolean equals(final java.lang.Object obj) { } com.google.bigtable.v2.MutateRowResponse other = (com.google.bigtable.v2.MutateRowResponse) obj; - boolean result = true; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -309,35 +308,35 @@ public com.google.bigtable.v2.MutateRowResponse 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 @@ -383,7 +382,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 diff --git a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsRequest.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsRequest.java index 4b2b9592c37b..c2769cbb747e 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsRequest.java +++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsRequest.java @@ -61,7 +61,7 @@ private MutateRowsRequest( } case 18: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { entries_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; @@ -80,7 +80,7 @@ private MutateRowsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -92,7 +92,7 @@ private MutateRowsRequest( } 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)) { entries_ = java.util.Collections.unmodifiableList(entries_); } this.unknownFields = unknownFields.build(); @@ -244,7 +244,7 @@ private Entry( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { mutations_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -254,7 +254,7 @@ private Entry( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -266,7 +266,7 @@ private Entry( } 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)) { mutations_ = java.util.Collections.unmodifiableList(mutations_); } this.unknownFields = unknownFields.build(); @@ -435,11 +435,10 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.v2.MutateRowsRequest.Entry other = (com.google.bigtable.v2.MutateRowsRequest.Entry) obj; - boolean result = true; - result = result && getRowKey().equals(other.getRowKey()); - result = result && getMutationsList().equals(other.getMutationsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getRowKey().equals(other.getRowKey())) return false; + if (!getMutationsList().equals(other.getMutationsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -635,7 +634,7 @@ public com.google.bigtable.v2.MutateRowsRequest.Entry buildPartial() { int to_bitField0_ = 0; result.rowKey_ = rowKey_; if (mutationsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { mutations_ = java.util.Collections.unmodifiableList(mutations_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -650,23 +649,23 @@ public com.google.bigtable.v2.MutateRowsRequest.Entry 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 @@ -674,13 +673,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 @@ -808,7 +807,7 @@ public Builder clearRowKey() { java.util.Collections.emptyList(); private void ensureMutationsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { mutations_ = new java.util.ArrayList(mutations_); bitField0_ |= 0x00000002; } @@ -1200,10 +1199,7 @@ public java.util.List getMutationsBuild com.google.bigtable.v2.Mutation, com.google.bigtable.v2.Mutation.Builder, com.google.bigtable.v2.MutationOrBuilder>( - mutations_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + mutations_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); mutations_ = null; } return mutationsBuilder_; @@ -1212,7 +1208,7 @@ public java.util.List getMutationsBuild @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1490,12 +1486,11 @@ public boolean equals(final java.lang.Object obj) { } com.google.bigtable.v2.MutateRowsRequest other = (com.google.bigtable.v2.MutateRowsRequest) obj; - boolean result = true; - result = result && getTableName().equals(other.getTableName()); - result = result && getAppProfileId().equals(other.getAppProfileId()); - result = result && getEntriesList().equals(other.getEntriesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTableName().equals(other.getTableName())) return false; + if (!getAppProfileId().equals(other.getAppProfileId())) return false; + if (!getEntriesList().equals(other.getEntriesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1702,7 +1697,7 @@ public com.google.bigtable.v2.MutateRowsRequest buildPartial() { result.tableName_ = tableName_; result.appProfileId_ = appProfileId_; if (entriesBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { entries_ = java.util.Collections.unmodifiableList(entries_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -1717,35 +1712,35 @@ public com.google.bigtable.v2.MutateRowsRequest 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 @@ -2023,7 +2018,7 @@ public Builder setAppProfileIdBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureEntriesIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { entries_ = new java.util.ArrayList(entries_); bitField0_ |= 0x00000004; @@ -2436,10 +2431,7 @@ public com.google.bigtable.v2.MutateRowsRequest.Entry.Builder addEntriesBuilder( com.google.bigtable.v2.MutateRowsRequest.Entry, com.google.bigtable.v2.MutateRowsRequest.Entry.Builder, com.google.bigtable.v2.MutateRowsRequest.EntryOrBuilder>( - entries_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + entries_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); entries_ = null; } return entriesBuilder_; @@ -2447,7 +2439,7 @@ public com.google.bigtable.v2.MutateRowsRequest.Entry.Builder addEntriesBuilder( @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-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsResponse.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsResponse.java index bb4b5c21e893..630a8414614c 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsResponse.java +++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/MutateRowsResponse.java @@ -52,7 +52,7 @@ private MutateRowsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { entries_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -64,7 +64,7 @@ private MutateRowsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -76,7 +76,7 @@ private MutateRowsResponse( } 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)) { entries_ = java.util.Collections.unmodifiableList(entries_); } this.unknownFields = unknownFields.build(); @@ -167,9 +167,7 @@ private Entry(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private Entry() { - index_ = 0L; - } + private Entry() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -216,7 +214,7 @@ private Entry( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -363,14 +361,13 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.v2.MutateRowsResponse.Entry other = (com.google.bigtable.v2.MutateRowsResponse.Entry) obj; - boolean result = true; - result = result && (getIndex() == other.getIndex()); - result = result && (hasStatus() == other.hasStatus()); + if (getIndex() != other.getIndex()) 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 @@ -572,23 +569,23 @@ public com.google.bigtable.v2.MutateRowsResponse.Entry 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 @@ -596,13 +593,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 @@ -701,7 +698,7 @@ public Builder clearIndex() { return this; } - 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_; @@ -900,7 +897,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 @@ -1058,10 +1055,9 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.v2.MutateRowsResponse other = (com.google.bigtable.v2.MutateRowsResponse) obj; - boolean result = true; - result = result && getEntriesList().equals(other.getEntriesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getEntriesList().equals(other.getEntriesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1257,7 +1253,7 @@ public com.google.bigtable.v2.MutateRowsResponse buildPartial() { new com.google.bigtable.v2.MutateRowsResponse(this); int from_bitField0_ = bitField0_; if (entriesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { entries_ = java.util.Collections.unmodifiableList(entries_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -1271,35 +1267,35 @@ public com.google.bigtable.v2.MutateRowsResponse 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 @@ -1376,7 +1372,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureEntriesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { entries_ = new java.util.ArrayList(entries_); bitField0_ |= 0x00000001; @@ -1717,10 +1713,7 @@ public com.google.bigtable.v2.MutateRowsResponse.Entry.Builder addEntriesBuilder com.google.bigtable.v2.MutateRowsResponse.Entry, com.google.bigtable.v2.MutateRowsResponse.Entry.Builder, com.google.bigtable.v2.MutateRowsResponse.EntryOrBuilder>( - entries_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + entries_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); entries_ = null; } return entriesBuilder_; @@ -1728,7 +1721,7 @@ public com.google.bigtable.v2.MutateRowsResponse.Entry.Builder addEntriesBuilder @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-bigtable-v2/src/main/java/com/google/bigtable/v2/Mutation.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Mutation.java index e7449234e1b0..5602e1be096b 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Mutation.java +++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Mutation.java @@ -117,7 +117,7 @@ private Mutation( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -235,7 +235,6 @@ private SetCell(com.google.protobuf.GeneratedMessageV3.Builder builder) { private SetCell() { familyName_ = ""; columnQualifier_ = com.google.protobuf.ByteString.EMPTY; - timestampMicros_ = 0L; value_ = com.google.protobuf.ByteString.EMPTY; } @@ -287,7 +286,7 @@ private SetCell( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -476,13 +475,12 @@ public boolean equals(final java.lang.Object obj) { } com.google.bigtable.v2.Mutation.SetCell other = (com.google.bigtable.v2.Mutation.SetCell) obj; - boolean result = true; - result = result && getFamilyName().equals(other.getFamilyName()); - result = result && getColumnQualifier().equals(other.getColumnQualifier()); - result = result && (getTimestampMicros() == other.getTimestampMicros()); - result = result && getValue().equals(other.getValue()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getFamilyName().equals(other.getFamilyName())) return false; + if (!getColumnQualifier().equals(other.getColumnQualifier())) return false; + if (getTimestampMicros() != other.getTimestampMicros()) return false; + if (!getValue().equals(other.getValue())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -692,23 +690,23 @@ public com.google.bigtable.v2.Mutation.SetCell 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 @@ -716,13 +714,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 @@ -1035,7 +1033,7 @@ public Builder clearValue() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1234,7 +1232,7 @@ private DeleteFromColumn( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -1425,15 +1423,14 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.v2.Mutation.DeleteFromColumn other = (com.google.bigtable.v2.Mutation.DeleteFromColumn) obj; - boolean result = true; - result = result && getFamilyName().equals(other.getFamilyName()); - result = result && getColumnQualifier().equals(other.getColumnQualifier()); - result = result && (hasTimeRange() == other.hasTimeRange()); + if (!getFamilyName().equals(other.getFamilyName())) return false; + if (!getColumnQualifier().equals(other.getColumnQualifier())) return false; + if (hasTimeRange() != other.hasTimeRange()) return false; if (hasTimeRange()) { - result = result && getTimeRange().equals(other.getTimeRange()); + if (!getTimeRange().equals(other.getTimeRange())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1649,23 +1646,23 @@ public com.google.bigtable.v2.Mutation.DeleteFromColumn 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 @@ -1673,13 +1670,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 @@ -1885,7 +1882,7 @@ public Builder clearColumnQualifier() { return this; } - private com.google.bigtable.v2.TimestampRange timeRange_ = null; + private com.google.bigtable.v2.TimestampRange timeRange_; private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.v2.TimestampRange, com.google.bigtable.v2.TimestampRange.Builder, @@ -2069,7 +2066,7 @@ public com.google.bigtable.v2.TimestampRangeOrBuilder getTimeRangeOrBuilder() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -2202,7 +2199,7 @@ private DeleteFromFamily( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -2324,10 +2321,9 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.v2.Mutation.DeleteFromFamily other = (com.google.bigtable.v2.Mutation.DeleteFromFamily) obj; - boolean result = true; - result = result && getFamilyName().equals(other.getFamilyName()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getFamilyName().equals(other.getFamilyName())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -2522,23 +2518,23 @@ public com.google.bigtable.v2.Mutation.DeleteFromFamily 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 @@ -2546,13 +2542,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 @@ -2704,7 +2700,7 @@ public Builder setFamilyNameBytes(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 @@ -2803,7 +2799,7 @@ private DeleteFromRow( break; default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -2874,9 +2870,8 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.v2.Mutation.DeleteFromRow other = (com.google.bigtable.v2.Mutation.DeleteFromRow) obj; - boolean result = true; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -3066,23 +3061,23 @@ public com.google.bigtable.v2.Mutation.DeleteFromRow 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 @@ -3090,13 +3085,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 @@ -3144,7 +3139,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 @@ -3485,27 +3480,25 @@ public boolean equals(final java.lang.Object obj) { } com.google.bigtable.v2.Mutation other = (com.google.bigtable.v2.Mutation) obj; - boolean result = true; - result = result && getMutationCase().equals(other.getMutationCase()); - if (!result) return false; + if (!getMutationCase().equals(other.getMutationCase())) return false; switch (mutationCase_) { case 1: - result = result && getSetCell().equals(other.getSetCell()); + if (!getSetCell().equals(other.getSetCell())) return false; break; case 2: - result = result && getDeleteFromColumn().equals(other.getDeleteFromColumn()); + if (!getDeleteFromColumn().equals(other.getDeleteFromColumn())) return false; break; case 3: - result = result && getDeleteFromFamily().equals(other.getDeleteFromFamily()); + if (!getDeleteFromFamily().equals(other.getDeleteFromFamily())) return false; break; case 4: - result = result && getDeleteFromRow().equals(other.getDeleteFromRow()); + if (!getDeleteFromRow().equals(other.getDeleteFromRow())) 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 @@ -3741,35 +3734,35 @@ public com.google.bigtable.v2.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 @@ -4664,7 +4657,7 @@ public com.google.bigtable.v2.Mutation.DeleteFromRowOrBuilder getDeleteFromRowOr @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-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowRequest.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowRequest.java index 6fa3652d4dfc..8148abb94b2a 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowRequest.java +++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowRequest.java @@ -67,7 +67,7 @@ private ReadModifyWriteRowRequest( } case 26: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { rules_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; } @@ -85,7 +85,7 @@ private ReadModifyWriteRowRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -97,7 +97,7 @@ private ReadModifyWriteRowRequest( } 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)) { rules_ = java.util.Collections.unmodifiableList(rules_); } this.unknownFields = unknownFields.build(); @@ -367,13 +367,12 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.v2.ReadModifyWriteRowRequest other = (com.google.bigtable.v2.ReadModifyWriteRowRequest) obj; - boolean result = true; - result = result && getTableName().equals(other.getTableName()); - result = result && getAppProfileId().equals(other.getAppProfileId()); - result = result && getRowKey().equals(other.getRowKey()); - result = result && getRulesList().equals(other.getRulesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTableName().equals(other.getTableName())) return false; + if (!getAppProfileId().equals(other.getAppProfileId())) return false; + if (!getRowKey().equals(other.getRowKey())) return false; + if (!getRulesList().equals(other.getRulesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -585,7 +584,7 @@ public com.google.bigtable.v2.ReadModifyWriteRowRequest buildPartial() { result.appProfileId_ = appProfileId_; result.rowKey_ = rowKey_; if (rulesBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { rules_ = java.util.Collections.unmodifiableList(rules_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -600,35 +599,35 @@ public com.google.bigtable.v2.ReadModifyWriteRowRequest 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 @@ -972,7 +971,7 @@ public Builder clearRowKey() { java.util.Collections.emptyList(); private void ensureRulesIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { rules_ = new java.util.ArrayList(rules_); bitField0_ |= 0x00000008; } @@ -1347,10 +1346,7 @@ public com.google.bigtable.v2.ReadModifyWriteRule.Builder addRulesBuilder(int in com.google.bigtable.v2.ReadModifyWriteRule, com.google.bigtable.v2.ReadModifyWriteRule.Builder, com.google.bigtable.v2.ReadModifyWriteRuleOrBuilder>( - rules_, - ((bitField0_ & 0x00000008) == 0x00000008), - getParentForChildren(), - isClean()); + rules_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); rules_ = null; } return rulesBuilder_; @@ -1358,7 +1354,7 @@ public com.google.bigtable.v2.ReadModifyWriteRule.Builder addRulesBuilder(int in @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-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowResponse.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowResponse.java index 8573cb705fb0..86717f0b8316 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowResponse.java +++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRowResponse.java @@ -64,7 +64,7 @@ private ReadModifyWriteRowResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -180,13 +180,12 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.v2.ReadModifyWriteRowResponse other = (com.google.bigtable.v2.ReadModifyWriteRowResponse) obj; - boolean result = true; - result = result && (hasRow() == other.hasRow()); + if (hasRow() != other.hasRow()) return false; if (hasRow()) { - result = result && getRow().equals(other.getRow()); + if (!getRow().equals(other.getRow())) 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.bigtable.v2.ReadModifyWriteRowResponse 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 @@ -466,7 +465,7 @@ public Builder mergeFrom( return this; } - private com.google.bigtable.v2.Row row_ = null; + private com.google.bigtable.v2.Row row_; private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.v2.Row, com.google.bigtable.v2.Row.Builder, @@ -641,7 +640,7 @@ public com.google.bigtable.v2.RowOrBuilder getRowOrBuilder() { @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-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRule.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRule.java index e77d7c3b1f92..330d45fecf8a 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRule.java +++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadModifyWriteRule.java @@ -78,7 +78,7 @@ private ReadModifyWriteRule( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -318,23 +318,21 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.v2.ReadModifyWriteRule other = (com.google.bigtable.v2.ReadModifyWriteRule) obj; - boolean result = true; - result = result && getFamilyName().equals(other.getFamilyName()); - result = result && getColumnQualifier().equals(other.getColumnQualifier()); - result = result && getRuleCase().equals(other.getRuleCase()); - if (!result) return false; + if (!getFamilyName().equals(other.getFamilyName())) return false; + if (!getColumnQualifier().equals(other.getColumnQualifier())) return false; + if (!getRuleCase().equals(other.getRuleCase())) return false; switch (ruleCase_) { case 3: - result = result && getAppendValue().equals(other.getAppendValue()); + if (!getAppendValue().equals(other.getAppendValue())) return false; break; case 4: - result = result && (getIncrementAmount() == other.getIncrementAmount()); + if (getIncrementAmount() != other.getIncrementAmount()) 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 @@ -554,35 +552,35 @@ public com.google.bigtable.v2.ReadModifyWriteRule 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 @@ -931,7 +929,7 @@ public Builder clearIncrementAmount() { @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-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsRequest.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsRequest.java index 8d001d753975..604fc95131d8 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsRequest.java +++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsRequest.java @@ -25,7 +25,6 @@ private ReadRowsRequest(com.google.protobuf.GeneratedMessageV3.Builder builde private ReadRowsRequest() { tableName_ = ""; appProfileId_ = ""; - rowsLimit_ = 0L; } @java.lang.Override @@ -102,7 +101,7 @@ private ReadRowsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -391,20 +390,19 @@ public boolean equals(final java.lang.Object obj) { } com.google.bigtable.v2.ReadRowsRequest other = (com.google.bigtable.v2.ReadRowsRequest) obj; - boolean result = true; - result = result && getTableName().equals(other.getTableName()); - result = result && getAppProfileId().equals(other.getAppProfileId()); - result = result && (hasRows() == other.hasRows()); + if (!getTableName().equals(other.getTableName())) return false; + if (!getAppProfileId().equals(other.getAppProfileId())) return false; + if (hasRows() != other.hasRows()) return false; if (hasRows()) { - result = result && getRows().equals(other.getRows()); + if (!getRows().equals(other.getRows())) return false; } - result = result && (hasFilter() == other.hasFilter()); + if (hasFilter() != other.hasFilter()) return false; if (hasFilter()) { - result = result && getFilter().equals(other.getFilter()); + if (!getFilter().equals(other.getFilter())) return false; } - result = result && (getRowsLimit() == other.getRowsLimit()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getRowsLimit() != other.getRowsLimit()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -637,35 +635,35 @@ public com.google.bigtable.v2.ReadRowsRequest 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 @@ -929,7 +927,7 @@ public Builder setAppProfileIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.bigtable.v2.RowSet rows_ = null; + private com.google.bigtable.v2.RowSet rows_; private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.v2.RowSet, com.google.bigtable.v2.RowSet.Builder, @@ -1103,7 +1101,7 @@ public com.google.bigtable.v2.RowSetOrBuilder getRowsOrBuilder() { return rowsBuilder_; } - private com.google.bigtable.v2.RowFilter filter_ = null; + private com.google.bigtable.v2.RowFilter filter_; private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.v2.RowFilter, com.google.bigtable.v2.RowFilter.Builder, @@ -1336,7 +1334,7 @@ public Builder clearRowsLimit() { @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-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsResponse.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsResponse.java index db6fd2c8f0d8..a6d2a2d97d60 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsResponse.java +++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ReadRowsResponse.java @@ -53,7 +53,7 @@ private ReadRowsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { chunks_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; @@ -71,7 +71,7 @@ private ReadRowsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -83,7 +83,7 @@ private ReadRowsResponse( } 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)) { chunks_ = java.util.Collections.unmodifiableList(chunks_); } this.unknownFields = unknownFields.build(); @@ -358,10 +358,8 @@ private CellChunk(com.google.protobuf.GeneratedMessageV3.Builder builder) { private CellChunk() { rowKey_ = com.google.protobuf.ByteString.EMPTY; - timestampMicros_ = 0L; labels_ = com.google.protobuf.LazyStringArrayList.EMPTY; value_ = com.google.protobuf.ByteString.EMPTY; - valueSize_ = 0; } @java.lang.Override @@ -431,7 +429,7 @@ private CellChunk( case 42: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { labels_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000010; } @@ -462,7 +460,7 @@ private CellChunk( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -474,7 +472,7 @@ private CellChunk( } 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)) { labels_ = labels_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -919,34 +917,32 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.v2.ReadRowsResponse.CellChunk other = (com.google.bigtable.v2.ReadRowsResponse.CellChunk) obj; - boolean result = true; - result = result && getRowKey().equals(other.getRowKey()); - result = result && (hasFamilyName() == other.hasFamilyName()); + if (!getRowKey().equals(other.getRowKey())) return false; + if (hasFamilyName() != other.hasFamilyName()) return false; if (hasFamilyName()) { - result = result && getFamilyName().equals(other.getFamilyName()); + if (!getFamilyName().equals(other.getFamilyName())) return false; } - result = result && (hasQualifier() == other.hasQualifier()); + if (hasQualifier() != other.hasQualifier()) return false; if (hasQualifier()) { - result = result && getQualifier().equals(other.getQualifier()); - } - result = result && (getTimestampMicros() == other.getTimestampMicros()); - result = result && getLabelsList().equals(other.getLabelsList()); - result = result && getValue().equals(other.getValue()); - result = result && (getValueSize() == other.getValueSize()); - result = result && getRowStatusCase().equals(other.getRowStatusCase()); - if (!result) return false; + if (!getQualifier().equals(other.getQualifier())) return false; + } + if (getTimestampMicros() != other.getTimestampMicros()) return false; + if (!getLabelsList().equals(other.getLabelsList())) return false; + if (!getValue().equals(other.getValue())) return false; + if (getValueSize() != other.getValueSize()) return false; + if (!getRowStatusCase().equals(other.getRowStatusCase())) return false; switch (rowStatusCase_) { case 8: - result = result && (getResetRow() == other.getResetRow()); + if (getResetRow() != other.getResetRow()) return false; break; case 9: - result = result && (getCommitRow() == other.getCommitRow()); + if (getCommitRow() != other.getCommitRow()) 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 @@ -1201,7 +1197,7 @@ public com.google.bigtable.v2.ReadRowsResponse.CellChunk buildPartial() { result.qualifier_ = qualifierBuilder_.build(); } result.timestampMicros_ = timestampMicros_; - if (((bitField0_ & 0x00000010) == 0x00000010)) { + if (((bitField0_ & 0x00000010) != 0)) { labels_ = labels_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000010); } @@ -1222,23 +1218,23 @@ public com.google.bigtable.v2.ReadRowsResponse.CellChunk 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 @@ -1246,13 +1242,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 @@ -1414,7 +1410,7 @@ public Builder clearRowKey() { return this; } - private com.google.protobuf.StringValue familyName_ = null; + private com.google.protobuf.StringValue familyName_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.StringValue, com.google.protobuf.StringValue.Builder, @@ -1640,7 +1636,7 @@ public com.google.protobuf.StringValueOrBuilder getFamilyNameOrBuilder() { return familyNameBuilder_; } - private com.google.protobuf.BytesValue qualifier_ = null; + private com.google.protobuf.BytesValue qualifier_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.BytesValue, com.google.protobuf.BytesValue.Builder, @@ -1926,7 +1922,7 @@ public Builder clearTimestampMicros() { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureLabelsIsMutable() { - if (!((bitField0_ & 0x00000010) == 0x00000010)) { + if (!((bitField0_ & 0x00000010) != 0)) { labels_ = new com.google.protobuf.LazyStringArrayList(labels_); bitField0_ |= 0x00000010; } @@ -2300,7 +2296,7 @@ public Builder clearCommitRow() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -2445,11 +2441,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.bigtable.v2.ReadRowsResponse other = (com.google.bigtable.v2.ReadRowsResponse) obj; - boolean result = true; - result = result && getChunksList().equals(other.getChunksList()); - result = result && getLastScannedRowKey().equals(other.getLastScannedRowKey()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getChunksList().equals(other.getChunksList())) return false; + if (!getLastScannedRowKey().equals(other.getLastScannedRowKey())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -2650,7 +2645,7 @@ public com.google.bigtable.v2.ReadRowsResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (chunksBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { chunks_ = java.util.Collections.unmodifiableList(chunks_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -2666,35 +2661,35 @@ public com.google.bigtable.v2.ReadRowsResponse 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 @@ -2774,7 +2769,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureChunksIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { chunks_ = new java.util.ArrayList(chunks_); bitField0_ |= 0x00000001; @@ -2973,10 +2968,7 @@ public com.google.bigtable.v2.ReadRowsResponse.CellChunk.Builder addChunksBuilde com.google.bigtable.v2.ReadRowsResponse.CellChunk, com.google.bigtable.v2.ReadRowsResponse.CellChunk.Builder, com.google.bigtable.v2.ReadRowsResponse.CellChunkOrBuilder>( - chunks_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + chunks_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); chunks_ = null; } return chunksBuilder_; @@ -3050,7 +3042,7 @@ public Builder clearLastScannedRowKey() { @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-bigtable-v2/src/main/java/com/google/bigtable/v2/Row.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Row.java index 649df12b17c0..81390f0ca990 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Row.java +++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/Row.java @@ -59,7 +59,7 @@ private Row( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { families_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -69,7 +69,7 @@ private Row( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -81,7 +81,7 @@ private Row( } 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)) { families_ = java.util.Collections.unmodifiableList(families_); } this.unknownFields = unknownFields.build(); @@ -239,11 +239,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.bigtable.v2.Row other = (com.google.bigtable.v2.Row) obj; - boolean result = true; - result = result && getKey().equals(other.getKey()); - result = result && getFamiliesList().equals(other.getFamiliesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getKey().equals(other.getKey())) return false; + if (!getFamiliesList().equals(other.getFamiliesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -441,7 +440,7 @@ public com.google.bigtable.v2.Row buildPartial() { int to_bitField0_ = 0; result.key_ = key_; if (familiesBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { families_ = java.util.Collections.unmodifiableList(families_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -456,35 +455,35 @@ public com.google.bigtable.v2.Row 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 @@ -617,7 +616,7 @@ public Builder clearKey() { java.util.Collections.emptyList(); private void ensureFamiliesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { families_ = new java.util.ArrayList(families_); bitField0_ |= 0x00000002; } @@ -971,10 +970,7 @@ public java.util.List getFamiliesBuilderL com.google.bigtable.v2.Family, com.google.bigtable.v2.Family.Builder, com.google.bigtable.v2.FamilyOrBuilder>( - families_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + families_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); families_ = null; } return familiesBuilder_; @@ -982,7 +978,7 @@ public java.util.List getFamiliesBuilderL @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-bigtable-v2/src/main/java/com/google/bigtable/v2/RowFilter.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowFilter.java index a7d897d85b90..7f909fb91081 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowFilter.java +++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowFilter.java @@ -251,7 +251,7 @@ private RowFilter( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -396,7 +396,7 @@ private Chain( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { filters_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -407,7 +407,7 @@ private Chain( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -419,7 +419,7 @@ private Chain( } 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)) { filters_ = java.util.Collections.unmodifiableList(filters_); } this.unknownFields = unknownFields.build(); @@ -560,10 +560,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.bigtable.v2.RowFilter.Chain other = (com.google.bigtable.v2.RowFilter.Chain) obj; - boolean result = true; - result = result && getFiltersList().equals(other.getFiltersList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getFiltersList().equals(other.getFiltersList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -761,7 +760,7 @@ public com.google.bigtable.v2.RowFilter.Chain buildPartial() { new com.google.bigtable.v2.RowFilter.Chain(this); int from_bitField0_ = bitField0_; if (filtersBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { filters_ = java.util.Collections.unmodifiableList(filters_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -775,23 +774,23 @@ public com.google.bigtable.v2.RowFilter.Chain 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 @@ -799,13 +798,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 @@ -882,7 +881,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureFiltersIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { filters_ = new java.util.ArrayList(filters_); bitField0_ |= 0x00000001; } @@ -1256,10 +1255,7 @@ public java.util.List getFiltersBuilde com.google.bigtable.v2.RowFilter, com.google.bigtable.v2.RowFilter.Builder, com.google.bigtable.v2.RowFilterOrBuilder>( - filters_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + filters_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); filters_ = null; } return filtersBuilder_; @@ -1268,7 +1264,7 @@ public java.util.List getFiltersBuilde @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1533,7 +1529,7 @@ private Interleave( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { filters_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -1544,7 +1540,7 @@ private Interleave( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -1556,7 +1552,7 @@ private Interleave( } 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)) { filters_ = java.util.Collections.unmodifiableList(filters_); } this.unknownFields = unknownFields.build(); @@ -1798,10 +1794,9 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.v2.RowFilter.Interleave other = (com.google.bigtable.v2.RowFilter.Interleave) obj; - boolean result = true; - result = result && getFiltersList().equals(other.getFiltersList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getFiltersList().equals(other.getFiltersList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -2000,7 +1995,7 @@ public com.google.bigtable.v2.RowFilter.Interleave buildPartial() { new com.google.bigtable.v2.RowFilter.Interleave(this); int from_bitField0_ = bitField0_; if (filtersBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { filters_ = java.util.Collections.unmodifiableList(filters_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -2014,23 +2009,23 @@ public com.google.bigtable.v2.RowFilter.Interleave 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 @@ -2038,13 +2033,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 @@ -2121,7 +2116,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureFiltersIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { filters_ = new java.util.ArrayList(filters_); bitField0_ |= 0x00000001; } @@ -2855,10 +2850,7 @@ public java.util.List getFiltersBuilde com.google.bigtable.v2.RowFilter, com.google.bigtable.v2.RowFilter.Builder, com.google.bigtable.v2.RowFilterOrBuilder>( - filters_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + filters_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); filters_ = null; } return filtersBuilder_; @@ -2867,7 +2859,7 @@ public java.util.List getFiltersBuilde @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -3123,7 +3115,7 @@ private Condition( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -3347,21 +3339,20 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.v2.RowFilter.Condition other = (com.google.bigtable.v2.RowFilter.Condition) obj; - boolean result = true; - result = result && (hasPredicateFilter() == other.hasPredicateFilter()); + if (hasPredicateFilter() != other.hasPredicateFilter()) return false; if (hasPredicateFilter()) { - result = result && getPredicateFilter().equals(other.getPredicateFilter()); + if (!getPredicateFilter().equals(other.getPredicateFilter())) return false; } - result = result && (hasTrueFilter() == other.hasTrueFilter()); + if (hasTrueFilter() != other.hasTrueFilter()) return false; if (hasTrueFilter()) { - result = result && getTrueFilter().equals(other.getTrueFilter()); + if (!getTrueFilter().equals(other.getTrueFilter())) return false; } - result = result && (hasFalseFilter() == other.hasFalseFilter()); + if (hasFalseFilter() != other.hasFalseFilter()) return false; if (hasFalseFilter()) { - result = result && getFalseFilter().equals(other.getFalseFilter()); + if (!getFalseFilter().equals(other.getFalseFilter())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -3601,23 +3592,23 @@ public com.google.bigtable.v2.RowFilter.Condition 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 @@ -3625,13 +3616,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 @@ -3684,7 +3675,7 @@ public Builder mergeFrom( return this; } - private com.google.bigtable.v2.RowFilter predicateFilter_ = null; + private com.google.bigtable.v2.RowFilter predicateFilter_; private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.v2.RowFilter, com.google.bigtable.v2.RowFilter.Builder, @@ -3874,7 +3865,7 @@ public com.google.bigtable.v2.RowFilterOrBuilder getPredicateFilterOrBuilder() { return predicateFilterBuilder_; } - private com.google.bigtable.v2.RowFilter trueFilter_ = null; + private com.google.bigtable.v2.RowFilter trueFilter_; private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.v2.RowFilter, com.google.bigtable.v2.RowFilter.Builder, @@ -4064,7 +4055,7 @@ public com.google.bigtable.v2.RowFilterOrBuilder getTrueFilterOrBuilder() { return trueFilterBuilder_; } - private com.google.bigtable.v2.RowFilter falseFilter_ = null; + private com.google.bigtable.v2.RowFilter falseFilter_; private com.google.protobuf.SingleFieldBuilderV3< com.google.bigtable.v2.RowFilter, com.google.bigtable.v2.RowFilter.Builder, @@ -4266,7 +4257,7 @@ public com.google.bigtable.v2.RowFilterOrBuilder getFalseFilterOrBuilder() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -5266,76 +5257,72 @@ public boolean equals(final java.lang.Object obj) { } com.google.bigtable.v2.RowFilter other = (com.google.bigtable.v2.RowFilter) obj; - boolean result = true; - result = result && getFilterCase().equals(other.getFilterCase()); - if (!result) return false; + if (!getFilterCase().equals(other.getFilterCase())) return false; switch (filterCase_) { case 1: - result = result && getChain().equals(other.getChain()); + if (!getChain().equals(other.getChain())) return false; break; case 2: - result = result && getInterleave().equals(other.getInterleave()); + if (!getInterleave().equals(other.getInterleave())) return false; break; case 3: - result = result && getCondition().equals(other.getCondition()); + if (!getCondition().equals(other.getCondition())) return false; break; case 16: - result = result && (getSink() == other.getSink()); + if (getSink() != other.getSink()) return false; break; case 17: - result = result && (getPassAllFilter() == other.getPassAllFilter()); + if (getPassAllFilter() != other.getPassAllFilter()) return false; break; case 18: - result = result && (getBlockAllFilter() == other.getBlockAllFilter()); + if (getBlockAllFilter() != other.getBlockAllFilter()) return false; break; case 4: - result = result && getRowKeyRegexFilter().equals(other.getRowKeyRegexFilter()); + if (!getRowKeyRegexFilter().equals(other.getRowKeyRegexFilter())) return false; break; case 14: - result = - result - && (java.lang.Double.doubleToLongBits(getRowSampleFilter()) - == java.lang.Double.doubleToLongBits(other.getRowSampleFilter())); + if (java.lang.Double.doubleToLongBits(getRowSampleFilter()) + != java.lang.Double.doubleToLongBits(other.getRowSampleFilter())) return false; break; case 5: - result = result && getFamilyNameRegexFilter().equals(other.getFamilyNameRegexFilter()); + if (!getFamilyNameRegexFilter().equals(other.getFamilyNameRegexFilter())) return false; break; case 6: - result = - result && getColumnQualifierRegexFilter().equals(other.getColumnQualifierRegexFilter()); + if (!getColumnQualifierRegexFilter().equals(other.getColumnQualifierRegexFilter())) + return false; break; case 7: - result = result && getColumnRangeFilter().equals(other.getColumnRangeFilter()); + if (!getColumnRangeFilter().equals(other.getColumnRangeFilter())) return false; break; case 8: - result = result && getTimestampRangeFilter().equals(other.getTimestampRangeFilter()); + if (!getTimestampRangeFilter().equals(other.getTimestampRangeFilter())) return false; break; case 9: - result = result && getValueRegexFilter().equals(other.getValueRegexFilter()); + if (!getValueRegexFilter().equals(other.getValueRegexFilter())) return false; break; case 15: - result = result && getValueRangeFilter().equals(other.getValueRangeFilter()); + if (!getValueRangeFilter().equals(other.getValueRangeFilter())) return false; break; case 10: - result = result && (getCellsPerRowOffsetFilter() == other.getCellsPerRowOffsetFilter()); + if (getCellsPerRowOffsetFilter() != other.getCellsPerRowOffsetFilter()) return false; break; case 11: - result = result && (getCellsPerRowLimitFilter() == other.getCellsPerRowLimitFilter()); + if (getCellsPerRowLimitFilter() != other.getCellsPerRowLimitFilter()) return false; break; case 12: - result = result && (getCellsPerColumnLimitFilter() == other.getCellsPerColumnLimitFilter()); + if (getCellsPerColumnLimitFilter() != other.getCellsPerColumnLimitFilter()) return false; break; case 13: - result = result && (getStripValueTransformer() == other.getStripValueTransformer()); + if (getStripValueTransformer() != other.getStripValueTransformer()) return false; break; case 19: - result = result && getApplyLabelTransformer().equals(other.getApplyLabelTransformer()); + if (!getApplyLabelTransformer().equals(other.getApplyLabelTransformer())) 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 @@ -5715,35 +5702,35 @@ public com.google.bigtable.v2.RowFilter 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 @@ -8201,7 +8188,7 @@ public Builder setApplyLabelTransformerBytes(com.google.protobuf.ByteString valu @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-bigtable-v2/src/main/java/com/google/bigtable/v2/RowRange.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowRange.java index 8c89d604c024..0a89c0618c0a 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowRange.java +++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowRange.java @@ -74,7 +74,7 @@ private RowRange( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -322,33 +322,30 @@ public boolean equals(final java.lang.Object obj) { } com.google.bigtable.v2.RowRange other = (com.google.bigtable.v2.RowRange) obj; - boolean result = true; - result = result && getStartKeyCase().equals(other.getStartKeyCase()); - if (!result) return false; + if (!getStartKeyCase().equals(other.getStartKeyCase())) return false; switch (startKeyCase_) { case 1: - result = result && getStartKeyClosed().equals(other.getStartKeyClosed()); + if (!getStartKeyClosed().equals(other.getStartKeyClosed())) return false; break; case 2: - result = result && getStartKeyOpen().equals(other.getStartKeyOpen()); + if (!getStartKeyOpen().equals(other.getStartKeyOpen())) return false; break; case 0: default: } - result = result && getEndKeyCase().equals(other.getEndKeyCase()); - if (!result) return false; + if (!getEndKeyCase().equals(other.getEndKeyCase())) return false; switch (endKeyCase_) { case 3: - result = result && getEndKeyOpen().equals(other.getEndKeyOpen()); + if (!getEndKeyOpen().equals(other.getEndKeyOpen())) return false; break; case 4: - result = result && getEndKeyClosed().equals(other.getEndKeyClosed()); + if (!getEndKeyClosed().equals(other.getEndKeyClosed())) 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 @@ -575,35 +572,35 @@ public com.google.bigtable.v2.RowRange 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 @@ -913,7 +910,7 @@ public Builder clearEndKeyClosed() { @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-bigtable-v2/src/main/java/com/google/bigtable/v2/RowSet.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowSet.java index 638f7aebb49f..4a1af106fa10 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowSet.java +++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/RowSet.java @@ -53,7 +53,7 @@ private RowSet( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { rowKeys_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -62,7 +62,7 @@ private RowSet( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { rowRanges_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -72,7 +72,7 @@ private RowSet( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -84,10 +84,10 @@ private RowSet( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - rowKeys_ = java.util.Collections.unmodifiableList(rowKeys_); + if (((mutable_bitField0_ & 0x00000001) != 0)) { + rowKeys_ = java.util.Collections.unmodifiableList(rowKeys_); // C } - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (((mutable_bitField0_ & 0x00000002) != 0)) { rowRanges_ = java.util.Collections.unmodifiableList(rowRanges_); } this.unknownFields = unknownFields.build(); @@ -266,11 +266,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.bigtable.v2.RowSet other = (com.google.bigtable.v2.RowSet) obj; - boolean result = true; - result = result && getRowKeysList().equals(other.getRowKeysList()); - result = result && getRowRangesList().equals(other.getRowRangesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getRowKeysList().equals(other.getRowKeysList())) return false; + if (!getRowRangesList().equals(other.getRowRangesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -466,13 +465,13 @@ public com.google.bigtable.v2.RowSet build() { public com.google.bigtable.v2.RowSet buildPartial() { com.google.bigtable.v2.RowSet result = new com.google.bigtable.v2.RowSet(this); int from_bitField0_ = bitField0_; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { rowKeys_ = java.util.Collections.unmodifiableList(rowKeys_); bitField0_ = (bitField0_ & ~0x00000001); } result.rowKeys_ = rowKeys_; if (rowRangesBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { rowRanges_ = java.util.Collections.unmodifiableList(rowRanges_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -486,35 +485,35 @@ public com.google.bigtable.v2.RowSet 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 @@ -601,7 +600,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureRowKeysIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { rowKeys_ = new java.util.ArrayList(rowKeys_); bitField0_ |= 0x00000001; } @@ -616,7 +615,9 @@ private void ensureRowKeysIsMutable() { * repeated bytes row_keys = 1; */ public java.util.List getRowKeysList() { - return java.util.Collections.unmodifiableList(rowKeys_); + return ((bitField0_ & 0x00000001) != 0) + ? java.util.Collections.unmodifiableList(rowKeys_) + : rowKeys_; } /** * @@ -714,7 +715,7 @@ public Builder clearRowKeys() { java.util.Collections.emptyList(); private void ensureRowRangesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { rowRanges_ = new java.util.ArrayList(rowRanges_); bitField0_ |= 0x00000002; } @@ -1052,10 +1053,7 @@ public java.util.List getRowRangesBuild com.google.bigtable.v2.RowRange, com.google.bigtable.v2.RowRange.Builder, com.google.bigtable.v2.RowRangeOrBuilder>( - rowRanges_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + rowRanges_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); rowRanges_ = null; } return rowRangesBuilder_; @@ -1063,7 +1061,7 @@ public java.util.List getRowRangesBuild @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-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysRequest.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysRequest.java index 38d69309f2ac..c318713c3f47 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysRequest.java +++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysRequest.java @@ -67,7 +67,7 @@ private SampleRowKeysRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -242,11 +242,10 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.v2.SampleRowKeysRequest other = (com.google.bigtable.v2.SampleRowKeysRequest) obj; - boolean result = true; - result = result && getTableName().equals(other.getTableName()); - result = result && getAppProfileId().equals(other.getAppProfileId()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTableName().equals(other.getTableName())) return false; + if (!getAppProfileId().equals(other.getAppProfileId())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -444,35 +443,35 @@ public com.google.bigtable.v2.SampleRowKeysRequest 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 @@ -729,7 +728,7 @@ public Builder setAppProfileIdBytes(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-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysResponse.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysResponse.java index f8b13d5d4db9..15339cd49d01 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysResponse.java +++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/SampleRowKeysResponse.java @@ -24,7 +24,6 @@ private SampleRowKeysResponse(com.google.protobuf.GeneratedMessageV3.Builder private SampleRowKeysResponse() { rowKey_ = com.google.protobuf.ByteString.EMPTY; - offsetBytes_ = 0L; } @java.lang.Override @@ -63,7 +62,7 @@ private SampleRowKeysResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -185,11 +184,10 @@ public boolean equals(final java.lang.Object obj) { com.google.bigtable.v2.SampleRowKeysResponse other = (com.google.bigtable.v2.SampleRowKeysResponse) obj; - boolean result = true; - result = result && getRowKey().equals(other.getRowKey()); - result = result && (getOffsetBytes() == other.getOffsetBytes()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getRowKey().equals(other.getRowKey())) return false; + if (getOffsetBytes() != other.getOffsetBytes()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -387,35 +385,35 @@ public com.google.bigtable.v2.SampleRowKeysResponse 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 @@ -585,7 +583,7 @@ public Builder clearOffsetBytes() { @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-bigtable-v2/src/main/java/com/google/bigtable/v2/TimestampRange.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/TimestampRange.java index fb1cbb7421c0..0fd181b80808 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/TimestampRange.java +++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/TimestampRange.java @@ -22,10 +22,7 @@ private TimestampRange(com.google.protobuf.GeneratedMessageV3.Builder builder super(builder); } - private TimestampRange() { - startTimestampMicros_ = 0L; - endTimestampMicros_ = 0L; - } + private TimestampRange() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -63,7 +60,7 @@ private TimestampRange( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -175,11 +172,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.bigtable.v2.TimestampRange other = (com.google.bigtable.v2.TimestampRange) obj; - boolean result = true; - result = result && (getStartTimestampMicros() == other.getStartTimestampMicros()); - result = result && (getEndTimestampMicros() == other.getEndTimestampMicros()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getStartTimestampMicros() != other.getStartTimestampMicros()) return false; + if (getEndTimestampMicros() != other.getEndTimestampMicros()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -376,35 +372,35 @@ public com.google.bigtable.v2.TimestampRange 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 @@ -544,7 +540,7 @@ public Builder clearEndTimestampMicros() { @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-bigtable-v2/src/main/java/com/google/bigtable/v2/ValueRange.java b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ValueRange.java index 30e73ac1d612..a6ea61a5c42b 100644 --- a/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ValueRange.java +++ b/google-api-grpc/proto-google-cloud-bigtable-v2/src/main/java/com/google/bigtable/v2/ValueRange.java @@ -74,7 +74,7 @@ private ValueRange( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -324,33 +324,30 @@ public boolean equals(final java.lang.Object obj) { } com.google.bigtable.v2.ValueRange other = (com.google.bigtable.v2.ValueRange) obj; - boolean result = true; - result = result && getStartValueCase().equals(other.getStartValueCase()); - if (!result) return false; + if (!getStartValueCase().equals(other.getStartValueCase())) return false; switch (startValueCase_) { case 1: - result = result && getStartValueClosed().equals(other.getStartValueClosed()); + if (!getStartValueClosed().equals(other.getStartValueClosed())) return false; break; case 2: - result = result && getStartValueOpen().equals(other.getStartValueOpen()); + if (!getStartValueOpen().equals(other.getStartValueOpen())) return false; break; case 0: default: } - result = result && getEndValueCase().equals(other.getEndValueCase()); - if (!result) return false; + if (!getEndValueCase().equals(other.getEndValueCase())) return false; switch (endValueCase_) { case 3: - result = result && getEndValueClosed().equals(other.getEndValueClosed()); + if (!getEndValueClosed().equals(other.getEndValueClosed())) return false; break; case 4: - result = result && getEndValueOpen().equals(other.getEndValueOpen()); + if (!getEndValueOpen().equals(other.getEndValueOpen())) 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 @@ -578,35 +575,35 @@ public com.google.bigtable.v2.ValueRange 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 @@ -916,7 +913,7 @@ public Builder clearEndValueOpen() { @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-bigtable/synth.metadata b/google-cloud-clients/google-cloud-bigtable/synth.metadata index 10ebc5104d21..ee8517745711 100644 --- a/google-cloud-clients/google-cloud-bigtable/synth.metadata +++ b/google-cloud-clients/google-cloud-bigtable/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-03-28T07:36:24.739456Z", + "updateTime": "2019-03-29T07:36:08.929711Z", "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" } } ],