diff --git a/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/CreateIndexRequest.java b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/CreateIndexRequest.java index 6ec27cf4b34b..0b82f2756d97 100644 --- a/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/CreateIndexRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/CreateIndexRequest.java @@ -75,7 +75,7 @@ private CreateIndexRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -242,14 +242,13 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.admin.v1.CreateIndexRequest other = (com.google.firestore.admin.v1.CreateIndexRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && (hasIndex() == other.hasIndex()); + if (!getParent().equals(other.getParent())) return false; + if (hasIndex() != other.hasIndex()) return false; if (hasIndex()) { - result = result && getIndex().equals(other.getIndex()); + if (!getIndex().equals(other.getIndex())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -457,35 +456,35 @@ public com.google.firestore.admin.v1.CreateIndexRequest 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 @@ -636,7 +635,7 @@ public Builder setParentBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.firestore.admin.v1.Index index_ = null; + private com.google.firestore.admin.v1.Index index_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.admin.v1.Index, com.google.firestore.admin.v1.Index.Builder, @@ -815,7 +814,7 @@ public com.google.firestore.admin.v1.IndexOrBuilder getIndexOrBuilder() { @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-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/DeleteIndexRequest.java b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/DeleteIndexRequest.java index 1d887567c0b7..00bec550cf4d 100644 --- a/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/DeleteIndexRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/DeleteIndexRequest.java @@ -59,7 +59,7 @@ private DeleteIndexRequest( } 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.firestore.admin.v1.DeleteIndexRequest other = (com.google.firestore.admin.v1.DeleteIndexRequest) 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.firestore.admin.v1.DeleteIndexRequest 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-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ExportDocumentsMetadata.java b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ExportDocumentsMetadata.java index 7ddc080e3095..49ac0425ff73 100644 --- a/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ExportDocumentsMetadata.java +++ b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ExportDocumentsMetadata.java @@ -125,7 +125,7 @@ private ExportDocumentsMetadata( case 50: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (!((mutable_bitField0_ & 0x00000020) != 0)) { collectionIds_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000020; } @@ -141,7 +141,7 @@ private ExportDocumentsMetadata( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -153,7 +153,7 @@ private ExportDocumentsMetadata( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (((mutable_bitField0_ & 0x00000020) != 0)) { collectionIds_ = collectionIds_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -552,28 +552,27 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.admin.v1.ExportDocumentsMetadata other = (com.google.firestore.admin.v1.ExportDocumentsMetadata) obj; - boolean result = true; - result = result && (hasStartTime() == other.hasStartTime()); + if (hasStartTime() != other.hasStartTime()) return false; if (hasStartTime()) { - result = result && getStartTime().equals(other.getStartTime()); + if (!getStartTime().equals(other.getStartTime())) return false; } - result = result && (hasEndTime() == other.hasEndTime()); + if (hasEndTime() != other.hasEndTime()) return false; if (hasEndTime()) { - result = result && getEndTime().equals(other.getEndTime()); + if (!getEndTime().equals(other.getEndTime())) return false; } - result = result && operationState_ == other.operationState_; - result = result && (hasProgressDocuments() == other.hasProgressDocuments()); + if (operationState_ != other.operationState_) return false; + if (hasProgressDocuments() != other.hasProgressDocuments()) return false; if (hasProgressDocuments()) { - result = result && getProgressDocuments().equals(other.getProgressDocuments()); + if (!getProgressDocuments().equals(other.getProgressDocuments())) return false; } - result = result && (hasProgressBytes() == other.hasProgressBytes()); + if (hasProgressBytes() != other.hasProgressBytes()) return false; if (hasProgressBytes()) { - result = result && getProgressBytes().equals(other.getProgressBytes()); + if (!getProgressBytes().equals(other.getProgressBytes())) return false; } - result = result && getCollectionIdsList().equals(other.getCollectionIdsList()); - result = result && getOutputUriPrefix().equals(other.getOutputUriPrefix()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getCollectionIdsList().equals(other.getCollectionIdsList())) return false; + if (!getOutputUriPrefix().equals(other.getOutputUriPrefix())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -834,7 +833,7 @@ public com.google.firestore.admin.v1.ExportDocumentsMetadata buildPartial() { } else { result.progressBytes_ = progressBytesBuilder_.build(); } - if (((bitField0_ & 0x00000020) == 0x00000020)) { + if (((bitField0_ & 0x00000020) != 0)) { collectionIds_ = collectionIds_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000020); } @@ -847,35 +846,35 @@ public com.google.firestore.admin.v1.ExportDocumentsMetadata 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 @@ -952,7 +951,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.protobuf.Timestamp startTime_ = null; + private com.google.protobuf.Timestamp startTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1127,7 +1126,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { return startTimeBuilder_; } - private com.google.protobuf.Timestamp endTime_ = null; + private com.google.protobuf.Timestamp endTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1387,7 +1386,7 @@ public Builder clearOperationState() { return this; } - private com.google.firestore.admin.v1.Progress progressDocuments_ = null; + private com.google.firestore.admin.v1.Progress progressDocuments_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.admin.v1.Progress, com.google.firestore.admin.v1.Progress.Builder, @@ -1569,7 +1568,7 @@ public com.google.firestore.admin.v1.ProgressOrBuilder getProgressDocumentsOrBui return progressDocumentsBuilder_; } - private com.google.firestore.admin.v1.Progress progressBytes_ = null; + private com.google.firestore.admin.v1.Progress progressBytes_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.admin.v1.Progress, com.google.firestore.admin.v1.Progress.Builder, @@ -1755,7 +1754,7 @@ public com.google.firestore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureCollectionIdsIsMutable() { - if (!((bitField0_ & 0x00000020) == 0x00000020)) { + if (!((bitField0_ & 0x00000020) != 0)) { collectionIds_ = new com.google.protobuf.LazyStringArrayList(collectionIds_); bitField0_ |= 0x00000020; } @@ -1990,7 +1989,7 @@ public Builder setOutputUriPrefixBytes(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-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ExportDocumentsRequest.java b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ExportDocumentsRequest.java index a0e6235d075d..a373bdb0c728 100644 --- a/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ExportDocumentsRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ExportDocumentsRequest.java @@ -62,7 +62,7 @@ private ExportDocumentsRequest( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { collectionIds_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -78,7 +78,7 @@ private ExportDocumentsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -90,7 +90,7 @@ private ExportDocumentsRequest( } 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)) { collectionIds_ = collectionIds_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -329,12 +329,11 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.admin.v1.ExportDocumentsRequest other = (com.google.firestore.admin.v1.ExportDocumentsRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getCollectionIdsList().equals(other.getCollectionIdsList()); - result = result && getOutputUriPrefix().equals(other.getOutputUriPrefix()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getCollectionIdsList().equals(other.getCollectionIdsList())) return false; + if (!getOutputUriPrefix().equals(other.getOutputUriPrefix())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -533,7 +532,7 @@ public com.google.firestore.admin.v1.ExportDocumentsRequest buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.name_ = name_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { collectionIds_ = collectionIds_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } @@ -546,35 +545,35 @@ public com.google.firestore.admin.v1.ExportDocumentsRequest 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 @@ -743,7 +742,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureCollectionIdsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { collectionIds_ = new com.google.protobuf.LazyStringArrayList(collectionIds_); bitField0_ |= 0x00000002; } @@ -1013,7 +1012,7 @@ public Builder setOutputUriPrefixBytes(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-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ExportDocumentsResponse.java b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ExportDocumentsResponse.java index 6fe726211a8d..fde880e1194b 100644 --- a/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ExportDocumentsResponse.java +++ b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ExportDocumentsResponse.java @@ -59,7 +59,7 @@ private ExportDocumentsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -183,10 +183,9 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.admin.v1.ExportDocumentsResponse other = (com.google.firestore.admin.v1.ExportDocumentsResponse) obj; - boolean result = true; - result = result && getOutputUriPrefix().equals(other.getOutputUriPrefix()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getOutputUriPrefix().equals(other.getOutputUriPrefix())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -380,35 +379,35 @@ public com.google.firestore.admin.v1.ExportDocumentsResponse 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 @@ -564,7 +563,7 @@ public Builder setOutputUriPrefixBytes(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-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/Field.java b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/Field.java index cd4f1f7afcc2..fd46aae91523 100644 --- a/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/Field.java +++ b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/Field.java @@ -77,7 +77,7 @@ private Field( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -245,9 +245,7 @@ private IndexConfig(com.google.protobuf.GeneratedMessageV3.Builder builder) { private IndexConfig() { indexes_ = java.util.Collections.emptyList(); - usesAncestorConfig_ = false; ancestorField_ = ""; - reverting_ = false; } @java.lang.Override @@ -276,7 +274,7 @@ private IndexConfig( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { indexes_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -304,7 +302,7 @@ private IndexConfig( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -316,7 +314,7 @@ private IndexConfig( } 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)) { indexes_ = java.util.Collections.unmodifiableList(indexes_); } this.unknownFields = unknownFields.build(); @@ -555,13 +553,12 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.admin.v1.Field.IndexConfig other = (com.google.firestore.admin.v1.Field.IndexConfig) obj; - boolean result = true; - result = result && getIndexesList().equals(other.getIndexesList()); - result = result && (getUsesAncestorConfig() == other.getUsesAncestorConfig()); - result = result && getAncestorField().equals(other.getAncestorField()); - result = result && (getReverting() == other.getReverting()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getIndexesList().equals(other.getIndexesList())) return false; + if (getUsesAncestorConfig() != other.getUsesAncestorConfig()) return false; + if (!getAncestorField().equals(other.getAncestorField())) return false; + if (getReverting() != other.getReverting()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -772,7 +769,7 @@ public com.google.firestore.admin.v1.Field.IndexConfig buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (indexesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { indexes_ = java.util.Collections.unmodifiableList(indexes_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -790,23 +787,23 @@ public com.google.firestore.admin.v1.Field.IndexConfig 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 @@ -814,13 +811,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 @@ -909,7 +906,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureIndexesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { indexes_ = new java.util.ArrayList(indexes_); bitField0_ |= 0x00000001; } @@ -1247,10 +1244,7 @@ public java.util.List getIndexesBui com.google.firestore.admin.v1.Index, com.google.firestore.admin.v1.Index.Builder, com.google.firestore.admin.v1.IndexOrBuilder>( - indexes_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + indexes_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); indexes_ = null; } return indexesBuilder_; @@ -1482,7 +1476,7 @@ public Builder clearReverting() { @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,14 +1710,13 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.admin.v1.Field other = (com.google.firestore.admin.v1.Field) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (hasIndexConfig() == other.hasIndexConfig()); + if (!getName().equals(other.getName())) return false; + if (hasIndexConfig() != other.hasIndexConfig()) return false; if (hasIndexConfig()) { - result = result && getIndexConfig().equals(other.getIndexConfig()); + if (!getIndexConfig().equals(other.getIndexConfig())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1931,35 +1924,35 @@ public com.google.firestore.admin.v1.Field buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override 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 @@ -2209,7 +2202,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.firestore.admin.v1.Field.IndexConfig indexConfig_ = null; + private com.google.firestore.admin.v1.Field.IndexConfig indexConfig_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.admin.v1.Field.IndexConfig, com.google.firestore.admin.v1.Field.IndexConfig.Builder, @@ -2420,7 +2413,7 @@ public com.google.firestore.admin.v1.Field.IndexConfigOrBuilder getIndexConfigOr @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-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/FieldOperationMetadata.java b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/FieldOperationMetadata.java index 1f1237648846..1a54fa647bae 100644 --- a/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/FieldOperationMetadata.java +++ b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/FieldOperationMetadata.java @@ -92,7 +92,7 @@ private FieldOperationMetadata( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { indexConfigDeltas_ = new java.util.ArrayList< com.google.firestore.admin.v1.FieldOperationMetadata.IndexConfigDelta>(); @@ -146,7 +146,7 @@ private FieldOperationMetadata( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -158,7 +158,7 @@ private FieldOperationMetadata( } 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)) { indexConfigDeltas_ = java.util.Collections.unmodifiableList(indexConfigDeltas_); } this.unknownFields = unknownFields.build(); @@ -315,7 +315,7 @@ private IndexConfigDelta( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -630,14 +630,13 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.admin.v1.FieldOperationMetadata.IndexConfigDelta other = (com.google.firestore.admin.v1.FieldOperationMetadata.IndexConfigDelta) obj; - boolean result = true; - result = result && changeType_ == other.changeType_; - result = result && (hasIndex() == other.hasIndex()); + if (changeType_ != other.changeType_) return false; + if (hasIndex() != other.hasIndex()) return false; if (hasIndex()) { - result = result && getIndex().equals(other.getIndex()); + if (!getIndex().equals(other.getIndex())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -854,23 +853,23 @@ public com.google.firestore.admin.v1.FieldOperationMetadata.IndexConfigDelta 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 @@ -878,13 +877,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 @@ -1033,7 +1032,7 @@ public Builder clearChangeType() { return this; } - private com.google.firestore.admin.v1.Index index_ = null; + private com.google.firestore.admin.v1.Index index_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.admin.v1.Index, com.google.firestore.admin.v1.Index.Builder, @@ -1213,7 +1212,7 @@ public com.google.firestore.admin.v1.IndexOrBuilder getIndexOrBuilder() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1673,28 +1672,27 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.admin.v1.FieldOperationMetadata other = (com.google.firestore.admin.v1.FieldOperationMetadata) obj; - boolean result = true; - result = result && (hasStartTime() == other.hasStartTime()); + if (hasStartTime() != other.hasStartTime()) return false; if (hasStartTime()) { - result = result && getStartTime().equals(other.getStartTime()); + if (!getStartTime().equals(other.getStartTime())) return false; } - result = result && (hasEndTime() == other.hasEndTime()); + if (hasEndTime() != other.hasEndTime()) return false; if (hasEndTime()) { - result = result && getEndTime().equals(other.getEndTime()); + if (!getEndTime().equals(other.getEndTime())) return false; } - result = result && getField().equals(other.getField()); - result = result && getIndexConfigDeltasList().equals(other.getIndexConfigDeltasList()); - result = result && state_ == other.state_; - result = result && (hasProgressDocuments() == other.hasProgressDocuments()); + if (!getField().equals(other.getField())) return false; + if (!getIndexConfigDeltasList().equals(other.getIndexConfigDeltasList())) return false; + if (state_ != other.state_) return false; + if (hasProgressDocuments() != other.hasProgressDocuments()) return false; if (hasProgressDocuments()) { - result = result && getProgressDocuments().equals(other.getProgressDocuments()); + if (!getProgressDocuments().equals(other.getProgressDocuments())) return false; } - result = result && (hasProgressBytes() == other.hasProgressBytes()); + if (hasProgressBytes() != other.hasProgressBytes()) return false; if (hasProgressBytes()) { - result = result && getProgressBytes().equals(other.getProgressBytes()); + if (!getProgressBytes().equals(other.getProgressBytes())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -1951,7 +1949,7 @@ public com.google.firestore.admin.v1.FieldOperationMetadata buildPartial() { } result.field_ = field_; if (indexConfigDeltasBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { indexConfigDeltas_ = java.util.Collections.unmodifiableList(indexConfigDeltas_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -1977,35 +1975,35 @@ public com.google.firestore.admin.v1.FieldOperationMetadata 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 @@ -2099,7 +2097,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.protobuf.Timestamp startTime_ = null; + private com.google.protobuf.Timestamp startTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -2274,7 +2272,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { return startTimeBuilder_; } - private com.google.protobuf.Timestamp endTime_ = null; + private com.google.protobuf.Timestamp endTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -2561,7 +2559,7 @@ public Builder setFieldBytes(com.google.protobuf.ByteString value) { indexConfigDeltas_ = java.util.Collections.emptyList(); private void ensureIndexConfigDeltasIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { indexConfigDeltas_ = new java.util.ArrayList< com.google.firestore.admin.v1.FieldOperationMetadata.IndexConfigDelta>( @@ -2983,7 +2981,7 @@ public Builder removeIndexConfigDeltas(int index) { com.google.firestore.admin.v1.FieldOperationMetadata.IndexConfigDelta.Builder, com.google.firestore.admin.v1.FieldOperationMetadata.IndexConfigDeltaOrBuilder>( indexConfigDeltas_, - ((bitField0_ & 0x00000008) == 0x00000008), + ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); indexConfigDeltas_ = null; @@ -3067,7 +3065,7 @@ public Builder clearState() { return this; } - private com.google.firestore.admin.v1.Progress progressDocuments_ = null; + private com.google.firestore.admin.v1.Progress progressDocuments_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.admin.v1.Progress, com.google.firestore.admin.v1.Progress.Builder, @@ -3249,7 +3247,7 @@ public com.google.firestore.admin.v1.ProgressOrBuilder getProgressDocumentsOrBui return progressDocumentsBuilder_; } - private com.google.firestore.admin.v1.Progress progressBytes_ = null; + private com.google.firestore.admin.v1.Progress progressBytes_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.admin.v1.Progress, com.google.firestore.admin.v1.Progress.Builder, @@ -3433,7 +3431,7 @@ public com.google.firestore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder @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-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/GetFieldRequest.java b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/GetFieldRequest.java index 22c24383e2b6..d13ea0a47fd5 100644 --- a/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/GetFieldRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/GetFieldRequest.java @@ -59,7 +59,7 @@ private GetFieldRequest( } 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.firestore.admin.v1.GetFieldRequest other = (com.google.firestore.admin.v1.GetFieldRequest) 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.firestore.admin.v1.GetFieldRequest 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-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/GetIndexRequest.java b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/GetIndexRequest.java index 2e318046789e..6af9c616e23a 100644 --- a/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/GetIndexRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/GetIndexRequest.java @@ -59,7 +59,7 @@ private GetIndexRequest( } 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.firestore.admin.v1.GetIndexRequest other = (com.google.firestore.admin.v1.GetIndexRequest) 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.firestore.admin.v1.GetIndexRequest 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-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ImportDocumentsMetadata.java b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ImportDocumentsMetadata.java index 9df25955c345..08f356bd9036 100644 --- a/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ImportDocumentsMetadata.java +++ b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ImportDocumentsMetadata.java @@ -125,7 +125,7 @@ private ImportDocumentsMetadata( case 50: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (!((mutable_bitField0_ & 0x00000020) != 0)) { collectionIds_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000020; } @@ -141,7 +141,7 @@ private ImportDocumentsMetadata( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -153,7 +153,7 @@ private ImportDocumentsMetadata( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000020) == 0x00000020)) { + if (((mutable_bitField0_ & 0x00000020) != 0)) { collectionIds_ = collectionIds_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -552,28 +552,27 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.admin.v1.ImportDocumentsMetadata other = (com.google.firestore.admin.v1.ImportDocumentsMetadata) obj; - boolean result = true; - result = result && (hasStartTime() == other.hasStartTime()); + if (hasStartTime() != other.hasStartTime()) return false; if (hasStartTime()) { - result = result && getStartTime().equals(other.getStartTime()); + if (!getStartTime().equals(other.getStartTime())) return false; } - result = result && (hasEndTime() == other.hasEndTime()); + if (hasEndTime() != other.hasEndTime()) return false; if (hasEndTime()) { - result = result && getEndTime().equals(other.getEndTime()); + if (!getEndTime().equals(other.getEndTime())) return false; } - result = result && operationState_ == other.operationState_; - result = result && (hasProgressDocuments() == other.hasProgressDocuments()); + if (operationState_ != other.operationState_) return false; + if (hasProgressDocuments() != other.hasProgressDocuments()) return false; if (hasProgressDocuments()) { - result = result && getProgressDocuments().equals(other.getProgressDocuments()); + if (!getProgressDocuments().equals(other.getProgressDocuments())) return false; } - result = result && (hasProgressBytes() == other.hasProgressBytes()); + if (hasProgressBytes() != other.hasProgressBytes()) return false; if (hasProgressBytes()) { - result = result && getProgressBytes().equals(other.getProgressBytes()); + if (!getProgressBytes().equals(other.getProgressBytes())) return false; } - result = result && getCollectionIdsList().equals(other.getCollectionIdsList()); - result = result && getInputUriPrefix().equals(other.getInputUriPrefix()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getCollectionIdsList().equals(other.getCollectionIdsList())) return false; + if (!getInputUriPrefix().equals(other.getInputUriPrefix())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -834,7 +833,7 @@ public com.google.firestore.admin.v1.ImportDocumentsMetadata buildPartial() { } else { result.progressBytes_ = progressBytesBuilder_.build(); } - if (((bitField0_ & 0x00000020) == 0x00000020)) { + if (((bitField0_ & 0x00000020) != 0)) { collectionIds_ = collectionIds_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000020); } @@ -847,35 +846,35 @@ public com.google.firestore.admin.v1.ImportDocumentsMetadata 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 @@ -952,7 +951,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.protobuf.Timestamp startTime_ = null; + private com.google.protobuf.Timestamp startTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1127,7 +1126,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { return startTimeBuilder_; } - private com.google.protobuf.Timestamp endTime_ = null; + private com.google.protobuf.Timestamp endTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1387,7 +1386,7 @@ public Builder clearOperationState() { return this; } - private com.google.firestore.admin.v1.Progress progressDocuments_ = null; + private com.google.firestore.admin.v1.Progress progressDocuments_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.admin.v1.Progress, com.google.firestore.admin.v1.Progress.Builder, @@ -1569,7 +1568,7 @@ public com.google.firestore.admin.v1.ProgressOrBuilder getProgressDocumentsOrBui return progressDocumentsBuilder_; } - private com.google.firestore.admin.v1.Progress progressBytes_ = null; + private com.google.firestore.admin.v1.Progress progressBytes_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.admin.v1.Progress, com.google.firestore.admin.v1.Progress.Builder, @@ -1755,7 +1754,7 @@ public com.google.firestore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureCollectionIdsIsMutable() { - if (!((bitField0_ & 0x00000020) == 0x00000020)) { + if (!((bitField0_ & 0x00000020) != 0)) { collectionIds_ = new com.google.protobuf.LazyStringArrayList(collectionIds_); bitField0_ |= 0x00000020; } @@ -1990,7 +1989,7 @@ public Builder setInputUriPrefixBytes(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-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ImportDocumentsRequest.java b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ImportDocumentsRequest.java index 0b2bd2219716..8a0911b13a3c 100644 --- a/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ImportDocumentsRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ImportDocumentsRequest.java @@ -62,7 +62,7 @@ private ImportDocumentsRequest( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { collectionIds_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -78,7 +78,7 @@ private ImportDocumentsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -90,7 +90,7 @@ private ImportDocumentsRequest( } 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)) { collectionIds_ = collectionIds_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -327,12 +327,11 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.admin.v1.ImportDocumentsRequest other = (com.google.firestore.admin.v1.ImportDocumentsRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && getCollectionIdsList().equals(other.getCollectionIdsList()); - result = result && getInputUriPrefix().equals(other.getInputUriPrefix()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (!getCollectionIdsList().equals(other.getCollectionIdsList())) return false; + if (!getInputUriPrefix().equals(other.getInputUriPrefix())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -531,7 +530,7 @@ public com.google.firestore.admin.v1.ImportDocumentsRequest buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.name_ = name_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { collectionIds_ = collectionIds_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } @@ -544,35 +543,35 @@ public com.google.firestore.admin.v1.ImportDocumentsRequest 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 @@ -741,7 +740,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureCollectionIdsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { collectionIds_ = new com.google.protobuf.LazyStringArrayList(collectionIds_); bitField0_ |= 0x00000002; } @@ -1005,7 +1004,7 @@ public Builder setInputUriPrefixBytes(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-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/Index.java b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/Index.java index 25f161687743..b7190b86edfc 100644 --- a/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/Index.java +++ b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/Index.java @@ -70,7 +70,7 @@ private Index( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { fields_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -88,7 +88,7 @@ private Index( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -100,7 +100,7 @@ private Index( } 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)) { fields_ = java.util.Collections.unmodifiableList(fields_); } this.unknownFields = unknownFields.build(); @@ -593,7 +593,7 @@ private IndexField( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -1119,22 +1119,20 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.admin.v1.Index.IndexField other = (com.google.firestore.admin.v1.Index.IndexField) obj; - boolean result = true; - result = result && getFieldPath().equals(other.getFieldPath()); - result = result && getValueModeCase().equals(other.getValueModeCase()); - if (!result) return false; + if (!getFieldPath().equals(other.getFieldPath())) return false; + if (!getValueModeCase().equals(other.getValueModeCase())) return false; switch (valueModeCase_) { case 2: - result = result && getOrderValue() == other.getOrderValue(); + if (getOrderValue() != other.getOrderValue()) return false; break; case 3: - result = result && getArrayConfigValue() == other.getArrayConfigValue(); + if (getArrayConfigValue() != other.getArrayConfigValue()) 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 @@ -1352,23 +1350,23 @@ public com.google.firestore.admin.v1.Index.IndexField 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 @@ -1376,13 +1374,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 @@ -1748,7 +1746,7 @@ public Builder clearArrayConfig() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -2089,13 +2087,12 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.admin.v1.Index other = (com.google.firestore.admin.v1.Index) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && queryScope_ == other.queryScope_; - result = result && getFieldsList().equals(other.getFieldsList()); - result = result && state_ == other.state_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getName().equals(other.getName())) return false; + if (queryScope_ != other.queryScope_) return false; + if (!getFieldsList().equals(other.getFieldsList())) return false; + if (state_ != other.state_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -2305,7 +2302,7 @@ public com.google.firestore.admin.v1.Index buildPartial() { result.name_ = name_; result.queryScope_ = queryScope_; if (fieldsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { fields_ = java.util.Collections.unmodifiableList(fields_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -2321,35 +2318,35 @@ public com.google.firestore.admin.v1.Index 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 @@ -2651,7 +2648,7 @@ public Builder clearQueryScope() { java.util.Collections.emptyList(); private void ensureFieldsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { fields_ = new java.util.ArrayList(fields_); bitField0_ |= 0x00000004; } @@ -3135,10 +3132,7 @@ public com.google.firestore.admin.v1.Index.IndexField.Builder addFieldsBuilder(i com.google.firestore.admin.v1.Index.IndexField, com.google.firestore.admin.v1.Index.IndexField.Builder, com.google.firestore.admin.v1.Index.IndexFieldOrBuilder>( - fields_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + fields_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); fields_ = null; } return fieldsBuilder_; @@ -3227,7 +3221,7 @@ public Builder clearState() { @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/IndexOperationMetadata.java b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/IndexOperationMetadata.java index 28b57180dd1b..772578bc8f2f 100644 --- a/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/IndexOperationMetadata.java +++ b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/IndexOperationMetadata.java @@ -130,7 +130,7 @@ private IndexOperationMetadata( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -477,27 +477,26 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.admin.v1.IndexOperationMetadata other = (com.google.firestore.admin.v1.IndexOperationMetadata) obj; - boolean result = true; - result = result && (hasStartTime() == other.hasStartTime()); + if (hasStartTime() != other.hasStartTime()) return false; if (hasStartTime()) { - result = result && getStartTime().equals(other.getStartTime()); + if (!getStartTime().equals(other.getStartTime())) return false; } - result = result && (hasEndTime() == other.hasEndTime()); + if (hasEndTime() != other.hasEndTime()) return false; if (hasEndTime()) { - result = result && getEndTime().equals(other.getEndTime()); + if (!getEndTime().equals(other.getEndTime())) return false; } - result = result && getIndex().equals(other.getIndex()); - result = result && state_ == other.state_; - result = result && (hasProgressDocuments() == other.hasProgressDocuments()); + if (!getIndex().equals(other.getIndex())) return false; + if (state_ != other.state_) return false; + if (hasProgressDocuments() != other.hasProgressDocuments()) return false; if (hasProgressDocuments()) { - result = result && getProgressDocuments().equals(other.getProgressDocuments()); + if (!getProgressDocuments().equals(other.getProgressDocuments())) return false; } - result = result && (hasProgressBytes() == other.hasProgressBytes()); + if (hasProgressBytes() != other.hasProgressBytes()) return false; if (hasProgressBytes()) { - result = result && getProgressBytes().equals(other.getProgressBytes()); + if (!getProgressBytes().equals(other.getProgressBytes())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -756,35 +755,35 @@ public com.google.firestore.admin.v1.IndexOperationMetadata 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 @@ -849,7 +848,7 @@ public Builder mergeFrom( return this; } - private com.google.protobuf.Timestamp startTime_ = null; + private com.google.protobuf.Timestamp startTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1024,7 +1023,7 @@ public com.google.protobuf.TimestampOrBuilder getStartTimeOrBuilder() { return startTimeBuilder_; } - private com.google.protobuf.Timestamp endTime_ = null; + private com.google.protobuf.Timestamp endTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1383,7 +1382,7 @@ public Builder clearState() { return this; } - private com.google.firestore.admin.v1.Progress progressDocuments_ = null; + private com.google.firestore.admin.v1.Progress progressDocuments_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.admin.v1.Progress, com.google.firestore.admin.v1.Progress.Builder, @@ -1565,7 +1564,7 @@ public com.google.firestore.admin.v1.ProgressOrBuilder getProgressDocumentsOrBui return progressDocumentsBuilder_; } - private com.google.firestore.admin.v1.Progress progressBytes_ = null; + private com.google.firestore.admin.v1.Progress progressBytes_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.admin.v1.Progress, com.google.firestore.admin.v1.Progress.Builder, @@ -1749,7 +1748,7 @@ public com.google.firestore.admin.v1.ProgressOrBuilder getProgressBytesOrBuilder @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-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ListFieldsRequest.java b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ListFieldsRequest.java index cc3e7dc8bde8..bf03ecbdbaa3 100644 --- a/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ListFieldsRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ListFieldsRequest.java @@ -25,7 +25,6 @@ private ListFieldsRequest(com.google.protobuf.GeneratedMessageV3.Builder buil private ListFieldsRequest() { parent_ = ""; filter_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -81,7 +80,7 @@ private ListFieldsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -334,13 +333,12 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.admin.v1.ListFieldsRequest other = (com.google.firestore.admin.v1.ListFieldsRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getFilter().equals(other.getFilter()); - 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 (!getFilter().equals(other.getFilter())) 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 @@ -548,35 +546,35 @@ public com.google.firestore.admin.v1.ListFieldsRequest 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 @@ -999,7 +997,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-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ListFieldsResponse.java b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ListFieldsResponse.java index 86c31d29d88d..477eaf96cf5e 100644 --- a/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ListFieldsResponse.java +++ b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ListFieldsResponse.java @@ -53,7 +53,7 @@ private ListFieldsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { fields_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -71,7 +71,7 @@ private ListFieldsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -83,7 +83,7 @@ private ListFieldsResponse( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { fields_ = java.util.Collections.unmodifiableList(fields_); } this.unknownFields = unknownFields.build(); @@ -267,11 +267,10 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.admin.v1.ListFieldsResponse other = (com.google.firestore.admin.v1.ListFieldsResponse) obj; - boolean result = true; - result = result && getFieldsList().equals(other.getFieldsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getFieldsList().equals(other.getFieldsList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -472,7 +471,7 @@ public com.google.firestore.admin.v1.ListFieldsResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (fieldsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { fields_ = java.util.Collections.unmodifiableList(fields_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -488,35 +487,35 @@ public com.google.firestore.admin.v1.ListFieldsResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -598,7 +597,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureFieldsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { fields_ = new java.util.ArrayList(fields_); bitField0_ |= 0x00000001; } @@ -936,10 +935,7 @@ public java.util.List getFieldsBuil com.google.firestore.admin.v1.Field, com.google.firestore.admin.v1.Field.Builder, com.google.firestore.admin.v1.FieldOrBuilder>( - fields_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + fields_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); fields_ = null; } return fieldsBuilder_; @@ -1046,7 +1042,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-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ListIndexesRequest.java b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ListIndexesRequest.java index 7ae03770204e..557c70c2ceca 100644 --- a/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ListIndexesRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ListIndexesRequest.java @@ -25,7 +25,6 @@ private ListIndexesRequest(com.google.protobuf.GeneratedMessageV3.Builder bui private ListIndexesRequest() { parent_ = ""; filter_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -81,7 +80,7 @@ private ListIndexesRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -326,13 +325,12 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.admin.v1.ListIndexesRequest other = (com.google.firestore.admin.v1.ListIndexesRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getFilter().equals(other.getFilter()); - 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 (!getFilter().equals(other.getFilter())) 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 @@ -540,35 +538,35 @@ public com.google.firestore.admin.v1.ListIndexesRequest 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 @@ -971,7 +969,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-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ListIndexesResponse.java b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ListIndexesResponse.java index f53c26194814..1dc9d16723cb 100644 --- a/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ListIndexesResponse.java +++ b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ListIndexesResponse.java @@ -53,7 +53,7 @@ private ListIndexesResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { indexes_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -71,7 +71,7 @@ private ListIndexesResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -83,7 +83,7 @@ private ListIndexesResponse( } 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)) { indexes_ = java.util.Collections.unmodifiableList(indexes_); } this.unknownFields = unknownFields.build(); @@ -267,11 +267,10 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.admin.v1.ListIndexesResponse other = (com.google.firestore.admin.v1.ListIndexesResponse) obj; - boolean result = true; - result = result && getIndexesList().equals(other.getIndexesList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getIndexesList().equals(other.getIndexesList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -472,7 +471,7 @@ public com.google.firestore.admin.v1.ListIndexesResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (indexesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { indexes_ = java.util.Collections.unmodifiableList(indexes_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -488,35 +487,35 @@ public com.google.firestore.admin.v1.ListIndexesResponse 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 @@ -599,7 +598,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureIndexesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { indexes_ = new java.util.ArrayList(indexes_); bitField0_ |= 0x00000001; } @@ -937,10 +936,7 @@ public java.util.List getIndexesBui com.google.firestore.admin.v1.Index, com.google.firestore.admin.v1.Index.Builder, com.google.firestore.admin.v1.IndexOrBuilder>( - indexes_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + indexes_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); indexes_ = null; } return indexesBuilder_; @@ -1047,7 +1043,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-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/LocationMetadata.java b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/LocationMetadata.java index 8e609d46c228..4188d2d7ddaa 100644 --- a/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/LocationMetadata.java +++ b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/LocationMetadata.java @@ -49,7 +49,7 @@ private LocationMetadata( 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.firestore.admin.v1.LocationMetadata other = (com.google.firestore.admin.v1.LocationMetadata) obj; - boolean result = true; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -310,35 +309,35 @@ public com.google.firestore.admin.v1.LocationMetadata 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 @@ -384,7 +383,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-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/Progress.java b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/Progress.java index b68e086dee42..532f0d2b4a0c 100644 --- a/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/Progress.java +++ b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/Progress.java @@ -24,10 +24,7 @@ private Progress(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private Progress() { - estimatedWork_ = 0L; - completedWork_ = 0L; - } + private Progress() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -65,7 +62,7 @@ private Progress( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -177,11 +174,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.admin.v1.Progress other = (com.google.firestore.admin.v1.Progress) obj; - boolean result = true; - result = result && (getEstimatedWork() == other.getEstimatedWork()); - result = result && (getCompletedWork() == other.getCompletedWork()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getEstimatedWork() != other.getEstimatedWork()) return false; + if (getCompletedWork() != other.getCompletedWork()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -381,35 +377,35 @@ public com.google.firestore.admin.v1.Progress 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 @@ -549,7 +545,7 @@ public Builder clearCompletedWork() { @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-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/UpdateFieldRequest.java b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/UpdateFieldRequest.java index 347c7e881f9a..afef11f95c5d 100644 --- a/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/UpdateFieldRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/UpdateFieldRequest.java @@ -81,7 +81,7 @@ private UpdateFieldRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -245,17 +245,16 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.admin.v1.UpdateFieldRequest other = (com.google.firestore.admin.v1.UpdateFieldRequest) obj; - boolean result = true; - result = result && (hasField() == other.hasField()); + if (hasField() != other.hasField()) return false; if (hasField()) { - result = result && getField().equals(other.getField()); + if (!getField().equals(other.getField())) 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 @@ -473,35 +472,35 @@ public com.google.firestore.admin.v1.UpdateFieldRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -552,7 +551,7 @@ public Builder mergeFrom( return this; } - private com.google.firestore.admin.v1.Field field_ = null; + private com.google.firestore.admin.v1.Field field_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.admin.v1.Field, com.google.firestore.admin.v1.Field.Builder, @@ -729,7 +728,7 @@ public com.google.firestore.admin.v1.FieldOrBuilder getFieldOrBuilder() { return fieldBuilder_; } - 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, @@ -919,7 +918,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-firestore-v1/src/main/java/com/google/firestore/v1/ArrayValue.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ArrayValue.java index e543995933e1..83e925666f60 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ArrayValue.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ArrayValue.java @@ -52,7 +52,7 @@ private ArrayValue( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { values_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -62,7 +62,7 @@ private ArrayValue( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -74,7 +74,7 @@ private ArrayValue( } 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)) { values_ = java.util.Collections.unmodifiableList(values_); } this.unknownFields = unknownFields.build(); @@ -204,10 +204,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1.ArrayValue other = (com.google.firestore.v1.ArrayValue) obj; - boolean result = true; - result = result && getValuesList().equals(other.getValuesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getValuesList().equals(other.getValuesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -401,7 +400,7 @@ public com.google.firestore.v1.ArrayValue buildPartial() { com.google.firestore.v1.ArrayValue result = new com.google.firestore.v1.ArrayValue(this); int from_bitField0_ = bitField0_; if (valuesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { values_ = java.util.Collections.unmodifiableList(values_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -415,35 +414,35 @@ public com.google.firestore.v1.ArrayValue 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 @@ -520,7 +519,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureValuesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { values_ = new java.util.ArrayList(values_); bitField0_ |= 0x00000001; } @@ -855,10 +854,7 @@ public java.util.List getValuesBuilderLis com.google.firestore.v1.Value, com.google.firestore.v1.Value.Builder, com.google.firestore.v1.ValueOrBuilder>( - values_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + values_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); values_ = null; } return valuesBuilder_; @@ -866,7 +862,7 @@ public java.util.List getValuesBuilderLis @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/BatchGetDocumentsRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/BatchGetDocumentsRequest.java index 80ede040eaa6..28b57a63f36a 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/BatchGetDocumentsRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/BatchGetDocumentsRequest.java @@ -61,7 +61,7 @@ private BatchGetDocumentsRequest( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { documents_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -125,7 +125,7 @@ private BatchGetDocumentsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -137,7 +137,7 @@ private BatchGetDocumentsRequest( } 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)) { documents_ = documents_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -560,30 +560,28 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1.BatchGetDocumentsRequest other = (com.google.firestore.v1.BatchGetDocumentsRequest) obj; - boolean result = true; - result = result && getDatabase().equals(other.getDatabase()); - result = result && getDocumentsList().equals(other.getDocumentsList()); - result = result && (hasMask() == other.hasMask()); + if (!getDatabase().equals(other.getDatabase())) return false; + if (!getDocumentsList().equals(other.getDocumentsList())) return false; + if (hasMask() != other.hasMask()) return false; if (hasMask()) { - result = result && getMask().equals(other.getMask()); + if (!getMask().equals(other.getMask())) return false; } - result = result && getConsistencySelectorCase().equals(other.getConsistencySelectorCase()); - if (!result) return false; + if (!getConsistencySelectorCase().equals(other.getConsistencySelectorCase())) return false; switch (consistencySelectorCase_) { case 4: - result = result && getTransaction().equals(other.getTransaction()); + if (!getTransaction().equals(other.getTransaction())) return false; break; case 5: - result = result && getNewTransaction().equals(other.getNewTransaction()); + if (!getNewTransaction().equals(other.getNewTransaction())) return false; break; case 7: - result = result && getReadTime().equals(other.getReadTime()); + if (!getReadTime().equals(other.getReadTime())) 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 @@ -806,7 +804,7 @@ public com.google.firestore.v1.BatchGetDocumentsRequest buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.database_ = database_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { documents_ = documents_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } @@ -841,35 +839,35 @@ public com.google.firestore.v1.BatchGetDocumentsRequest 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 @@ -1071,7 +1069,7 @@ public Builder setDatabaseBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureDocumentsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { documents_ = new com.google.protobuf.LazyStringArrayList(documents_); bitField0_ |= 0x00000002; } @@ -1237,7 +1235,7 @@ public Builder addDocumentsBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.firestore.v1.DocumentMask mask_ = null; + private com.google.firestore.v1.DocumentMask mask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1.DocumentMask, com.google.firestore.v1.DocumentMask.Builder, @@ -1925,7 +1923,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() { @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-firestore-v1/src/main/java/com/google/firestore/v1/BatchGetDocumentsResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/BatchGetDocumentsResponse.java index 641fae961f7d..42e79035f2fd 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/BatchGetDocumentsResponse.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/BatchGetDocumentsResponse.java @@ -94,7 +94,7 @@ private BatchGetDocumentsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -394,26 +394,24 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1.BatchGetDocumentsResponse other = (com.google.firestore.v1.BatchGetDocumentsResponse) obj; - boolean result = true; - result = result && getTransaction().equals(other.getTransaction()); - result = result && (hasReadTime() == other.hasReadTime()); + if (!getTransaction().equals(other.getTransaction())) return false; + if (hasReadTime() != other.hasReadTime()) return false; if (hasReadTime()) { - result = result && getReadTime().equals(other.getReadTime()); + if (!getReadTime().equals(other.getReadTime())) return false; } - result = result && getResultCase().equals(other.getResultCase()); - if (!result) return false; + if (!getResultCase().equals(other.getResultCase())) return false; switch (resultCase_) { case 1: - result = result && getFound().equals(other.getFound()); + if (!getFound().equals(other.getFound())) return false; break; case 2: - result = result && getMissing().equals(other.getMissing()); + if (!getMissing().equals(other.getMissing())) 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 @@ -646,35 +644,35 @@ public com.google.firestore.v1.BatchGetDocumentsResponse 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 @@ -1119,7 +1117,7 @@ public Builder clearTransaction() { return this; } - private com.google.protobuf.Timestamp readTime_ = null; + private com.google.protobuf.Timestamp readTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1323,7 +1321,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() { @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-firestore-v1/src/main/java/com/google/firestore/v1/BeginTransactionRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/BeginTransactionRequest.java index af42d2e00f96..26c3bb39b2b2 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/BeginTransactionRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/BeginTransactionRequest.java @@ -75,7 +75,7 @@ private BeginTransactionRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -247,14 +247,13 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1.BeginTransactionRequest other = (com.google.firestore.v1.BeginTransactionRequest) obj; - boolean result = true; - result = result && getDatabase().equals(other.getDatabase()); - result = result && (hasOptions() == other.hasOptions()); + if (!getDatabase().equals(other.getDatabase())) return false; + if (hasOptions() != other.hasOptions()) return false; if (hasOptions()) { - result = result && getOptions().equals(other.getOptions()); + if (!getOptions().equals(other.getOptions())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -462,35 +461,35 @@ public com.google.firestore.v1.BeginTransactionRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -641,7 +640,7 @@ public Builder setDatabaseBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.firestore.v1.TransactionOptions options_ = null; + private com.google.firestore.v1.TransactionOptions options_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1.TransactionOptions, com.google.firestore.v1.TransactionOptions.Builder, @@ -833,7 +832,7 @@ public com.google.firestore.v1.TransactionOptionsOrBuilder getOptionsOrBuilder() @java.lang.Override public final Builder setUnknownFields(final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override diff --git a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/BeginTransactionResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/BeginTransactionResponse.java index e6e333802284..cbd890c1dc0d 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/BeginTransactionResponse.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/BeginTransactionResponse.java @@ -57,7 +57,7 @@ private BeginTransactionResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -149,10 +149,9 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1.BeginTransactionResponse other = (com.google.firestore.v1.BeginTransactionResponse) obj; - boolean result = true; - result = result && getTransaction().equals(other.getTransaction()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTransaction().equals(other.getTransaction())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -345,35 +344,35 @@ public com.google.firestore.v1.BeginTransactionResponse 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 @@ -470,7 +469,7 @@ public Builder clearTransaction() { @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-firestore-v1/src/main/java/com/google/firestore/v1/CommitRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/CommitRequest.java index a098bdc6f5df..38266706fc4e 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/CommitRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/CommitRequest.java @@ -61,7 +61,7 @@ private CommitRequest( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { writes_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -76,7 +76,7 @@ private CommitRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -88,7 +88,7 @@ private CommitRequest( } 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)) { writes_ = java.util.Collections.unmodifiableList(writes_); } this.unknownFields = unknownFields.build(); @@ -296,12 +296,11 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1.CommitRequest other = (com.google.firestore.v1.CommitRequest) obj; - boolean result = true; - result = result && getDatabase().equals(other.getDatabase()); - result = result && getWritesList().equals(other.getWritesList()); - result = result && getTransaction().equals(other.getTransaction()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDatabase().equals(other.getDatabase())) return false; + if (!getWritesList().equals(other.getWritesList())) return false; + if (!getTransaction().equals(other.getTransaction())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -506,7 +505,7 @@ public com.google.firestore.v1.CommitRequest buildPartial() { int to_bitField0_ = 0; result.database_ = database_; if (writesBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { writes_ = java.util.Collections.unmodifiableList(writes_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -522,35 +521,35 @@ public com.google.firestore.v1.CommitRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -733,7 +732,7 @@ public Builder setDatabaseBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureWritesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { writes_ = new java.util.ArrayList(writes_); bitField0_ |= 0x00000002; } @@ -1086,10 +1085,7 @@ public java.util.List getWritesBuilderLis com.google.firestore.v1.Write, com.google.firestore.v1.Write.Builder, com.google.firestore.v1.WriteOrBuilder>( - writes_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + writes_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); writes_ = null; } return writesBuilder_; @@ -1144,7 +1140,7 @@ public Builder clearTransaction() { @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-firestore-v1/src/main/java/com/google/firestore/v1/CommitResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/CommitResponse.java index 3afba5cac924..0651377d3132 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/CommitResponse.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/CommitResponse.java @@ -52,7 +52,7 @@ private CommitResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { writeResults_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -78,7 +78,7 @@ private CommitResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -90,7 +90,7 @@ private CommitResponse( } 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)) { writeResults_ = java.util.Collections.unmodifiableList(writeResults_); } this.unknownFields = unknownFields.build(); @@ -277,14 +277,13 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1.CommitResponse other = (com.google.firestore.v1.CommitResponse) obj; - boolean result = true; - result = result && getWriteResultsList().equals(other.getWriteResultsList()); - result = result && (hasCommitTime() == other.hasCommitTime()); + if (!getWriteResultsList().equals(other.getWriteResultsList())) return false; + if (hasCommitTime() != other.hasCommitTime()) return false; if (hasCommitTime()) { - result = result && getCommitTime().equals(other.getCommitTime()); + if (!getCommitTime().equals(other.getCommitTime())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -491,7 +490,7 @@ public com.google.firestore.v1.CommitResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (writeResultsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { writeResults_ = java.util.Collections.unmodifiableList(writeResults_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -511,35 +510,35 @@ public com.google.firestore.v1.CommitResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -619,7 +618,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureWriteResultsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { writeResults_ = new java.util.ArrayList(writeResults_); bitField0_ |= 0x00000001; } @@ -994,16 +993,13 @@ public com.google.firestore.v1.WriteResult.Builder addWriteResultsBuilder(int in com.google.firestore.v1.WriteResult, com.google.firestore.v1.WriteResult.Builder, com.google.firestore.v1.WriteResultOrBuilder>( - writeResults_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + writeResults_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); writeResults_ = null; } return writeResultsBuilder_; } - private com.google.protobuf.Timestamp commitTime_ = null; + private com.google.protobuf.Timestamp commitTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1184,7 +1180,7 @@ public com.google.protobuf.TimestampOrBuilder getCommitTimeOrBuilder() { @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-firestore-v1/src/main/java/com/google/firestore/v1/CreateDocumentRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/CreateDocumentRequest.java index f08298be5c65..d1018c6d7b8a 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/CreateDocumentRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/CreateDocumentRequest.java @@ -106,7 +106,7 @@ private CreateDocumentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -426,20 +426,19 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1.CreateDocumentRequest other = (com.google.firestore.v1.CreateDocumentRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getCollectionId().equals(other.getCollectionId()); - result = result && getDocumentId().equals(other.getDocumentId()); - result = result && (hasDocument() == other.hasDocument()); + if (!getParent().equals(other.getParent())) return false; + if (!getCollectionId().equals(other.getCollectionId())) return false; + if (!getDocumentId().equals(other.getDocumentId())) return false; + if (hasDocument() != other.hasDocument()) return false; if (hasDocument()) { - result = result && getDocument().equals(other.getDocument()); + if (!getDocument().equals(other.getDocument())) return false; } - result = result && (hasMask() == other.hasMask()); + if (hasMask() != other.hasMask()) return false; if (hasMask()) { - result = result && getMask().equals(other.getMask()); + if (!getMask().equals(other.getMask())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -672,35 +671,35 @@ public com.google.firestore.v1.CreateDocumentRequest 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 @@ -1059,7 +1058,7 @@ public Builder setDocumentIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.firestore.v1.Document document_ = null; + private com.google.firestore.v1.Document document_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1.Document, com.google.firestore.v1.Document.Builder, @@ -1240,7 +1239,7 @@ public com.google.firestore.v1.DocumentOrBuilder getDocumentOrBuilder() { return documentBuilder_; } - private com.google.firestore.v1.DocumentMask mask_ = null; + private com.google.firestore.v1.DocumentMask mask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1.DocumentMask, com.google.firestore.v1.DocumentMask.Builder, @@ -1437,7 +1436,7 @@ public com.google.firestore.v1.DocumentMaskOrBuilder getMaskOrBuilder() { @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-firestore-v1/src/main/java/com/google/firestore/v1/Cursor.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/Cursor.java index 7a9982bc9aed..4dd95f31b81a 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/Cursor.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/Cursor.java @@ -24,7 +24,6 @@ private Cursor(com.google.protobuf.GeneratedMessageV3.Builder builder) { private Cursor() { values_ = java.util.Collections.emptyList(); - before_ = false; } @java.lang.Override @@ -53,7 +52,7 @@ private Cursor( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { values_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -68,7 +67,7 @@ private Cursor( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -80,7 +79,7 @@ private Cursor( } 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)) { values_ = java.util.Collections.unmodifiableList(values_); } this.unknownFields = unknownFields.build(); @@ -241,11 +240,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1.Cursor other = (com.google.firestore.v1.Cursor) obj; - boolean result = true; - result = result && getValuesList().equals(other.getValuesList()); - result = result && (getBefore() == other.getBefore()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getValuesList().equals(other.getValuesList())) return false; + if (getBefore() != other.getBefore()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -443,7 +441,7 @@ public com.google.firestore.v1.Cursor buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (valuesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { values_ = java.util.Collections.unmodifiableList(values_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -459,35 +457,35 @@ public com.google.firestore.v1.Cursor 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 @@ -567,7 +565,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureValuesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { values_ = new java.util.ArrayList(values_); bitField0_ |= 0x00000001; } @@ -938,10 +936,7 @@ public java.util.List getValuesBuilderLis com.google.firestore.v1.Value, com.google.firestore.v1.Value.Builder, com.google.firestore.v1.ValueOrBuilder>( - values_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + values_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); values_ = null; } return valuesBuilder_; @@ -996,7 +991,7 @@ public Builder clearBefore() { @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-firestore-v1/src/main/java/com/google/firestore/v1/DeleteDocumentRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DeleteDocumentRequest.java index a6d7daf36d7d..fbe1facf3735 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DeleteDocumentRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DeleteDocumentRequest.java @@ -75,7 +75,7 @@ private DeleteDocumentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -247,14 +247,13 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1.DeleteDocumentRequest other = (com.google.firestore.v1.DeleteDocumentRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (hasCurrentDocument() == other.hasCurrentDocument()); + if (!getName().equals(other.getName())) return false; + if (hasCurrentDocument() != other.hasCurrentDocument()) return false; if (hasCurrentDocument()) { - result = result && getCurrentDocument().equals(other.getCurrentDocument()); + if (!getCurrentDocument().equals(other.getCurrentDocument())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -462,35 +461,35 @@ public com.google.firestore.v1.DeleteDocumentRequest 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 @@ -640,7 +639,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.firestore.v1.Precondition currentDocument_ = null; + private com.google.firestore.v1.Precondition currentDocument_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1.Precondition, com.google.firestore.v1.Precondition.Builder, @@ -833,7 +832,7 @@ public com.google.firestore.v1.PreconditionOrBuilder getCurrentDocumentOrBuilder @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-firestore-v1/src/main/java/com/google/firestore/v1/Document.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/Document.java index da198de868b2..6536e1c8f4df 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/Document.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/Document.java @@ -60,7 +60,7 @@ private Document( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { fields_ = com.google.protobuf.MapField.newMapField(FieldsDefaultEntryHolder.defaultEntry); mutable_bitField0_ |= 0x00000002; @@ -105,7 +105,7 @@ private Document( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -528,19 +528,18 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1.Document other = (com.google.firestore.v1.Document) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && internalGetFields().equals(other.internalGetFields()); - result = result && (hasCreateTime() == other.hasCreateTime()); + if (!getName().equals(other.getName())) return false; + if (!internalGetFields().equals(other.internalGetFields())) 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 && (hasUpdateTime() == other.hasUpdateTime()); + if (hasUpdateTime() != other.hasUpdateTime()) return false; if (hasUpdateTime()) { - result = result && getUpdateTime().equals(other.getUpdateTime()); + if (!getUpdateTime().equals(other.getUpdateTime())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -792,35 +791,35 @@ public com.google.firestore.v1.Document 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 @@ -1258,7 +1257,7 @@ public Builder putAllFields( 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, @@ -1464,7 +1463,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { return createTimeBuilder_; } - private com.google.protobuf.Timestamp updateTime_ = null; + private com.google.protobuf.Timestamp updateTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1672,7 +1671,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { @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-firestore-v1/src/main/java/com/google/firestore/v1/DocumentChange.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentChange.java index 088e1847cf33..e5bd8bf657ab 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentChange.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentChange.java @@ -27,8 +27,8 @@ private DocumentChange(com.google.protobuf.GeneratedMessageV3.Builder builder } private DocumentChange() { - targetIds_ = java.util.Collections.emptyList(); - removedTargetIds_ = java.util.Collections.emptyList(); + targetIds_ = emptyIntList(); + removedTargetIds_ = emptyIntList(); } @java.lang.Override @@ -72,55 +72,53 @@ private DocumentChange( } case 40: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - targetIds_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000002) != 0)) { + targetIds_ = newIntList(); mutable_bitField0_ |= 0x00000002; } - targetIds_.add(input.readInt32()); + targetIds_.addInt(input.readInt32()); break; } case 42: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002) - && input.getBytesUntilLimit() > 0) { - targetIds_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { + targetIds_ = newIntList(); mutable_bitField0_ |= 0x00000002; } while (input.getBytesUntilLimit() > 0) { - targetIds_.add(input.readInt32()); + targetIds_.addInt(input.readInt32()); } input.popLimit(limit); break; } case 48: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { - removedTargetIds_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000004) != 0)) { + removedTargetIds_ = newIntList(); mutable_bitField0_ |= 0x00000004; } - removedTargetIds_.add(input.readInt32()); + removedTargetIds_.addInt(input.readInt32()); break; } case 50: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004) - && input.getBytesUntilLimit() > 0) { - removedTargetIds_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) { + removedTargetIds_ = newIntList(); mutable_bitField0_ |= 0x00000004; } while (input.getBytesUntilLimit() > 0) { - removedTargetIds_.add(input.readInt32()); + removedTargetIds_.addInt(input.readInt32()); } input.popLimit(limit); break; } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -132,11 +130,11 @@ private DocumentChange( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - targetIds_ = java.util.Collections.unmodifiableList(targetIds_); + if (((mutable_bitField0_ & 0x00000002) != 0)) { + targetIds_.makeImmutable(); // C } - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { - removedTargetIds_ = java.util.Collections.unmodifiableList(removedTargetIds_); + if (((mutable_bitField0_ & 0x00000004) != 0)) { + removedTargetIds_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -202,7 +200,7 @@ public com.google.firestore.v1.DocumentOrBuilder getDocumentOrBuilder() { } public static final int TARGET_IDS_FIELD_NUMBER = 5; - private java.util.List targetIds_; + private com.google.protobuf.Internal.IntList targetIds_; /** * * @@ -237,13 +235,13 @@ public int getTargetIdsCount() { * repeated int32 target_ids = 5; */ public int getTargetIds(int index) { - return targetIds_.get(index); + return targetIds_.getInt(index); } private int targetIdsMemoizedSerializedSize = -1; public static final int REMOVED_TARGET_IDS_FIELD_NUMBER = 6; - private java.util.List removedTargetIds_; + private com.google.protobuf.Internal.IntList removedTargetIds_; /** * * @@ -278,7 +276,7 @@ public int getRemovedTargetIdsCount() { * repeated int32 removed_target_ids = 6; */ public int getRemovedTargetIds(int index) { - return removedTargetIds_.get(index); + return removedTargetIds_.getInt(index); } private int removedTargetIdsMemoizedSerializedSize = -1; @@ -306,14 +304,14 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io output.writeUInt32NoTag(targetIdsMemoizedSerializedSize); } for (int i = 0; i < targetIds_.size(); i++) { - output.writeInt32NoTag(targetIds_.get(i)); + output.writeInt32NoTag(targetIds_.getInt(i)); } if (getRemovedTargetIdsList().size() > 0) { output.writeUInt32NoTag(50); output.writeUInt32NoTag(removedTargetIdsMemoizedSerializedSize); } for (int i = 0; i < removedTargetIds_.size(); i++) { - output.writeInt32NoTag(removedTargetIds_.get(i)); + output.writeInt32NoTag(removedTargetIds_.getInt(i)); } unknownFields.writeTo(output); } @@ -330,7 +328,8 @@ public int getSerializedSize() { { int dataSize = 0; for (int i = 0; i < targetIds_.size(); i++) { - dataSize += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(targetIds_.get(i)); + dataSize += + com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(targetIds_.getInt(i)); } size += dataSize; if (!getTargetIdsList().isEmpty()) { @@ -343,7 +342,8 @@ public int getSerializedSize() { int dataSize = 0; for (int i = 0; i < removedTargetIds_.size(); i++) { dataSize += - com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(removedTargetIds_.get(i)); + com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag( + removedTargetIds_.getInt(i)); } size += dataSize; if (!getRemovedTargetIdsList().isEmpty()) { @@ -367,15 +367,14 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1.DocumentChange other = (com.google.firestore.v1.DocumentChange) obj; - boolean result = true; - result = result && (hasDocument() == other.hasDocument()); + if (hasDocument() != other.hasDocument()) return false; if (hasDocument()) { - result = result && getDocument().equals(other.getDocument()); + if (!getDocument().equals(other.getDocument())) return false; } - result = result && getTargetIdsList().equals(other.getTargetIdsList()); - result = result && getRemovedTargetIdsList().equals(other.getRemovedTargetIdsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTargetIdsList().equals(other.getTargetIdsList())) return false; + if (!getRemovedTargetIdsList().equals(other.getRemovedTargetIdsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -552,9 +551,9 @@ public Builder clear() { document_ = null; documentBuilder_ = null; } - targetIds_ = java.util.Collections.emptyList(); + targetIds_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); - removedTargetIds_ = java.util.Collections.emptyList(); + removedTargetIds_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000004); return this; } @@ -590,13 +589,13 @@ public com.google.firestore.v1.DocumentChange buildPartial() { } else { result.document_ = documentBuilder_.build(); } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - targetIds_ = java.util.Collections.unmodifiableList(targetIds_); + if (((bitField0_ & 0x00000002) != 0)) { + targetIds_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000002); } result.targetIds_ = targetIds_; - if (((bitField0_ & 0x00000004) == 0x00000004)) { - removedTargetIds_ = java.util.Collections.unmodifiableList(removedTargetIds_); + if (((bitField0_ & 0x00000004) != 0)) { + removedTargetIds_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000004); } result.removedTargetIds_ = removedTargetIds_; @@ -607,35 +606,35 @@ public com.google.firestore.v1.DocumentChange 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 @@ -704,7 +703,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.firestore.v1.Document document_ = null; + private com.google.firestore.v1.Document document_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1.Document, com.google.firestore.v1.Document.Builder, @@ -894,11 +893,11 @@ public com.google.firestore.v1.DocumentOrBuilder getDocumentOrBuilder() { return documentBuilder_; } - private java.util.List targetIds_ = java.util.Collections.emptyList(); + private com.google.protobuf.Internal.IntList targetIds_ = emptyIntList(); private void ensureTargetIdsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { - targetIds_ = new java.util.ArrayList(targetIds_); + if (!((bitField0_ & 0x00000002) != 0)) { + targetIds_ = mutableCopy(targetIds_); bitField0_ |= 0x00000002; } } @@ -912,7 +911,9 @@ private void ensureTargetIdsIsMutable() { * repeated int32 target_ids = 5; */ public java.util.List getTargetIdsList() { - return java.util.Collections.unmodifiableList(targetIds_); + return ((bitField0_ & 0x00000002) != 0) + ? java.util.Collections.unmodifiableList(targetIds_) + : targetIds_; } /** * @@ -936,7 +937,7 @@ public int getTargetIdsCount() { * repeated int32 target_ids = 5; */ public int getTargetIds(int index) { - return targetIds_.get(index); + return targetIds_.getInt(index); } /** * @@ -949,7 +950,7 @@ public int getTargetIds(int index) { */ public Builder setTargetIds(int index, int value) { ensureTargetIdsIsMutable(); - targetIds_.set(index, value); + targetIds_.setInt(index, value); onChanged(); return this; } @@ -964,7 +965,7 @@ public Builder setTargetIds(int index, int value) { */ public Builder addTargetIds(int value) { ensureTargetIdsIsMutable(); - targetIds_.add(value); + targetIds_.addInt(value); onChanged(); return this; } @@ -993,17 +994,17 @@ public Builder addAllTargetIds(java.lang.Iterable v * repeated int32 target_ids = 5; */ public Builder clearTargetIds() { - targetIds_ = java.util.Collections.emptyList(); + targetIds_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } - private java.util.List removedTargetIds_ = java.util.Collections.emptyList(); + private com.google.protobuf.Internal.IntList removedTargetIds_ = emptyIntList(); private void ensureRemovedTargetIdsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { - removedTargetIds_ = new java.util.ArrayList(removedTargetIds_); + if (!((bitField0_ & 0x00000004) != 0)) { + removedTargetIds_ = mutableCopy(removedTargetIds_); bitField0_ |= 0x00000004; } } @@ -1017,7 +1018,9 @@ private void ensureRemovedTargetIdsIsMutable() { * repeated int32 removed_target_ids = 6; */ public java.util.List getRemovedTargetIdsList() { - return java.util.Collections.unmodifiableList(removedTargetIds_); + return ((bitField0_ & 0x00000004) != 0) + ? java.util.Collections.unmodifiableList(removedTargetIds_) + : removedTargetIds_; } /** * @@ -1041,7 +1044,7 @@ public int getRemovedTargetIdsCount() { * repeated int32 removed_target_ids = 6; */ public int getRemovedTargetIds(int index) { - return removedTargetIds_.get(index); + return removedTargetIds_.getInt(index); } /** * @@ -1054,7 +1057,7 @@ public int getRemovedTargetIds(int index) { */ public Builder setRemovedTargetIds(int index, int value) { ensureRemovedTargetIdsIsMutable(); - removedTargetIds_.set(index, value); + removedTargetIds_.setInt(index, value); onChanged(); return this; } @@ -1069,7 +1072,7 @@ public Builder setRemovedTargetIds(int index, int value) { */ public Builder addRemovedTargetIds(int value) { ensureRemovedTargetIdsIsMutable(); - removedTargetIds_.add(value); + removedTargetIds_.addInt(value); onChanged(); return this; } @@ -1098,7 +1101,7 @@ public Builder addAllRemovedTargetIds(java.lang.Iterablerepeated int32 removed_target_ids = 6; */ public Builder clearRemovedTargetIds() { - removedTargetIds_ = java.util.Collections.emptyList(); + removedTargetIds_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; @@ -1106,7 +1109,7 @@ public Builder clearRemovedTargetIds() { @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-firestore-v1/src/main/java/com/google/firestore/v1/DocumentDelete.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentDelete.java index c0a83d86a3ae..36a0d977b179 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentDelete.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentDelete.java @@ -28,7 +28,7 @@ private DocumentDelete(com.google.protobuf.GeneratedMessageV3.Builder builder private DocumentDelete() { document_ = ""; - removedTargetIds_ = java.util.Collections.emptyList(); + removedTargetIds_ = emptyIntList(); } @java.lang.Override @@ -79,31 +79,30 @@ private DocumentDelete( } case 48: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - removedTargetIds_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000002) != 0)) { + removedTargetIds_ = newIntList(); mutable_bitField0_ |= 0x00000002; } - removedTargetIds_.add(input.readInt32()); + removedTargetIds_.addInt(input.readInt32()); break; } case 50: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002) - && input.getBytesUntilLimit() > 0) { - removedTargetIds_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { + removedTargetIds_ = newIntList(); mutable_bitField0_ |= 0x00000002; } while (input.getBytesUntilLimit() > 0) { - removedTargetIds_.add(input.readInt32()); + removedTargetIds_.addInt(input.readInt32()); } input.popLimit(limit); break; } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -115,8 +114,8 @@ private DocumentDelete( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - removedTargetIds_ = java.util.Collections.unmodifiableList(removedTargetIds_); + if (((mutable_bitField0_ & 0x00000002) != 0)) { + removedTargetIds_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -183,7 +182,7 @@ public com.google.protobuf.ByteString getDocumentBytes() { } public static final int REMOVED_TARGET_IDS_FIELD_NUMBER = 6; - private java.util.List removedTargetIds_; + private com.google.protobuf.Internal.IntList removedTargetIds_; /** * * @@ -218,7 +217,7 @@ public int getRemovedTargetIdsCount() { * repeated int32 removed_target_ids = 6; */ public int getRemovedTargetIds(int index) { - return removedTargetIds_.get(index); + return removedTargetIds_.getInt(index); } private int removedTargetIdsMemoizedSerializedSize = -1; @@ -291,7 +290,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io output.writeUInt32NoTag(removedTargetIdsMemoizedSerializedSize); } for (int i = 0; i < removedTargetIds_.size(); i++) { - output.writeInt32NoTag(removedTargetIds_.get(i)); + output.writeInt32NoTag(removedTargetIds_.getInt(i)); } unknownFields.writeTo(output); } @@ -312,7 +311,8 @@ public int getSerializedSize() { int dataSize = 0; for (int i = 0; i < removedTargetIds_.size(); i++) { dataSize += - com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(removedTargetIds_.get(i)); + com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag( + removedTargetIds_.getInt(i)); } size += dataSize; if (!getRemovedTargetIdsList().isEmpty()) { @@ -336,15 +336,14 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1.DocumentDelete other = (com.google.firestore.v1.DocumentDelete) obj; - boolean result = true; - result = result && getDocument().equals(other.getDocument()); - result = result && getRemovedTargetIdsList().equals(other.getRemovedTargetIdsList()); - result = result && (hasReadTime() == other.hasReadTime()); + if (!getDocument().equals(other.getDocument())) return false; + if (!getRemovedTargetIdsList().equals(other.getRemovedTargetIdsList())) return false; + if (hasReadTime() != other.hasReadTime()) return false; if (hasReadTime()) { - result = result && getReadTime().equals(other.getReadTime()); + if (!getReadTime().equals(other.getReadTime())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -515,7 +514,7 @@ public Builder clear() { super.clear(); document_ = ""; - removedTargetIds_ = java.util.Collections.emptyList(); + removedTargetIds_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); if (readTimeBuilder_ == null) { readTime_ = null; @@ -553,8 +552,8 @@ public com.google.firestore.v1.DocumentDelete buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.document_ = document_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { - removedTargetIds_ = java.util.Collections.unmodifiableList(removedTargetIds_); + if (((bitField0_ & 0x00000002) != 0)) { + removedTargetIds_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000002); } result.removedTargetIds_ = removedTargetIds_; @@ -570,35 +569,35 @@ public com.google.firestore.v1.DocumentDelete 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 @@ -755,11 +754,11 @@ public Builder setDocumentBytes(com.google.protobuf.ByteString value) { return this; } - private java.util.List removedTargetIds_ = java.util.Collections.emptyList(); + private com.google.protobuf.Internal.IntList removedTargetIds_ = emptyIntList(); private void ensureRemovedTargetIdsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { - removedTargetIds_ = new java.util.ArrayList(removedTargetIds_); + if (!((bitField0_ & 0x00000002) != 0)) { + removedTargetIds_ = mutableCopy(removedTargetIds_); bitField0_ |= 0x00000002; } } @@ -773,7 +772,9 @@ private void ensureRemovedTargetIdsIsMutable() { * repeated int32 removed_target_ids = 6; */ public java.util.List getRemovedTargetIdsList() { - return java.util.Collections.unmodifiableList(removedTargetIds_); + return ((bitField0_ & 0x00000002) != 0) + ? java.util.Collections.unmodifiableList(removedTargetIds_) + : removedTargetIds_; } /** * @@ -797,7 +798,7 @@ public int getRemovedTargetIdsCount() { * repeated int32 removed_target_ids = 6; */ public int getRemovedTargetIds(int index) { - return removedTargetIds_.get(index); + return removedTargetIds_.getInt(index); } /** * @@ -810,7 +811,7 @@ public int getRemovedTargetIds(int index) { */ public Builder setRemovedTargetIds(int index, int value) { ensureRemovedTargetIdsIsMutable(); - removedTargetIds_.set(index, value); + removedTargetIds_.setInt(index, value); onChanged(); return this; } @@ -825,7 +826,7 @@ public Builder setRemovedTargetIds(int index, int value) { */ public Builder addRemovedTargetIds(int value) { ensureRemovedTargetIdsIsMutable(); - removedTargetIds_.add(value); + removedTargetIds_.addInt(value); onChanged(); return this; } @@ -854,13 +855,13 @@ public Builder addAllRemovedTargetIds(java.lang.Iterablerepeated int32 removed_target_ids = 6; */ public Builder clearRemovedTargetIds() { - removedTargetIds_ = java.util.Collections.emptyList(); + removedTargetIds_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } - private com.google.protobuf.Timestamp readTime_ = null; + private com.google.protobuf.Timestamp readTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1046,7 +1047,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() { @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-firestore-v1/src/main/java/com/google/firestore/v1/DocumentMask.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentMask.java index eac18de912d5..3ec1f51c3eb0 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentMask.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentMask.java @@ -57,7 +57,7 @@ private DocumentMask( case 10: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { fieldPaths_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -66,7 +66,7 @@ private DocumentMask( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -78,7 +78,7 @@ private DocumentMask( } 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)) { fieldPaths_ = fieldPaths_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -205,10 +205,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1.DocumentMask other = (com.google.firestore.v1.DocumentMask) obj; - boolean result = true; - result = result && getFieldPathsList().equals(other.getFieldPathsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getFieldPathsList().equals(other.getFieldPathsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -399,7 +398,7 @@ public com.google.firestore.v1.DocumentMask build() { public com.google.firestore.v1.DocumentMask buildPartial() { com.google.firestore.v1.DocumentMask result = new com.google.firestore.v1.DocumentMask(this); int from_bitField0_ = bitField0_; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { fieldPaths_ = fieldPaths_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } @@ -410,35 +409,35 @@ public com.google.firestore.v1.DocumentMask buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -498,7 +497,7 @@ public Builder mergeFrom( com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureFieldPathsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { fieldPaths_ = new com.google.protobuf.LazyStringArrayList(fieldPaths_); bitField0_ |= 0x00000001; } @@ -648,7 +647,7 @@ public Builder addFieldPathsBytes(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-firestore-v1/src/main/java/com/google/firestore/v1/DocumentRemove.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentRemove.java index f8c8714e7a2a..de9607d675c8 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentRemove.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentRemove.java @@ -29,7 +29,7 @@ private DocumentRemove(com.google.protobuf.GeneratedMessageV3.Builder builder private DocumentRemove() { document_ = ""; - removedTargetIds_ = java.util.Collections.emptyList(); + removedTargetIds_ = emptyIntList(); } @java.lang.Override @@ -65,24 +65,23 @@ private DocumentRemove( } case 16: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - removedTargetIds_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000002) != 0)) { + removedTargetIds_ = newIntList(); mutable_bitField0_ |= 0x00000002; } - removedTargetIds_.add(input.readInt32()); + removedTargetIds_.addInt(input.readInt32()); break; } case 18: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002) - && input.getBytesUntilLimit() > 0) { - removedTargetIds_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { + removedTargetIds_ = newIntList(); mutable_bitField0_ |= 0x00000002; } while (input.getBytesUntilLimit() > 0) { - removedTargetIds_.add(input.readInt32()); + removedTargetIds_.addInt(input.readInt32()); } input.popLimit(limit); break; @@ -104,7 +103,7 @@ private DocumentRemove( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -116,8 +115,8 @@ private DocumentRemove( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - removedTargetIds_ = java.util.Collections.unmodifiableList(removedTargetIds_); + if (((mutable_bitField0_ & 0x00000002) != 0)) { + removedTargetIds_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -184,7 +183,7 @@ public com.google.protobuf.ByteString getDocumentBytes() { } public static final int REMOVED_TARGET_IDS_FIELD_NUMBER = 2; - private java.util.List removedTargetIds_; + private com.google.protobuf.Internal.IntList removedTargetIds_; /** * * @@ -219,7 +218,7 @@ public int getRemovedTargetIdsCount() { * repeated int32 removed_target_ids = 2; */ public int getRemovedTargetIds(int index) { - return removedTargetIds_.get(index); + return removedTargetIds_.getInt(index); } private int removedTargetIdsMemoizedSerializedSize = -1; @@ -289,7 +288,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io output.writeUInt32NoTag(removedTargetIdsMemoizedSerializedSize); } for (int i = 0; i < removedTargetIds_.size(); i++) { - output.writeInt32NoTag(removedTargetIds_.get(i)); + output.writeInt32NoTag(removedTargetIds_.getInt(i)); } if (readTime_ != null) { output.writeMessage(4, getReadTime()); @@ -310,7 +309,8 @@ public int getSerializedSize() { int dataSize = 0; for (int i = 0; i < removedTargetIds_.size(); i++) { dataSize += - com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(removedTargetIds_.get(i)); + com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag( + removedTargetIds_.getInt(i)); } size += dataSize; if (!getRemovedTargetIdsList().isEmpty()) { @@ -337,15 +337,14 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1.DocumentRemove other = (com.google.firestore.v1.DocumentRemove) obj; - boolean result = true; - result = result && getDocument().equals(other.getDocument()); - result = result && getRemovedTargetIdsList().equals(other.getRemovedTargetIdsList()); - result = result && (hasReadTime() == other.hasReadTime()); + if (!getDocument().equals(other.getDocument())) return false; + if (!getRemovedTargetIdsList().equals(other.getRemovedTargetIdsList())) return false; + if (hasReadTime() != other.hasReadTime()) return false; if (hasReadTime()) { - result = result && getReadTime().equals(other.getReadTime()); + if (!getReadTime().equals(other.getReadTime())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -517,7 +516,7 @@ public Builder clear() { super.clear(); document_ = ""; - removedTargetIds_ = java.util.Collections.emptyList(); + removedTargetIds_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); if (readTimeBuilder_ == null) { readTime_ = null; @@ -555,8 +554,8 @@ public com.google.firestore.v1.DocumentRemove buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.document_ = document_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { - removedTargetIds_ = java.util.Collections.unmodifiableList(removedTargetIds_); + if (((bitField0_ & 0x00000002) != 0)) { + removedTargetIds_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000002); } result.removedTargetIds_ = removedTargetIds_; @@ -572,35 +571,35 @@ public com.google.firestore.v1.DocumentRemove 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 @@ -757,11 +756,11 @@ public Builder setDocumentBytes(com.google.protobuf.ByteString value) { return this; } - private java.util.List removedTargetIds_ = java.util.Collections.emptyList(); + private com.google.protobuf.Internal.IntList removedTargetIds_ = emptyIntList(); private void ensureRemovedTargetIdsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { - removedTargetIds_ = new java.util.ArrayList(removedTargetIds_); + if (!((bitField0_ & 0x00000002) != 0)) { + removedTargetIds_ = mutableCopy(removedTargetIds_); bitField0_ |= 0x00000002; } } @@ -775,7 +774,9 @@ private void ensureRemovedTargetIdsIsMutable() { * repeated int32 removed_target_ids = 2; */ public java.util.List getRemovedTargetIdsList() { - return java.util.Collections.unmodifiableList(removedTargetIds_); + return ((bitField0_ & 0x00000002) != 0) + ? java.util.Collections.unmodifiableList(removedTargetIds_) + : removedTargetIds_; } /** * @@ -799,7 +800,7 @@ public int getRemovedTargetIdsCount() { * repeated int32 removed_target_ids = 2; */ public int getRemovedTargetIds(int index) { - return removedTargetIds_.get(index); + return removedTargetIds_.getInt(index); } /** * @@ -812,7 +813,7 @@ public int getRemovedTargetIds(int index) { */ public Builder setRemovedTargetIds(int index, int value) { ensureRemovedTargetIdsIsMutable(); - removedTargetIds_.set(index, value); + removedTargetIds_.setInt(index, value); onChanged(); return this; } @@ -827,7 +828,7 @@ public Builder setRemovedTargetIds(int index, int value) { */ public Builder addRemovedTargetIds(int value) { ensureRemovedTargetIdsIsMutable(); - removedTargetIds_.add(value); + removedTargetIds_.addInt(value); onChanged(); return this; } @@ -856,13 +857,13 @@ public Builder addAllRemovedTargetIds(java.lang.Iterablerepeated int32 removed_target_ids = 2; */ public Builder clearRemovedTargetIds() { - removedTargetIds_ = java.util.Collections.emptyList(); + removedTargetIds_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } - private com.google.protobuf.Timestamp readTime_ = null; + private com.google.protobuf.Timestamp readTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1048,7 +1049,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() { @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-firestore-v1/src/main/java/com/google/firestore/v1/DocumentTransform.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentTransform.java index 16b9eb8cdeb7..fe8bab1d121b 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentTransform.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentTransform.java @@ -60,7 +60,7 @@ private DocumentTransform( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { fieldTransforms_ = new java.util.ArrayList< com.google.firestore.v1.DocumentTransform.FieldTransform>(); @@ -74,7 +74,7 @@ private DocumentTransform( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -86,7 +86,7 @@ private DocumentTransform( } 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)) { fieldTransforms_ = java.util.Collections.unmodifiableList(fieldTransforms_); } this.unknownFields = unknownFields.build(); @@ -592,7 +592,7 @@ private FieldTransform( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -1337,34 +1337,32 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1.DocumentTransform.FieldTransform other = (com.google.firestore.v1.DocumentTransform.FieldTransform) obj; - boolean result = true; - result = result && getFieldPath().equals(other.getFieldPath()); - result = result && getTransformTypeCase().equals(other.getTransformTypeCase()); - if (!result) return false; + if (!getFieldPath().equals(other.getFieldPath())) return false; + if (!getTransformTypeCase().equals(other.getTransformTypeCase())) return false; switch (transformTypeCase_) { case 2: - result = result && getSetToServerValueValue() == other.getSetToServerValueValue(); + if (getSetToServerValueValue() != other.getSetToServerValueValue()) return false; break; case 3: - result = result && getIncrement().equals(other.getIncrement()); + if (!getIncrement().equals(other.getIncrement())) return false; break; case 4: - result = result && getMaximum().equals(other.getMaximum()); + if (!getMaximum().equals(other.getMaximum())) return false; break; case 5: - result = result && getMinimum().equals(other.getMinimum()); + if (!getMinimum().equals(other.getMinimum())) return false; break; case 6: - result = result && getAppendMissingElements().equals(other.getAppendMissingElements()); + if (!getAppendMissingElements().equals(other.getAppendMissingElements())) return false; break; case 7: - result = result && getRemoveAllFromArray().equals(other.getRemoveAllFromArray()); + if (!getRemoveAllFromArray().equals(other.getRemoveAllFromArray())) 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 @@ -1629,23 +1627,23 @@ public com.google.firestore.v1.DocumentTransform.FieldTransform 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 @@ -1653,13 +1651,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 @@ -3364,7 +3362,7 @@ public com.google.firestore.v1.ArrayValueOrBuilder getRemoveAllFromArrayOrBuilde @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -3589,11 +3587,10 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1.DocumentTransform other = (com.google.firestore.v1.DocumentTransform) obj; - boolean result = true; - result = result && getDocument().equals(other.getDocument()); - result = result && getFieldTransformsList().equals(other.getFieldTransformsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDocument().equals(other.getDocument())) return false; + if (!getFieldTransformsList().equals(other.getFieldTransformsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -3795,7 +3792,7 @@ public com.google.firestore.v1.DocumentTransform buildPartial() { int to_bitField0_ = 0; result.document_ = document_; if (fieldTransformsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { fieldTransforms_ = java.util.Collections.unmodifiableList(fieldTransforms_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -3810,35 +3807,35 @@ public com.google.firestore.v1.DocumentTransform 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 @@ -4013,7 +4010,7 @@ public Builder setDocumentBytes(com.google.protobuf.ByteString value) { fieldTransforms_ = java.util.Collections.emptyList(); private void ensureFieldTransformsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { fieldTransforms_ = new java.util.ArrayList( fieldTransforms_); @@ -4424,7 +4421,7 @@ public Builder removeFieldTransforms(int index) { com.google.firestore.v1.DocumentTransform.FieldTransform.Builder, com.google.firestore.v1.DocumentTransform.FieldTransformOrBuilder>( fieldTransforms_, - ((bitField0_ & 0x00000002) == 0x00000002), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); fieldTransforms_ = null; @@ -4434,7 +4431,7 @@ public Builder removeFieldTransforms(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-firestore-v1/src/main/java/com/google/firestore/v1/ExistenceFilter.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ExistenceFilter.java index b0e253af275d..f99031b6427f 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ExistenceFilter.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ExistenceFilter.java @@ -22,10 +22,7 @@ private ExistenceFilter(com.google.protobuf.GeneratedMessageV3.Builder builde super(builder); } - private ExistenceFilter() { - targetId_ = 0; - count_ = 0; - } + private ExistenceFilter() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -63,7 +60,7 @@ private ExistenceFilter( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -177,11 +174,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1.ExistenceFilter other = (com.google.firestore.v1.ExistenceFilter) obj; - boolean result = true; - result = result && (getTargetId() == other.getTargetId()); - result = result && (getCount() == other.getCount()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getTargetId() != other.getTargetId()) return false; + if (getCount() != other.getCount()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -379,35 +375,35 @@ public com.google.firestore.v1.ExistenceFilter 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 @@ -553,7 +549,7 @@ public Builder clearCount() { @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-firestore-v1/src/main/java/com/google/firestore/v1/GetDocumentRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/GetDocumentRequest.java index 3794b9c5ecc8..1df95f1cce72 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/GetDocumentRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/GetDocumentRequest.java @@ -96,7 +96,7 @@ private GetDocumentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -389,26 +389,24 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1.GetDocumentRequest other = (com.google.firestore.v1.GetDocumentRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (hasMask() == other.hasMask()); + if (!getName().equals(other.getName())) return false; + if (hasMask() != other.hasMask()) return false; if (hasMask()) { - result = result && getMask().equals(other.getMask()); + if (!getMask().equals(other.getMask())) return false; } - result = result && getConsistencySelectorCase().equals(other.getConsistencySelectorCase()); - if (!result) return false; + if (!getConsistencySelectorCase().equals(other.getConsistencySelectorCase())) return false; switch (consistencySelectorCase_) { case 3: - result = result && getTransaction().equals(other.getTransaction()); + if (!getTransaction().equals(other.getTransaction())) return false; break; case 5: - result = result && getReadTime().equals(other.getReadTime()); + if (!getReadTime().equals(other.getReadTime())) 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 @@ -641,35 +639,35 @@ public com.google.firestore.v1.GetDocumentRequest 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 @@ -849,7 +847,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.firestore.v1.DocumentMask mask_ = null; + private com.google.firestore.v1.DocumentMask mask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1.DocumentMask, com.google.firestore.v1.DocumentMask.Builder, @@ -1307,7 +1305,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() { @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-firestore-v1/src/main/java/com/google/firestore/v1/ListCollectionIdsRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListCollectionIdsRequest.java index 45304820307f..3c93d53d3f56 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListCollectionIdsRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListCollectionIdsRequest.java @@ -24,7 +24,6 @@ private ListCollectionIdsRequest(com.google.protobuf.GeneratedMessageV3.Builder< private ListCollectionIdsRequest() { parent_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -73,7 +72,7 @@ private ListCollectionIdsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -271,12 +270,11 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1.ListCollectionIdsRequest other = (com.google.firestore.v1.ListCollectionIdsRequest) 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 @@ -479,35 +477,35 @@ public com.google.firestore.v1.ListCollectionIdsRequest 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 @@ -817,7 +815,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-firestore-v1/src/main/java/com/google/firestore/v1/ListCollectionIdsResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListCollectionIdsResponse.java index 4d1d95ed771b..4bfc93ae8eb2 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListCollectionIdsResponse.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListCollectionIdsResponse.java @@ -54,7 +54,7 @@ private ListCollectionIdsResponse( case 10: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { collectionIds_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -70,7 +70,7 @@ private ListCollectionIdsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -82,7 +82,7 @@ private ListCollectionIdsResponse( } 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)) { collectionIds_ = collectionIds_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -256,11 +256,10 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1.ListCollectionIdsResponse other = (com.google.firestore.v1.ListCollectionIdsResponse) obj; - boolean result = true; - result = result && getCollectionIdsList().equals(other.getCollectionIdsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getCollectionIdsList().equals(other.getCollectionIdsList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -454,7 +453,7 @@ public com.google.firestore.v1.ListCollectionIdsResponse buildPartial() { new com.google.firestore.v1.ListCollectionIdsResponse(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { collectionIds_ = collectionIds_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } @@ -467,35 +466,35 @@ public com.google.firestore.v1.ListCollectionIdsResponse 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 @@ -561,7 +560,7 @@ public Builder mergeFrom( com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureCollectionIdsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { collectionIds_ = new com.google.protobuf.LazyStringArrayList(collectionIds_); bitField0_ |= 0x00000001; } @@ -796,7 +795,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-firestore-v1/src/main/java/com/google/firestore/v1/ListDocumentsRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListDocumentsRequest.java index 5df0e959d496..576682070c4d 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListDocumentsRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListDocumentsRequest.java @@ -25,10 +25,8 @@ private ListDocumentsRequest(com.google.protobuf.GeneratedMessageV3.Builder b private ListDocumentsRequest() { parent_ = ""; collectionId_ = ""; - pageSize_ = 0; pageToken_ = ""; orderBy_ = ""; - showMissing_ = false; } @java.lang.Override @@ -132,7 +130,7 @@ private ListDocumentsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -629,31 +627,29 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1.ListDocumentsRequest other = (com.google.firestore.v1.ListDocumentsRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getCollectionId().equals(other.getCollectionId()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && getOrderBy().equals(other.getOrderBy()); - result = result && (hasMask() == other.hasMask()); + if (!getParent().equals(other.getParent())) return false; + if (!getCollectionId().equals(other.getCollectionId())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!getOrderBy().equals(other.getOrderBy())) return false; + if (hasMask() != other.hasMask()) return false; if (hasMask()) { - result = result && getMask().equals(other.getMask()); + if (!getMask().equals(other.getMask())) return false; } - result = result && (getShowMissing() == other.getShowMissing()); - result = result && getConsistencySelectorCase().equals(other.getConsistencySelectorCase()); - if (!result) return false; + if (getShowMissing() != other.getShowMissing()) return false; + if (!getConsistencySelectorCase().equals(other.getConsistencySelectorCase())) return false; switch (consistencySelectorCase_) { case 8: - result = result && getTransaction().equals(other.getTransaction()); + if (!getTransaction().equals(other.getTransaction())) return false; break; case 10: - result = result && getReadTime().equals(other.getReadTime()); + if (!getReadTime().equals(other.getReadTime())) 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 @@ -911,35 +907,35 @@ public com.google.firestore.v1.ListDocumentsRequest 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 @@ -1488,7 +1484,7 @@ public Builder setOrderByBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.firestore.v1.DocumentMask mask_ = null; + private com.google.firestore.v1.DocumentMask mask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1.DocumentMask, com.google.firestore.v1.DocumentMask.Builder, @@ -2005,7 +2001,7 @@ public Builder clearShowMissing() { @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-firestore-v1/src/main/java/com/google/firestore/v1/ListDocumentsResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListDocumentsResponse.java index e4383afceac1..0eb616e6c34b 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListDocumentsResponse.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListDocumentsResponse.java @@ -53,7 +53,7 @@ private ListDocumentsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { documents_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -70,7 +70,7 @@ private ListDocumentsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -82,7 +82,7 @@ private ListDocumentsResponse( } 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)) { documents_ = java.util.Collections.unmodifiableList(documents_); } this.unknownFields = unknownFields.build(); @@ -264,11 +264,10 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1.ListDocumentsResponse other = (com.google.firestore.v1.ListDocumentsResponse) obj; - boolean result = true; - result = result && getDocumentsList().equals(other.getDocumentsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDocumentsList().equals(other.getDocumentsList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -469,7 +468,7 @@ public com.google.firestore.v1.ListDocumentsResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (documentsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { documents_ = java.util.Collections.unmodifiableList(documents_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -485,35 +484,35 @@ public com.google.firestore.v1.ListDocumentsResponse 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 @@ -594,7 +593,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureDocumentsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { documents_ = new java.util.ArrayList(documents_); bitField0_ |= 0x00000001; } @@ -932,10 +931,7 @@ public java.util.List getDocumentsBuil com.google.firestore.v1.Document, com.google.firestore.v1.Document.Builder, com.google.firestore.v1.DocumentOrBuilder>( - documents_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + documents_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); documents_ = null; } return documentsBuilder_; @@ -1037,7 +1033,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-firestore-v1/src/main/java/com/google/firestore/v1/ListenRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListenRequest.java index bfac1ff6546f..0bc1aa1bb029 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListenRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListenRequest.java @@ -80,7 +80,7 @@ private ListenRequest( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry); mutable_bitField0_ |= 0x00000008; @@ -93,7 +93,7 @@ private ListenRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -448,23 +448,21 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1.ListenRequest other = (com.google.firestore.v1.ListenRequest) obj; - boolean result = true; - result = result && getDatabase().equals(other.getDatabase()); - result = result && internalGetLabels().equals(other.internalGetLabels()); - result = result && getTargetChangeCase().equals(other.getTargetChangeCase()); - if (!result) return false; + if (!getDatabase().equals(other.getDatabase())) return false; + if (!internalGetLabels().equals(other.internalGetLabels())) return false; + if (!getTargetChangeCase().equals(other.getTargetChangeCase())) return false; switch (targetChangeCase_) { case 2: - result = result && getAddTarget().equals(other.getAddTarget()); + if (!getAddTarget().equals(other.getAddTarget())) return false; break; case 3: - result = result && (getRemoveTarget() == other.getRemoveTarget()); + if (getRemoveTarget() != other.getRemoveTarget()) 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 @@ -711,35 +709,35 @@ public com.google.firestore.v1.ListenRequest 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 @@ -1320,7 +1318,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-firestore-v1/src/main/java/com/google/firestore/v1/ListenResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListenResponse.java index a5270da5b2aa..444c096e157f 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListenResponse.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListenResponse.java @@ -130,7 +130,7 @@ private ListenResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -521,30 +521,28 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1.ListenResponse other = (com.google.firestore.v1.ListenResponse) obj; - boolean result = true; - result = result && getResponseTypeCase().equals(other.getResponseTypeCase()); - if (!result) return false; + if (!getResponseTypeCase().equals(other.getResponseTypeCase())) return false; switch (responseTypeCase_) { case 2: - result = result && getTargetChange().equals(other.getTargetChange()); + if (!getTargetChange().equals(other.getTargetChange())) return false; break; case 3: - result = result && getDocumentChange().equals(other.getDocumentChange()); + if (!getDocumentChange().equals(other.getDocumentChange())) return false; break; case 4: - result = result && getDocumentDelete().equals(other.getDocumentDelete()); + if (!getDocumentDelete().equals(other.getDocumentDelete())) return false; break; case 6: - result = result && getDocumentRemove().equals(other.getDocumentRemove()); + if (!getDocumentRemove().equals(other.getDocumentRemove())) return false; break; case 5: - result = result && getFilter().equals(other.getFilter()); + if (!getFilter().equals(other.getFilter())) 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 @@ -794,35 +792,35 @@ public com.google.firestore.v1.ListenResponse 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 @@ -1957,7 +1955,7 @@ public com.google.firestore.v1.ExistenceFilterOrBuilder getFilterOrBuilder() { @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-firestore-v1/src/main/java/com/google/firestore/v1/MapValue.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/MapValue.java index b80d3d47e6f8..3456bc4253ec 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/MapValue.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/MapValue.java @@ -50,7 +50,7 @@ private MapValue( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { fields_ = com.google.protobuf.MapField.newMapField(FieldsDefaultEntryHolder.defaultEntry); mutable_bitField0_ |= 0x00000001; @@ -65,7 +65,7 @@ private MapValue( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -272,10 +272,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1.MapValue other = (com.google.firestore.v1.MapValue) obj; - boolean result = true; - result = result && internalGetFields().equals(other.internalGetFields()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!internalGetFields().equals(other.internalGetFields())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -489,35 +488,35 @@ public com.google.firestore.v1.MapValue 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 @@ -750,7 +749,7 @@ public Builder putAllFields( @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-firestore-v1/src/main/java/com/google/firestore/v1/Precondition.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/Precondition.java index 488b6dabba89..82b0c43fed1d 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/Precondition.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/Precondition.java @@ -71,7 +71,7 @@ private Precondition( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -262,21 +262,19 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1.Precondition other = (com.google.firestore.v1.Precondition) obj; - boolean result = true; - result = result && getConditionTypeCase().equals(other.getConditionTypeCase()); - if (!result) return false; + if (!getConditionTypeCase().equals(other.getConditionTypeCase())) return false; switch (conditionTypeCase_) { case 1: - result = result && (getExists() == other.getExists()); + if (getExists() != other.getExists()) return false; break; case 2: - result = result && getUpdateTime().equals(other.getUpdateTime()); + if (!getUpdateTime().equals(other.getUpdateTime())) 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 @@ -487,35 +485,35 @@ public com.google.firestore.v1.Precondition 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 @@ -850,7 +848,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { @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-firestore-v1/src/main/java/com/google/firestore/v1/RollbackRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/RollbackRequest.java index 7aa11f8c509d..ca5f41ba09b3 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/RollbackRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/RollbackRequest.java @@ -65,7 +65,7 @@ private RollbackRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -207,11 +207,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1.RollbackRequest other = (com.google.firestore.v1.RollbackRequest) obj; - boolean result = true; - result = result && getDatabase().equals(other.getDatabase()); - result = result && getTransaction().equals(other.getTransaction()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDatabase().equals(other.getDatabase())) return false; + if (!getTransaction().equals(other.getTransaction())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -409,35 +408,35 @@ public com.google.firestore.v1.RollbackRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -636,7 +635,7 @@ public Builder clearTransaction() { @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-firestore-v1/src/main/java/com/google/firestore/v1/RunQueryRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/RunQueryRequest.java index 3fecded42c0c..fa4a176cc4f7 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/RunQueryRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/RunQueryRequest.java @@ -114,7 +114,7 @@ private RunQueryRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -516,34 +516,31 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1.RunQueryRequest other = (com.google.firestore.v1.RunQueryRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getQueryTypeCase().equals(other.getQueryTypeCase()); - if (!result) return false; + if (!getParent().equals(other.getParent())) return false; + if (!getQueryTypeCase().equals(other.getQueryTypeCase())) return false; switch (queryTypeCase_) { case 2: - result = result && getStructuredQuery().equals(other.getStructuredQuery()); + if (!getStructuredQuery().equals(other.getStructuredQuery())) return false; break; case 0: default: } - result = result && getConsistencySelectorCase().equals(other.getConsistencySelectorCase()); - if (!result) return false; + if (!getConsistencySelectorCase().equals(other.getConsistencySelectorCase())) return false; switch (consistencySelectorCase_) { case 5: - result = result && getTransaction().equals(other.getTransaction()); + if (!getTransaction().equals(other.getTransaction())) return false; break; case 6: - result = result && getNewTransaction().equals(other.getNewTransaction()); + if (!getNewTransaction().equals(other.getNewTransaction())) return false; break; case 7: - result = result && getReadTime().equals(other.getReadTime()); + if (!getReadTime().equals(other.getReadTime())) 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 @@ -790,35 +787,35 @@ public com.google.firestore.v1.RunQueryRequest 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 @@ -1740,7 +1737,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() { @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-firestore-v1/src/main/java/com/google/firestore/v1/RunQueryResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/RunQueryResponse.java index bb1df98c4d6a..204ae7d56639 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/RunQueryResponse.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/RunQueryResponse.java @@ -24,7 +24,6 @@ private RunQueryResponse(com.google.protobuf.GeneratedMessageV3.Builder build private RunQueryResponse() { transaction_ = com.google.protobuf.ByteString.EMPTY; - skippedResults_ = 0; } @java.lang.Override @@ -93,7 +92,7 @@ private RunQueryResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -317,19 +316,18 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1.RunQueryResponse other = (com.google.firestore.v1.RunQueryResponse) obj; - boolean result = true; - result = result && getTransaction().equals(other.getTransaction()); - result = result && (hasDocument() == other.hasDocument()); + if (!getTransaction().equals(other.getTransaction())) return false; + if (hasDocument() != other.hasDocument()) return false; if (hasDocument()) { - result = result && getDocument().equals(other.getDocument()); + if (!getDocument().equals(other.getDocument())) return false; } - result = result && (hasReadTime() == other.hasReadTime()); + if (hasReadTime() != other.hasReadTime()) return false; if (hasReadTime()) { - result = result && getReadTime().equals(other.getReadTime()); + if (!getReadTime().equals(other.getReadTime())) return false; } - result = result && (getSkippedResults() == other.getSkippedResults()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getSkippedResults() != other.getSkippedResults()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -557,35 +555,35 @@ public com.google.firestore.v1.RunQueryResponse 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 @@ -697,7 +695,7 @@ public Builder clearTransaction() { return this; } - private com.google.firestore.v1.Document document_ = null; + private com.google.firestore.v1.Document document_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1.Document, com.google.firestore.v1.Document.Builder, @@ -887,7 +885,7 @@ public com.google.firestore.v1.DocumentOrBuilder getDocumentOrBuilder() { return documentBuilder_; } - private com.google.protobuf.Timestamp readTime_ = null; + private com.google.protobuf.Timestamp readTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1156,7 +1154,7 @@ public Builder clearSkippedResults() { @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-firestore-v1/src/main/java/com/google/firestore/v1/StructuredQuery.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/StructuredQuery.java index 83ee3cfe276b..fc3d3d00adab 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/StructuredQuery.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/StructuredQuery.java @@ -25,7 +25,6 @@ private StructuredQuery(com.google.protobuf.GeneratedMessageV3.Builder builde private StructuredQuery() { from_ = java.util.Collections.emptyList(); orderBy_ = java.util.Collections.emptyList(); - offset_ = 0; } @java.lang.Override @@ -71,7 +70,7 @@ private StructuredQuery( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { from_ = new java.util.ArrayList< com.google.firestore.v1.StructuredQuery.CollectionSelector>(); @@ -101,7 +100,7 @@ private StructuredQuery( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { orderBy_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; } @@ -162,7 +161,7 @@ private StructuredQuery( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -174,10 +173,10 @@ private StructuredQuery( } 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)) { from_ = java.util.Collections.unmodifiableList(from_); } - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { orderBy_ = java.util.Collections.unmodifiableList(orderBy_); } this.unknownFields = unknownFields.build(); @@ -407,7 +406,6 @@ private CollectionSelector(com.google.protobuf.GeneratedMessageV3.Builder bui private CollectionSelector() { collectionId_ = ""; - allDescendants_ = false; } @java.lang.Override @@ -448,7 +446,7 @@ private CollectionSelector( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -593,11 +591,10 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1.StructuredQuery.CollectionSelector other = (com.google.firestore.v1.StructuredQuery.CollectionSelector) obj; - boolean result = true; - result = result && getCollectionId().equals(other.getCollectionId()); - result = result && (getAllDescendants() == other.getAllDescendants()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getCollectionId().equals(other.getCollectionId())) return false; + if (getAllDescendants() != other.getAllDescendants()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -799,23 +796,23 @@ public com.google.firestore.v1.StructuredQuery.CollectionSelector 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 @@ -823,13 +820,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 +1032,7 @@ public Builder clearAllDescendants() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1292,7 +1289,7 @@ private Filter( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -1564,24 +1561,22 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1.StructuredQuery.Filter other = (com.google.firestore.v1.StructuredQuery.Filter) obj; - boolean result = true; - result = result && getFilterTypeCase().equals(other.getFilterTypeCase()); - if (!result) return false; + if (!getFilterTypeCase().equals(other.getFilterTypeCase())) return false; switch (filterTypeCase_) { case 1: - result = result && getCompositeFilter().equals(other.getCompositeFilter()); + if (!getCompositeFilter().equals(other.getCompositeFilter())) return false; break; case 2: - result = result && getFieldFilter().equals(other.getFieldFilter()); + if (!getFieldFilter().equals(other.getFieldFilter())) return false; break; case 3: - result = result && getUnaryFilter().equals(other.getUnaryFilter()); + if (!getUnaryFilter().equals(other.getUnaryFilter())) 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 @@ -1811,23 +1806,23 @@ public com.google.firestore.v1.StructuredQuery.Filter 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 @@ -1835,13 +1830,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 @@ -2540,7 +2535,7 @@ public com.google.firestore.v1.StructuredQuery.UnaryFilter.Builder getUnaryFilte @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -2729,7 +2724,7 @@ private CompositeFilter( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { filters_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; @@ -2742,7 +2737,7 @@ private CompositeFilter( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -2754,7 +2749,7 @@ private CompositeFilter( } 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)) { filters_ = java.util.Collections.unmodifiableList(filters_); } this.unknownFields = unknownFields.build(); @@ -3059,11 +3054,10 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1.StructuredQuery.CompositeFilter other = (com.google.firestore.v1.StructuredQuery.CompositeFilter) obj; - boolean result = true; - result = result && op_ == other.op_; - result = result && getFiltersList().equals(other.getFiltersList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (op_ != other.op_) return false; + if (!getFiltersList().equals(other.getFiltersList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -3268,7 +3262,7 @@ public com.google.firestore.v1.StructuredQuery.CompositeFilter buildPartial() { int to_bitField0_ = 0; result.op_ = op_; if (filtersBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { filters_ = java.util.Collections.unmodifiableList(filters_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -3283,23 +3277,23 @@ public com.google.firestore.v1.StructuredQuery.CompositeFilter 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 @@ -3307,13 +3301,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 @@ -3473,7 +3467,7 @@ public Builder clearOp() { java.util.Collections.emptyList(); private void ensureFiltersIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { filters_ = new java.util.ArrayList(filters_); bitField0_ |= 0x00000002; @@ -3833,10 +3827,7 @@ public com.google.firestore.v1.StructuredQuery.Filter.Builder addFiltersBuilder( com.google.firestore.v1.StructuredQuery.Filter, com.google.firestore.v1.StructuredQuery.Filter.Builder, com.google.firestore.v1.StructuredQuery.FilterOrBuilder>( - filters_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + filters_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); filters_ = null; } return filtersBuilder_; @@ -3845,7 +3836,7 @@ public com.google.firestore.v1.StructuredQuery.Filter.Builder addFiltersBuilder( @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -4070,7 +4061,7 @@ private FieldFilter( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -4512,18 +4503,17 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1.StructuredQuery.FieldFilter other = (com.google.firestore.v1.StructuredQuery.FieldFilter) obj; - boolean result = true; - result = result && (hasField() == other.hasField()); + if (hasField() != other.hasField()) return false; if (hasField()) { - result = result && getField().equals(other.getField()); + if (!getField().equals(other.getField())) return false; } - result = result && op_ == other.op_; - result = result && (hasValue() == other.hasValue()); + if (op_ != other.op_) return false; + if (hasValue() != other.hasValue()) return false; if (hasValue()) { - result = result && getValue().equals(other.getValue()); + if (!getValue().equals(other.getValue())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -4749,23 +4739,23 @@ public com.google.firestore.v1.StructuredQuery.FieldFilter 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 @@ -4773,13 +4763,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 @@ -4834,7 +4824,7 @@ public Builder mergeFrom( return this; } - private com.google.firestore.v1.StructuredQuery.FieldReference field_ = null; + private com.google.firestore.v1.StructuredQuery.FieldReference field_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1.StructuredQuery.FieldReference, com.google.firestore.v1.StructuredQuery.FieldReference.Builder, @@ -5094,7 +5084,7 @@ public Builder clearOp() { return this; } - private com.google.firestore.v1.Value value_ = null; + private com.google.firestore.v1.Value value_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1.Value, com.google.firestore.v1.Value.Builder, @@ -5272,7 +5262,7 @@ public com.google.firestore.v1.ValueOrBuilder getValueOrBuilder() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -5456,7 +5446,7 @@ private UnaryFilter( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -5806,19 +5796,17 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1.StructuredQuery.UnaryFilter other = (com.google.firestore.v1.StructuredQuery.UnaryFilter) obj; - boolean result = true; - result = result && op_ == other.op_; - result = result && getOperandTypeCase().equals(other.getOperandTypeCase()); - if (!result) return false; + if (op_ != other.op_) return false; + if (!getOperandTypeCase().equals(other.getOperandTypeCase())) return false; switch (operandTypeCase_) { case 2: - result = result && getField().equals(other.getField()); + if (!getField().equals(other.getField())) 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 @@ -6032,23 +6020,23 @@ public com.google.firestore.v1.StructuredQuery.UnaryFilter 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 @@ -6056,13 +6044,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 @@ -6421,7 +6409,7 @@ public com.google.firestore.v1.StructuredQuery.FieldReferenceOrBuilder getFieldO @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -6536,7 +6524,7 @@ private FieldReference( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -6640,10 +6628,9 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1.StructuredQuery.FieldReference other = (com.google.firestore.v1.StructuredQuery.FieldReference) obj; - boolean result = true; - result = result && getFieldPath().equals(other.getFieldPath()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getFieldPath().equals(other.getFieldPath())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -6839,23 +6826,23 @@ public com.google.firestore.v1.StructuredQuery.FieldReference 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 @@ -6863,13 +6850,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 @@ -6976,7 +6963,7 @@ public Builder setFieldPathBytes(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 @@ -7155,7 +7142,7 @@ private Order( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -7313,14 +7300,13 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1.StructuredQuery.Order other = (com.google.firestore.v1.StructuredQuery.Order) obj; - boolean result = true; - result = result && (hasField() == other.hasField()); + if (hasField() != other.hasField()) return false; if (hasField()) { - result = result && getField().equals(other.getField()); + if (!getField().equals(other.getField())) return false; } - result = result && direction_ == other.direction_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (direction_ != other.direction_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -7530,23 +7516,23 @@ public com.google.firestore.v1.StructuredQuery.Order 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 @@ -7554,13 +7540,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 @@ -7611,7 +7597,7 @@ public Builder mergeFrom( return this; } - private com.google.firestore.v1.StructuredQuery.FieldReference field_ = null; + private com.google.firestore.v1.StructuredQuery.FieldReference field_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1.StructuredQuery.FieldReference, com.google.firestore.v1.StructuredQuery.FieldReference.Builder, @@ -7874,7 +7860,7 @@ public Builder clearDirection() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -8039,7 +8025,7 @@ private Projection( break; case 18: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { fields_ = new java.util.ArrayList< com.google.firestore.v1.StructuredQuery.FieldReference>(); @@ -8053,7 +8039,7 @@ private Projection( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -8065,7 +8051,7 @@ private Projection( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { fields_ = java.util.Collections.unmodifiableList(fields_); } this.unknownFields = unknownFields.build(); @@ -8208,10 +8194,9 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1.StructuredQuery.Projection other = (com.google.firestore.v1.StructuredQuery.Projection) obj; - boolean result = true; - result = result && getFieldsList().equals(other.getFieldsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getFieldsList().equals(other.getFieldsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -8409,7 +8394,7 @@ public com.google.firestore.v1.StructuredQuery.Projection buildPartial() { new com.google.firestore.v1.StructuredQuery.Projection(this); int from_bitField0_ = bitField0_; if (fieldsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { fields_ = java.util.Collections.unmodifiableList(fields_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -8423,23 +8408,23 @@ public com.google.firestore.v1.StructuredQuery.Projection 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 @@ -8447,13 +8432,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 @@ -8532,7 +8517,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureFieldsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { fields_ = new java.util.ArrayList( fields_); @@ -8922,10 +8907,7 @@ public com.google.firestore.v1.StructuredQuery.FieldReference.Builder addFieldsB com.google.firestore.v1.StructuredQuery.FieldReference, com.google.firestore.v1.StructuredQuery.FieldReference.Builder, com.google.firestore.v1.StructuredQuery.FieldReferenceOrBuilder>( - fields_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + fields_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); fields_ = null; } return fieldsBuilder_; @@ -8934,7 +8916,7 @@ public com.google.firestore.v1.StructuredQuery.FieldReference.Builder addFieldsB @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -9487,32 +9469,31 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1.StructuredQuery other = (com.google.firestore.v1.StructuredQuery) obj; - boolean result = true; - result = result && (hasSelect() == other.hasSelect()); + if (hasSelect() != other.hasSelect()) return false; if (hasSelect()) { - result = result && getSelect().equals(other.getSelect()); + if (!getSelect().equals(other.getSelect())) return false; } - result = result && getFromList().equals(other.getFromList()); - result = result && (hasWhere() == other.hasWhere()); + if (!getFromList().equals(other.getFromList())) return false; + if (hasWhere() != other.hasWhere()) return false; if (hasWhere()) { - result = result && getWhere().equals(other.getWhere()); + if (!getWhere().equals(other.getWhere())) return false; } - result = result && getOrderByList().equals(other.getOrderByList()); - result = result && (hasStartAt() == other.hasStartAt()); + if (!getOrderByList().equals(other.getOrderByList())) return false; + if (hasStartAt() != other.hasStartAt()) return false; if (hasStartAt()) { - result = result && getStartAt().equals(other.getStartAt()); + if (!getStartAt().equals(other.getStartAt())) return false; } - result = result && (hasEndAt() == other.hasEndAt()); + if (hasEndAt() != other.hasEndAt()) return false; if (hasEndAt()) { - result = result && getEndAt().equals(other.getEndAt()); + if (!getEndAt().equals(other.getEndAt())) return false; } - result = result && (getOffset() == other.getOffset()); - result = result && (hasLimit() == other.hasLimit()); + if (getOffset() != other.getOffset()) return false; + if (hasLimit() != other.hasLimit()) return false; if (hasLimit()) { - result = result && getLimit().equals(other.getLimit()); + if (!getLimit().equals(other.getLimit())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -9779,7 +9760,7 @@ public com.google.firestore.v1.StructuredQuery buildPartial() { result.select_ = selectBuilder_.build(); } if (fromBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { from_ = java.util.Collections.unmodifiableList(from_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -9793,7 +9774,7 @@ public com.google.firestore.v1.StructuredQuery buildPartial() { result.where_ = whereBuilder_.build(); } if (orderByBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { orderBy_ = java.util.Collections.unmodifiableList(orderBy_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -9824,35 +9805,35 @@ public com.google.firestore.v1.StructuredQuery 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 @@ -9970,7 +9951,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.firestore.v1.StructuredQuery.Projection select_ = null; + private com.google.firestore.v1.StructuredQuery.Projection select_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1.StructuredQuery.Projection, com.google.firestore.v1.StructuredQuery.Projection.Builder, @@ -10156,7 +10137,7 @@ public com.google.firestore.v1.StructuredQuery.ProjectionOrBuilder getSelectOrBu java.util.Collections.emptyList(); private void ensureFromIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { from_ = new java.util.ArrayList( from_); @@ -10511,16 +10492,13 @@ public com.google.firestore.v1.StructuredQuery.CollectionSelector.Builder addFro com.google.firestore.v1.StructuredQuery.CollectionSelector, com.google.firestore.v1.StructuredQuery.CollectionSelector.Builder, com.google.firestore.v1.StructuredQuery.CollectionSelectorOrBuilder>( - from_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + from_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); from_ = null; } return fromBuilder_; } - private com.google.firestore.v1.StructuredQuery.Filter where_ = null; + private com.google.firestore.v1.StructuredQuery.Filter where_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1.StructuredQuery.Filter, com.google.firestore.v1.StructuredQuery.Filter.Builder, @@ -10706,7 +10684,7 @@ public com.google.firestore.v1.StructuredQuery.FilterOrBuilder getWhereOrBuilder java.util.Collections.emptyList(); private void ensureOrderByIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { orderBy_ = new java.util.ArrayList(orderBy_); bitField0_ |= 0x00000008; } @@ -11280,16 +11258,13 @@ public com.google.firestore.v1.StructuredQuery.Order.Builder addOrderByBuilder(i com.google.firestore.v1.StructuredQuery.Order, com.google.firestore.v1.StructuredQuery.Order.Builder, com.google.firestore.v1.StructuredQuery.OrderOrBuilder>( - orderBy_, - ((bitField0_ & 0x00000008) == 0x00000008), - getParentForChildren(), - isClean()); + orderBy_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); orderBy_ = null; } return orderByBuilder_; } - private com.google.firestore.v1.Cursor startAt_ = null; + private com.google.firestore.v1.Cursor startAt_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1.Cursor, com.google.firestore.v1.Cursor.Builder, @@ -11464,7 +11439,7 @@ public com.google.firestore.v1.CursorOrBuilder getStartAtOrBuilder() { return startAtBuilder_; } - private com.google.firestore.v1.Cursor endAt_ = null; + private com.google.firestore.v1.Cursor endAt_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1.Cursor, com.google.firestore.v1.Cursor.Builder, @@ -11689,7 +11664,7 @@ public Builder clearOffset() { return this; } - private com.google.protobuf.Int32Value limit_ = null; + private com.google.protobuf.Int32Value limit_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Int32Value, com.google.protobuf.Int32Value.Builder, @@ -11884,7 +11859,7 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() { @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-firestore-v1/src/main/java/com/google/firestore/v1/Target.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/Target.java index 167eaaa2aa9c..e2885422e677 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/Target.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/Target.java @@ -22,10 +22,7 @@ private Target(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private Target() { - targetId_ = 0; - once_ = false; - } + private Target() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -117,7 +114,7 @@ private Target( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -256,7 +253,7 @@ private DocumentsTarget( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { documents_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -265,7 +262,7 @@ private DocumentsTarget( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -277,7 +274,7 @@ private DocumentsTarget( } 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)) { documents_ = documents_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -413,10 +410,9 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1.Target.DocumentsTarget other = (com.google.firestore.v1.Target.DocumentsTarget) obj; - boolean result = true; - result = result && getDocumentsList().equals(other.getDocumentsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDocumentsList().equals(other.getDocumentsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -607,7 +603,7 @@ public com.google.firestore.v1.Target.DocumentsTarget buildPartial() { com.google.firestore.v1.Target.DocumentsTarget result = new com.google.firestore.v1.Target.DocumentsTarget(this); int from_bitField0_ = bitField0_; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { documents_ = documents_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } @@ -618,23 +614,23 @@ public com.google.firestore.v1.Target.DocumentsTarget 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 @@ -642,13 +638,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 @@ -709,7 +705,7 @@ public Builder mergeFrom( com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureDocumentsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { documents_ = new com.google.protobuf.LazyStringArrayList(documents_); bitField0_ |= 0x00000001; } @@ -878,7 +874,7 @@ public Builder addDocumentsBytes(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 @@ -1068,7 +1064,7 @@ private QueryTarget( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -1287,19 +1283,17 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1.Target.QueryTarget other = (com.google.firestore.v1.Target.QueryTarget) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getQueryTypeCase().equals(other.getQueryTypeCase()); - if (!result) return false; + if (!getParent().equals(other.getParent())) return false; + if (!getQueryTypeCase().equals(other.getQueryTypeCase())) return false; switch (queryTypeCase_) { case 2: - result = result && getStructuredQuery().equals(other.getStructuredQuery()); + if (!getStructuredQuery().equals(other.getStructuredQuery())) 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 @@ -1512,23 +1506,23 @@ public com.google.firestore.v1.Target.QueryTarget 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 @@ -1536,13 +1530,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 @@ -1939,7 +1933,7 @@ public com.google.firestore.v1.StructuredQueryOrBuilder getStructuredQueryOrBuil @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -2338,35 +2332,32 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1.Target other = (com.google.firestore.v1.Target) obj; - boolean result = true; - result = result && (getTargetId() == other.getTargetId()); - result = result && (getOnce() == other.getOnce()); - result = result && getTargetTypeCase().equals(other.getTargetTypeCase()); - if (!result) return false; + if (getTargetId() != other.getTargetId()) return false; + if (getOnce() != other.getOnce()) return false; + if (!getTargetTypeCase().equals(other.getTargetTypeCase())) return false; switch (targetTypeCase_) { case 2: - result = result && getQuery().equals(other.getQuery()); + if (!getQuery().equals(other.getQuery())) return false; break; case 3: - result = result && getDocuments().equals(other.getDocuments()); + if (!getDocuments().equals(other.getDocuments())) return false; break; case 0: default: } - result = result && getResumeTypeCase().equals(other.getResumeTypeCase()); - if (!result) return false; + if (!getResumeTypeCase().equals(other.getResumeTypeCase())) return false; switch (resumeTypeCase_) { case 4: - result = result && getResumeToken().equals(other.getResumeToken()); + if (!getResumeToken().equals(other.getResumeToken())) return false; break; case 11: - result = result && getReadTime().equals(other.getReadTime()); + if (!getReadTime().equals(other.getReadTime())) 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 @@ -2615,35 +2606,35 @@ public com.google.firestore.v1.Target 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 @@ -3522,7 +3513,7 @@ public Builder clearOnce() { @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-firestore-v1/src/main/java/com/google/firestore/v1/TargetChange.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/TargetChange.java index cf1a1c657758..67d996e2b065 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/TargetChange.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/TargetChange.java @@ -24,7 +24,7 @@ private TargetChange(com.google.protobuf.GeneratedMessageV3.Builder builder) private TargetChange() { targetChangeType_ = 0; - targetIds_ = java.util.Collections.emptyList(); + targetIds_ = emptyIntList(); resumeToken_ = com.google.protobuf.ByteString.EMPTY; } @@ -61,24 +61,23 @@ private TargetChange( } case 16: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - targetIds_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000002) != 0)) { + targetIds_ = newIntList(); mutable_bitField0_ |= 0x00000002; } - targetIds_.add(input.readInt32()); + targetIds_.addInt(input.readInt32()); break; } case 18: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002) - && input.getBytesUntilLimit() > 0) { - targetIds_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { + targetIds_ = newIntList(); mutable_bitField0_ |= 0x00000002; } while (input.getBytesUntilLimit() > 0) { - targetIds_.add(input.readInt32()); + targetIds_.addInt(input.readInt32()); } input.popLimit(limit); break; @@ -119,7 +118,7 @@ private TargetChange( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -131,8 +130,8 @@ private TargetChange( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - targetIds_ = java.util.Collections.unmodifiableList(targetIds_); + if (((mutable_bitField0_ & 0x00000002) != 0)) { + targetIds_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -395,7 +394,7 @@ public com.google.firestore.v1.TargetChange.TargetChangeType getTargetChangeType } public static final int TARGET_IDS_FIELD_NUMBER = 2; - private java.util.List targetIds_; + private com.google.protobuf.Internal.IntList targetIds_; /** * * @@ -445,7 +444,7 @@ public int getTargetIdsCount() { * repeated int32 target_ids = 2; */ public int getTargetIds(int index) { - return targetIds_.get(index); + return targetIds_.getInt(index); } private int targetIdsMemoizedSerializedSize = -1; @@ -590,7 +589,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io output.writeUInt32NoTag(targetIdsMemoizedSerializedSize); } for (int i = 0; i < targetIds_.size(); i++) { - output.writeInt32NoTag(targetIds_.get(i)); + output.writeInt32NoTag(targetIds_.getInt(i)); } if (cause_ != null) { output.writeMessage(3, getCause()); @@ -617,7 +616,8 @@ public int getSerializedSize() { { int dataSize = 0; for (int i = 0; i < targetIds_.size(); i++) { - dataSize += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(targetIds_.get(i)); + dataSize += + com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(targetIds_.getInt(i)); } size += dataSize; if (!getTargetIdsList().isEmpty()) { @@ -650,20 +650,19 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1.TargetChange other = (com.google.firestore.v1.TargetChange) obj; - boolean result = true; - result = result && targetChangeType_ == other.targetChangeType_; - result = result && getTargetIdsList().equals(other.getTargetIdsList()); - result = result && (hasCause() == other.hasCause()); + if (targetChangeType_ != other.targetChangeType_) return false; + if (!getTargetIdsList().equals(other.getTargetIdsList())) return false; + if (hasCause() != other.hasCause()) return false; if (hasCause()) { - result = result && getCause().equals(other.getCause()); + if (!getCause().equals(other.getCause())) return false; } - result = result && getResumeToken().equals(other.getResumeToken()); - result = result && (hasReadTime() == other.hasReadTime()); + if (!getResumeToken().equals(other.getResumeToken())) return false; + if (hasReadTime() != other.hasReadTime()) return false; if (hasReadTime()) { - result = result && getReadTime().equals(other.getReadTime()); + if (!getReadTime().equals(other.getReadTime())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -835,7 +834,7 @@ public Builder clear() { super.clear(); targetChangeType_ = 0; - targetIds_ = java.util.Collections.emptyList(); + targetIds_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); if (causeBuilder_ == null) { cause_ = null; @@ -880,8 +879,8 @@ public com.google.firestore.v1.TargetChange buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.targetChangeType_ = targetChangeType_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { - targetIds_ = java.util.Collections.unmodifiableList(targetIds_); + if (((bitField0_ & 0x00000002) != 0)) { + targetIds_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000002); } result.targetIds_ = targetIds_; @@ -903,35 +902,35 @@ public com.google.firestore.v1.TargetChange 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 @@ -1078,11 +1077,11 @@ public Builder clearTargetChangeType() { return this; } - private java.util.List targetIds_ = java.util.Collections.emptyList(); + private com.google.protobuf.Internal.IntList targetIds_ = emptyIntList(); private void ensureTargetIdsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { - targetIds_ = new java.util.ArrayList(targetIds_); + if (!((bitField0_ & 0x00000002) != 0)) { + targetIds_ = mutableCopy(targetIds_); bitField0_ |= 0x00000002; } } @@ -1101,7 +1100,9 @@ private void ensureTargetIdsIsMutable() { * repeated int32 target_ids = 2; */ public java.util.List getTargetIdsList() { - return java.util.Collections.unmodifiableList(targetIds_); + return ((bitField0_ & 0x00000002) != 0) + ? java.util.Collections.unmodifiableList(targetIds_) + : targetIds_; } /** * @@ -1135,7 +1136,7 @@ public int getTargetIdsCount() { * repeated int32 target_ids = 2; */ public int getTargetIds(int index) { - return targetIds_.get(index); + return targetIds_.getInt(index); } /** * @@ -1153,7 +1154,7 @@ public int getTargetIds(int index) { */ public Builder setTargetIds(int index, int value) { ensureTargetIdsIsMutable(); - targetIds_.set(index, value); + targetIds_.setInt(index, value); onChanged(); return this; } @@ -1173,7 +1174,7 @@ public Builder setTargetIds(int index, int value) { */ public Builder addTargetIds(int value) { ensureTargetIdsIsMutable(); - targetIds_.add(value); + targetIds_.addInt(value); onChanged(); return this; } @@ -1212,13 +1213,13 @@ public Builder addAllTargetIds(java.lang.Iterable v * repeated int32 target_ids = 2; */ public Builder clearTargetIds() { - targetIds_ = java.util.Collections.emptyList(); + targetIds_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } - private com.google.rpc.Status cause_ = null; + private com.google.rpc.Status cause_; private com.google.protobuf.SingleFieldBuilderV3< com.google.rpc.Status, com.google.rpc.Status.Builder, com.google.rpc.StatusOrBuilder> causeBuilder_; @@ -1440,7 +1441,7 @@ public Builder clearResumeToken() { return this; } - private com.google.protobuf.Timestamp readTime_ = null; + private com.google.protobuf.Timestamp readTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1680,7 +1681,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() { @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-firestore-v1/src/main/java/com/google/firestore/v1/TransactionOptions.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/TransactionOptions.java index 78f8d7fe34f5..99ed143923ec 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/TransactionOptions.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/TransactionOptions.java @@ -86,7 +86,7 @@ private TransactionOptions( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -188,7 +188,7 @@ private ReadWrite( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -280,10 +280,9 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1.TransactionOptions.ReadWrite other = (com.google.firestore.v1.TransactionOptions.ReadWrite) obj; - boolean result = true; - result = result && getRetryTransaction().equals(other.getRetryTransaction()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getRetryTransaction().equals(other.getRetryTransaction())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -479,23 +478,23 @@ public com.google.firestore.v1.TransactionOptions.ReadWrite buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -503,13 +502,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 @@ -609,7 +608,7 @@ public Builder clearRetryTransaction() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -762,7 +761,7 @@ private ReadOnly( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -925,18 +924,16 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1.TransactionOptions.ReadOnly other = (com.google.firestore.v1.TransactionOptions.ReadOnly) obj; - boolean result = true; - result = result && getConsistencySelectorCase().equals(other.getConsistencySelectorCase()); - if (!result) return false; + if (!getConsistencySelectorCase().equals(other.getConsistencySelectorCase())) return false; switch (consistencySelectorCase_) { case 2: - result = result && getReadTime().equals(other.getReadTime()); + if (!getReadTime().equals(other.getReadTime())) 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 @@ -1145,23 +1142,23 @@ public com.google.firestore.v1.TransactionOptions.ReadOnly buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -1169,13 +1166,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 @@ -1459,7 +1456,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1691,21 +1688,19 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1.TransactionOptions other = (com.google.firestore.v1.TransactionOptions) obj; - boolean result = true; - result = result && getModeCase().equals(other.getModeCase()); - if (!result) return false; + if (!getModeCase().equals(other.getModeCase())) return false; switch (modeCase_) { case 2: - result = result && getReadOnly().equals(other.getReadOnly()); + if (!getReadOnly().equals(other.getReadOnly())) return false; break; case 3: - result = result && getReadWrite().equals(other.getReadWrite()); + if (!getReadWrite().equals(other.getReadWrite())) 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 @@ -1922,35 +1917,35 @@ public com.google.firestore.v1.TransactionOptions buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -2430,7 +2425,7 @@ public com.google.firestore.v1.TransactionOptions.ReadWriteOrBuilder getReadWrit @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-firestore-v1/src/main/java/com/google/firestore/v1/UpdateDocumentRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/UpdateDocumentRequest.java index 862f6be5cda2..4b8939859008 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/UpdateDocumentRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/UpdateDocumentRequest.java @@ -113,7 +113,7 @@ private UpdateDocumentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -395,25 +395,24 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1.UpdateDocumentRequest other = (com.google.firestore.v1.UpdateDocumentRequest) obj; - boolean result = true; - result = result && (hasDocument() == other.hasDocument()); + if (hasDocument() != other.hasDocument()) return false; if (hasDocument()) { - result = result && getDocument().equals(other.getDocument()); + if (!getDocument().equals(other.getDocument())) 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 && (hasMask() == other.hasMask()); + if (hasMask() != other.hasMask()) return false; if (hasMask()) { - result = result && getMask().equals(other.getMask()); + if (!getMask().equals(other.getMask())) return false; } - result = result && (hasCurrentDocument() == other.hasCurrentDocument()); + if (hasCurrentDocument() != other.hasCurrentDocument()) return false; if (hasCurrentDocument()) { - result = result && getCurrentDocument().equals(other.getCurrentDocument()); + if (!getCurrentDocument().equals(other.getCurrentDocument())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -661,35 +660,35 @@ public com.google.firestore.v1.UpdateDocumentRequest 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 @@ -745,7 +744,7 @@ public Builder mergeFrom( return this; } - private com.google.firestore.v1.Document document_ = null; + private com.google.firestore.v1.Document document_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1.Document, com.google.firestore.v1.Document.Builder, @@ -935,7 +934,7 @@ public com.google.firestore.v1.DocumentOrBuilder getDocumentOrBuilder() { return documentBuilder_; } - private com.google.firestore.v1.DocumentMask updateMask_ = null; + private com.google.firestore.v1.DocumentMask updateMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1.DocumentMask, com.google.firestore.v1.DocumentMask.Builder, @@ -1161,7 +1160,7 @@ public com.google.firestore.v1.DocumentMaskOrBuilder getUpdateMaskOrBuilder() { return updateMaskBuilder_; } - private com.google.firestore.v1.DocumentMask mask_ = null; + private com.google.firestore.v1.DocumentMask mask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1.DocumentMask, com.google.firestore.v1.DocumentMask.Builder, @@ -1356,7 +1355,7 @@ public com.google.firestore.v1.DocumentMaskOrBuilder getMaskOrBuilder() { return maskBuilder_; } - private com.google.firestore.v1.Precondition currentDocument_ = null; + private com.google.firestore.v1.Precondition currentDocument_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1.Precondition, com.google.firestore.v1.Precondition.Builder, @@ -1549,7 +1548,7 @@ public com.google.firestore.v1.PreconditionOrBuilder getCurrentDocumentOrBuilder @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-firestore-v1/src/main/java/com/google/firestore/v1/Value.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/Value.java index 96e75c68dc90..6bc8e5ca4862 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/Value.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/Value.java @@ -154,7 +154,7 @@ private Value( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -779,51 +779,47 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1.Value other = (com.google.firestore.v1.Value) obj; - boolean result = true; - result = result && getValueTypeCase().equals(other.getValueTypeCase()); - if (!result) return false; + if (!getValueTypeCase().equals(other.getValueTypeCase())) return false; switch (valueTypeCase_) { case 11: - result = result && getNullValueValue() == other.getNullValueValue(); + if (getNullValueValue() != other.getNullValueValue()) return false; break; case 1: - result = result && (getBooleanValue() == other.getBooleanValue()); + if (getBooleanValue() != other.getBooleanValue()) return false; break; case 2: - result = result && (getIntegerValue() == other.getIntegerValue()); + if (getIntegerValue() != other.getIntegerValue()) return false; break; case 3: - result = - result - && (java.lang.Double.doubleToLongBits(getDoubleValue()) - == java.lang.Double.doubleToLongBits(other.getDoubleValue())); + if (java.lang.Double.doubleToLongBits(getDoubleValue()) + != java.lang.Double.doubleToLongBits(other.getDoubleValue())) return false; break; case 10: - result = result && getTimestampValue().equals(other.getTimestampValue()); + if (!getTimestampValue().equals(other.getTimestampValue())) return false; break; case 17: - result = result && getStringValue().equals(other.getStringValue()); + if (!getStringValue().equals(other.getStringValue())) return false; break; case 18: - result = result && getBytesValue().equals(other.getBytesValue()); + if (!getBytesValue().equals(other.getBytesValue())) return false; break; case 5: - result = result && getReferenceValue().equals(other.getReferenceValue()); + if (!getReferenceValue().equals(other.getReferenceValue())) return false; break; case 8: - result = result && getGeoPointValue().equals(other.getGeoPointValue()); + if (!getGeoPointValue().equals(other.getGeoPointValue())) return false; break; case 9: - result = result && getArrayValue().equals(other.getArrayValue()); + if (!getArrayValue().equals(other.getArrayValue())) return false; break; case 6: - result = result && getMapValue().equals(other.getMapValue()); + if (!getMapValue().equals(other.getMapValue())) 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 @@ -1111,35 +1107,35 @@ public com.google.firestore.v1.Value 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 @@ -2604,7 +2600,7 @@ public com.google.firestore.v1.MapValueOrBuilder getMapValueOrBuilder() { @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-firestore-v1/src/main/java/com/google/firestore/v1/Write.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/Write.java index 53e6ab82a78d..b113cb7c7bd1 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/Write.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/Write.java @@ -120,7 +120,7 @@ private Write( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -525,32 +525,30 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1.Write other = (com.google.firestore.v1.Write) obj; - boolean result = true; - 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 && (hasCurrentDocument() == other.hasCurrentDocument()); + if (hasCurrentDocument() != other.hasCurrentDocument()) return false; if (hasCurrentDocument()) { - result = result && getCurrentDocument().equals(other.getCurrentDocument()); + if (!getCurrentDocument().equals(other.getCurrentDocument())) return false; } - result = result && getOperationCase().equals(other.getOperationCase()); - if (!result) return false; + if (!getOperationCase().equals(other.getOperationCase())) return false; switch (operationCase_) { case 1: - result = result && getUpdate().equals(other.getUpdate()); + if (!getUpdate().equals(other.getUpdate())) return false; break; case 2: - result = result && getDelete().equals(other.getDelete()); + if (!getDelete().equals(other.getDelete())) return false; break; case 6: - result = result && getTransform().equals(other.getTransform()); + if (!getTransform().equals(other.getTransform())) 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 @@ -801,35 +799,35 @@ public com.google.firestore.v1.Write buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override 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 @@ -1453,7 +1451,7 @@ public com.google.firestore.v1.DocumentTransformOrBuilder getTransformOrBuilder( return transformBuilder_; } - private com.google.firestore.v1.DocumentMask updateMask_ = null; + private com.google.firestore.v1.DocumentMask updateMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1.DocumentMask, com.google.firestore.v1.DocumentMask.Builder, @@ -1706,7 +1704,7 @@ public com.google.firestore.v1.DocumentMaskOrBuilder getUpdateMaskOrBuilder() { return updateMaskBuilder_; } - private com.google.firestore.v1.Precondition currentDocument_ = null; + private com.google.firestore.v1.Precondition currentDocument_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1.Precondition, com.google.firestore.v1.Precondition.Builder, @@ -1899,7 +1897,7 @@ public com.google.firestore.v1.PreconditionOrBuilder getCurrentDocumentOrBuilder @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-firestore-v1/src/main/java/com/google/firestore/v1/WriteRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/WriteRequest.java index ae36b7b5edd3..d7c19c450071 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/WriteRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/WriteRequest.java @@ -75,7 +75,7 @@ private WriteRequest( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { writes_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -90,7 +90,7 @@ private WriteRequest( } case 42: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry); mutable_bitField0_ |= 0x00000010; @@ -103,7 +103,7 @@ private WriteRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -115,7 +115,7 @@ private WriteRequest( } 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)) { writes_ = java.util.Collections.unmodifiableList(writes_); } this.unknownFields = unknownFields.build(); @@ -518,14 +518,13 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1.WriteRequest other = (com.google.firestore.v1.WriteRequest) obj; - boolean result = true; - result = result && getDatabase().equals(other.getDatabase()); - result = result && getStreamId().equals(other.getStreamId()); - result = result && getWritesList().equals(other.getWritesList()); - result = result && getStreamToken().equals(other.getStreamToken()); - result = result && internalGetLabels().equals(other.internalGetLabels()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDatabase().equals(other.getDatabase())) return false; + if (!getStreamId().equals(other.getStreamId())) return false; + if (!getWritesList().equals(other.getWritesList())) return false; + if (!getStreamToken().equals(other.getStreamToken())) return false; + if (!internalGetLabels().equals(other.internalGetLabels())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -765,7 +764,7 @@ public com.google.firestore.v1.WriteRequest buildPartial() { result.database_ = database_; result.streamId_ = streamId_; if (writesBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { writes_ = java.util.Collections.unmodifiableList(writes_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -783,35 +782,35 @@ public com.google.firestore.v1.WriteRequest 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 @@ -1108,7 +1107,7 @@ public Builder setStreamIdBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureWritesIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { writes_ = new java.util.ArrayList(writes_); bitField0_ |= 0x00000004; } @@ -1515,10 +1514,7 @@ public java.util.List getWritesBuilderLis com.google.firestore.v1.Write, com.google.firestore.v1.Write.Builder, com.google.firestore.v1.WriteOrBuilder>( - writes_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + writes_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); writes_ = null; } return writesBuilder_; @@ -1752,7 +1748,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-firestore-v1/src/main/java/com/google/firestore/v1/WriteResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/WriteResponse.java index 33bb13d0719e..231ac3c80903 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/WriteResponse.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/WriteResponse.java @@ -66,7 +66,7 @@ private WriteResponse( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { writeResults_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -92,7 +92,7 @@ private WriteResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -104,7 +104,7 @@ private WriteResponse( } 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)) { writeResults_ = java.util.Collections.unmodifiableList(writeResults_); } this.unknownFields = unknownFields.build(); @@ -365,16 +365,15 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1.WriteResponse other = (com.google.firestore.v1.WriteResponse) obj; - boolean result = true; - result = result && getStreamId().equals(other.getStreamId()); - result = result && getStreamToken().equals(other.getStreamToken()); - result = result && getWriteResultsList().equals(other.getWriteResultsList()); - result = result && (hasCommitTime() == other.hasCommitTime()); + if (!getStreamId().equals(other.getStreamId())) return false; + if (!getStreamToken().equals(other.getStreamToken())) return false; + if (!getWriteResultsList().equals(other.getWriteResultsList())) return false; + if (hasCommitTime() != other.hasCommitTime()) return false; if (hasCommitTime()) { - result = result && getCommitTime().equals(other.getCommitTime()); + if (!getCommitTime().equals(other.getCommitTime())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -590,7 +589,7 @@ public com.google.firestore.v1.WriteResponse buildPartial() { result.streamId_ = streamId_; result.streamToken_ = streamToken_; if (writeResultsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { writeResults_ = java.util.Collections.unmodifiableList(writeResults_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -610,35 +609,35 @@ public com.google.firestore.v1.WriteResponse 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 @@ -877,7 +876,7 @@ public Builder clearStreamToken() { java.util.Collections.emptyList(); private void ensureWriteResultsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { writeResults_ = new java.util.ArrayList(writeResults_); bitField0_ |= 0x00000004; } @@ -1252,16 +1251,13 @@ public com.google.firestore.v1.WriteResult.Builder addWriteResultsBuilder(int in com.google.firestore.v1.WriteResult, com.google.firestore.v1.WriteResult.Builder, com.google.firestore.v1.WriteResultOrBuilder>( - writeResults_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + writeResults_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); writeResults_ = null; } return writeResultsBuilder_; } - private com.google.protobuf.Timestamp commitTime_ = null; + private com.google.protobuf.Timestamp commitTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1442,7 +1438,7 @@ public com.google.protobuf.TimestampOrBuilder getCommitTimeOrBuilder() { @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-firestore-v1/src/main/java/com/google/firestore/v1/WriteResult.java b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/WriteResult.java index 3ce81de7ecdd..b47d8383ed49 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/WriteResult.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/WriteResult.java @@ -67,7 +67,7 @@ private WriteResult( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { transformResults_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -77,7 +77,7 @@ private WriteResult( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -89,7 +89,7 @@ private WriteResult( } 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)) { transformResults_ = java.util.Collections.unmodifiableList(transformResults_); } this.unknownFields = unknownFields.build(); @@ -280,14 +280,13 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1.WriteResult other = (com.google.firestore.v1.WriteResult) obj; - boolean result = true; - result = result && (hasUpdateTime() == other.hasUpdateTime()); + if (hasUpdateTime() != other.hasUpdateTime()) return false; if (hasUpdateTime()) { - result = result && getUpdateTime().equals(other.getUpdateTime()); + if (!getUpdateTime().equals(other.getUpdateTime())) return false; } - result = result && getTransformResultsList().equals(other.getTransformResultsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTransformResultsList().equals(other.getTransformResultsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -497,7 +496,7 @@ public com.google.firestore.v1.WriteResult buildPartial() { result.updateTime_ = updateTimeBuilder_.build(); } if (transformResultsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { transformResults_ = java.util.Collections.unmodifiableList(transformResults_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -512,35 +511,35 @@ public com.google.firestore.v1.WriteResult 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 @@ -616,7 +615,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.protobuf.Timestamp updateTime_ = null; + private com.google.protobuf.Timestamp updateTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -826,7 +825,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { java.util.Collections.emptyList(); private void ensureTransformResultsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { transformResults_ = new java.util.ArrayList(transformResults_); bitField0_ |= 0x00000002; @@ -1184,7 +1183,7 @@ public java.util.List getTransformResults com.google.firestore.v1.Value.Builder, com.google.firestore.v1.ValueOrBuilder>( transformResults_, - ((bitField0_ & 0x00000002) == 0x00000002), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); transformResults_ = null; @@ -1194,7 +1193,7 @@ public java.util.List getTransformResults @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ArrayValue.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ArrayValue.java index b29683b66963..7c778ad1f052 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ArrayValue.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ArrayValue.java @@ -52,7 +52,7 @@ private ArrayValue( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { values_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -63,7 +63,7 @@ private ArrayValue( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -75,7 +75,7 @@ private ArrayValue( } 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)) { values_ = java.util.Collections.unmodifiableList(values_); } this.unknownFields = unknownFields.build(); @@ -206,10 +206,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1beta1.ArrayValue other = (com.google.firestore.v1beta1.ArrayValue) obj; - boolean result = true; - result = result && getValuesList().equals(other.getValuesList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getValuesList().equals(other.getValuesList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -405,7 +404,7 @@ public com.google.firestore.v1beta1.ArrayValue buildPartial() { new com.google.firestore.v1beta1.ArrayValue(this); int from_bitField0_ = bitField0_; if (valuesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { values_ = java.util.Collections.unmodifiableList(values_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -419,35 +418,35 @@ public com.google.firestore.v1beta1.ArrayValue 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 @@ -524,7 +523,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureValuesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { values_ = new java.util.ArrayList(values_); bitField0_ |= 0x00000001; } @@ -862,10 +861,7 @@ public java.util.List getValuesBuild com.google.firestore.v1beta1.Value, com.google.firestore.v1beta1.Value.Builder, com.google.firestore.v1beta1.ValueOrBuilder>( - values_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + values_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); values_ = null; } return valuesBuilder_; @@ -873,7 +869,7 @@ public java.util.List getValuesBuild @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BatchGetDocumentsRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BatchGetDocumentsRequest.java index 26c9ea6d78d4..2e5ae21bfae3 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BatchGetDocumentsRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BatchGetDocumentsRequest.java @@ -61,7 +61,7 @@ private BatchGetDocumentsRequest( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { documents_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -126,7 +126,7 @@ private BatchGetDocumentsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -138,7 +138,7 @@ private BatchGetDocumentsRequest( } 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)) { documents_ = documents_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -562,30 +562,28 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.BatchGetDocumentsRequest other = (com.google.firestore.v1beta1.BatchGetDocumentsRequest) obj; - boolean result = true; - result = result && getDatabase().equals(other.getDatabase()); - result = result && getDocumentsList().equals(other.getDocumentsList()); - result = result && (hasMask() == other.hasMask()); + if (!getDatabase().equals(other.getDatabase())) return false; + if (!getDocumentsList().equals(other.getDocumentsList())) return false; + if (hasMask() != other.hasMask()) return false; if (hasMask()) { - result = result && getMask().equals(other.getMask()); + if (!getMask().equals(other.getMask())) return false; } - result = result && getConsistencySelectorCase().equals(other.getConsistencySelectorCase()); - if (!result) return false; + if (!getConsistencySelectorCase().equals(other.getConsistencySelectorCase())) return false; switch (consistencySelectorCase_) { case 4: - result = result && getTransaction().equals(other.getTransaction()); + if (!getTransaction().equals(other.getTransaction())) return false; break; case 5: - result = result && getNewTransaction().equals(other.getNewTransaction()); + if (!getNewTransaction().equals(other.getNewTransaction())) return false; break; case 7: - result = result && getReadTime().equals(other.getReadTime()); + if (!getReadTime().equals(other.getReadTime())) 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 @@ -809,7 +807,7 @@ public com.google.firestore.v1beta1.BatchGetDocumentsRequest buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.database_ = database_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { documents_ = documents_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000002); } @@ -844,35 +842,35 @@ public com.google.firestore.v1beta1.BatchGetDocumentsRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1075,7 +1073,7 @@ public Builder setDatabaseBytes(com.google.protobuf.ByteString value) { com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureDocumentsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { documents_ = new com.google.protobuf.LazyStringArrayList(documents_); bitField0_ |= 0x00000002; } @@ -1241,7 +1239,7 @@ public Builder addDocumentsBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.firestore.v1beta1.DocumentMask mask_ = null; + private com.google.firestore.v1beta1.DocumentMask mask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1beta1.DocumentMask, com.google.firestore.v1beta1.DocumentMask.Builder, @@ -1934,7 +1932,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() { @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BatchGetDocumentsResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BatchGetDocumentsResponse.java index f8e358aef158..30e162cda624 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BatchGetDocumentsResponse.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BatchGetDocumentsResponse.java @@ -95,7 +95,7 @@ private BatchGetDocumentsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -395,26 +395,24 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.BatchGetDocumentsResponse other = (com.google.firestore.v1beta1.BatchGetDocumentsResponse) obj; - boolean result = true; - result = result && getTransaction().equals(other.getTransaction()); - result = result && (hasReadTime() == other.hasReadTime()); + if (!getTransaction().equals(other.getTransaction())) return false; + if (hasReadTime() != other.hasReadTime()) return false; if (hasReadTime()) { - result = result && getReadTime().equals(other.getReadTime()); + if (!getReadTime().equals(other.getReadTime())) return false; } - result = result && getResultCase().equals(other.getResultCase()); - if (!result) return false; + if (!getResultCase().equals(other.getResultCase())) return false; switch (resultCase_) { case 1: - result = result && getFound().equals(other.getFound()); + if (!getFound().equals(other.getFound())) return false; break; case 2: - result = result && getMissing().equals(other.getMissing()); + if (!getMissing().equals(other.getMissing())) 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 +646,35 @@ public com.google.firestore.v1beta1.BatchGetDocumentsResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1122,7 +1120,7 @@ public Builder clearTransaction() { return this; } - private com.google.protobuf.Timestamp readTime_ = null; + private com.google.protobuf.Timestamp readTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1326,7 +1324,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() { @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BeginTransactionRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BeginTransactionRequest.java index 447eaa63932b..7873a9836581 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BeginTransactionRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BeginTransactionRequest.java @@ -75,7 +75,7 @@ private BeginTransactionRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -247,14 +247,13 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.BeginTransactionRequest other = (com.google.firestore.v1beta1.BeginTransactionRequest) obj; - boolean result = true; - result = result && getDatabase().equals(other.getDatabase()); - result = result && (hasOptions() == other.hasOptions()); + if (!getDatabase().equals(other.getDatabase())) return false; + if (hasOptions() != other.hasOptions()) return false; if (hasOptions()) { - result = result && getOptions().equals(other.getOptions()); + if (!getOptions().equals(other.getOptions())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -462,35 +461,35 @@ public com.google.firestore.v1beta1.BeginTransactionRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -642,7 +641,7 @@ public Builder setDatabaseBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.firestore.v1beta1.TransactionOptions options_ = null; + private com.google.firestore.v1beta1.TransactionOptions options_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1beta1.TransactionOptions, com.google.firestore.v1beta1.TransactionOptions.Builder, @@ -835,7 +834,7 @@ public com.google.firestore.v1beta1.TransactionOptionsOrBuilder getOptionsOrBuil @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BeginTransactionResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BeginTransactionResponse.java index d72489e45ea9..1d6018a502fc 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BeginTransactionResponse.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/BeginTransactionResponse.java @@ -57,7 +57,7 @@ private BeginTransactionResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -149,10 +149,9 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.BeginTransactionResponse other = (com.google.firestore.v1beta1.BeginTransactionResponse) obj; - boolean result = true; - result = result && getTransaction().equals(other.getTransaction()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTransaction().equals(other.getTransaction())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -346,35 +345,35 @@ public com.google.firestore.v1beta1.BeginTransactionResponse 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 @@ -472,7 +471,7 @@ public Builder clearTransaction() { @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommitRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommitRequest.java index 223657b179a0..e0ae89a3cf3f 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommitRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommitRequest.java @@ -61,7 +61,7 @@ private CommitRequest( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { writes_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -77,7 +77,7 @@ private CommitRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -89,7 +89,7 @@ private CommitRequest( } 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)) { writes_ = java.util.Collections.unmodifiableList(writes_); } this.unknownFields = unknownFields.build(); @@ -299,12 +299,11 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.CommitRequest other = (com.google.firestore.v1beta1.CommitRequest) obj; - boolean result = true; - result = result && getDatabase().equals(other.getDatabase()); - result = result && getWritesList().equals(other.getWritesList()); - result = result && getTransaction().equals(other.getTransaction()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDatabase().equals(other.getDatabase())) return false; + if (!getWritesList().equals(other.getWritesList())) return false; + if (!getTransaction().equals(other.getTransaction())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -510,7 +509,7 @@ public com.google.firestore.v1beta1.CommitRequest buildPartial() { int to_bitField0_ = 0; result.database_ = database_; if (writesBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { writes_ = java.util.Collections.unmodifiableList(writes_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -526,35 +525,35 @@ public com.google.firestore.v1beta1.CommitRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -737,7 +736,7 @@ public Builder setDatabaseBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureWritesIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { writes_ = new java.util.ArrayList(writes_); bitField0_ |= 0x00000002; } @@ -1093,10 +1092,7 @@ public java.util.List getWritesBuild com.google.firestore.v1beta1.Write, com.google.firestore.v1beta1.Write.Builder, com.google.firestore.v1beta1.WriteOrBuilder>( - writes_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + writes_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); writes_ = null; } return writesBuilder_; @@ -1151,7 +1147,7 @@ public Builder clearTransaction() { @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommitResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommitResponse.java index 6f4e4f675047..852eb16032dd 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommitResponse.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CommitResponse.java @@ -52,7 +52,7 @@ private CommitResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { writeResults_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -78,7 +78,7 @@ private CommitResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -90,7 +90,7 @@ private CommitResponse( } 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)) { writeResults_ = java.util.Collections.unmodifiableList(writeResults_); } this.unknownFields = unknownFields.build(); @@ -278,14 +278,13 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.CommitResponse other = (com.google.firestore.v1beta1.CommitResponse) obj; - boolean result = true; - result = result && getWriteResultsList().equals(other.getWriteResultsList()); - result = result && (hasCommitTime() == other.hasCommitTime()); + if (!getWriteResultsList().equals(other.getWriteResultsList())) return false; + if (hasCommitTime() != other.hasCommitTime()) return false; if (hasCommitTime()) { - result = result && getCommitTime().equals(other.getCommitTime()); + if (!getCommitTime().equals(other.getCommitTime())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -492,7 +491,7 @@ public com.google.firestore.v1beta1.CommitResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (writeResultsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { writeResults_ = java.util.Collections.unmodifiableList(writeResults_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -512,35 +511,35 @@ public com.google.firestore.v1beta1.CommitResponse buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -620,7 +619,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureWriteResultsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { writeResults_ = new java.util.ArrayList(writeResults_); bitField0_ |= 0x00000001; @@ -997,16 +996,13 @@ public com.google.firestore.v1beta1.WriteResult.Builder addWriteResultsBuilder(i com.google.firestore.v1beta1.WriteResult, com.google.firestore.v1beta1.WriteResult.Builder, com.google.firestore.v1beta1.WriteResultOrBuilder>( - writeResults_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + writeResults_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); writeResults_ = null; } return writeResultsBuilder_; } - private com.google.protobuf.Timestamp commitTime_ = null; + private com.google.protobuf.Timestamp commitTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1187,7 +1183,7 @@ public com.google.protobuf.TimestampOrBuilder getCommitTimeOrBuilder() { @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CreateDocumentRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CreateDocumentRequest.java index 63a7314008e3..0e8073660b84 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CreateDocumentRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/CreateDocumentRequest.java @@ -107,7 +107,7 @@ private CreateDocumentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -429,20 +429,19 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.CreateDocumentRequest other = (com.google.firestore.v1beta1.CreateDocumentRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getCollectionId().equals(other.getCollectionId()); - result = result && getDocumentId().equals(other.getDocumentId()); - result = result && (hasDocument() == other.hasDocument()); + if (!getParent().equals(other.getParent())) return false; + if (!getCollectionId().equals(other.getCollectionId())) return false; + if (!getDocumentId().equals(other.getDocumentId())) return false; + if (hasDocument() != other.hasDocument()) return false; if (hasDocument()) { - result = result && getDocument().equals(other.getDocument()); + if (!getDocument().equals(other.getDocument())) return false; } - result = result && (hasMask() == other.hasMask()); + if (hasMask() != other.hasMask()) return false; if (hasMask()) { - result = result && getMask().equals(other.getMask()); + if (!getMask().equals(other.getMask())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -675,35 +674,35 @@ public com.google.firestore.v1beta1.CreateDocumentRequest 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 @@ -1064,7 +1063,7 @@ public Builder setDocumentIdBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.firestore.v1beta1.Document document_ = null; + private com.google.firestore.v1beta1.Document document_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1beta1.Document, com.google.firestore.v1beta1.Document.Builder, @@ -1245,7 +1244,7 @@ public com.google.firestore.v1beta1.DocumentOrBuilder getDocumentOrBuilder() { return documentBuilder_; } - private com.google.firestore.v1beta1.DocumentMask mask_ = null; + private com.google.firestore.v1beta1.DocumentMask mask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1beta1.DocumentMask, com.google.firestore.v1beta1.DocumentMask.Builder, @@ -1446,7 +1445,7 @@ public com.google.firestore.v1beta1.DocumentMaskOrBuilder getMaskOrBuilder() { @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Cursor.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Cursor.java index a198434c633a..6835778de363 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Cursor.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Cursor.java @@ -24,7 +24,6 @@ private Cursor(com.google.protobuf.GeneratedMessageV3.Builder builder) { private Cursor() { values_ = java.util.Collections.emptyList(); - before_ = false; } @java.lang.Override @@ -53,7 +52,7 @@ private Cursor( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { values_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -69,7 +68,7 @@ private Cursor( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -81,7 +80,7 @@ private Cursor( } 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)) { values_ = java.util.Collections.unmodifiableList(values_); } this.unknownFields = unknownFields.build(); @@ -245,11 +244,10 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1beta1.Cursor other = (com.google.firestore.v1beta1.Cursor) obj; - boolean result = true; - result = result && getValuesList().equals(other.getValuesList()); - result = result && (getBefore() == other.getBefore()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getValuesList().equals(other.getValuesList())) return false; + if (getBefore() != other.getBefore()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -448,7 +446,7 @@ public com.google.firestore.v1beta1.Cursor buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (valuesBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { values_ = java.util.Collections.unmodifiableList(values_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -464,35 +462,35 @@ public com.google.firestore.v1beta1.Cursor 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 +570,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureValuesIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { values_ = new java.util.ArrayList(values_); bitField0_ |= 0x00000001; } @@ -946,10 +944,7 @@ public java.util.List getValuesBuild com.google.firestore.v1beta1.Value, com.google.firestore.v1beta1.Value.Builder, com.google.firestore.v1beta1.ValueOrBuilder>( - values_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + values_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); values_ = null; } return valuesBuilder_; @@ -1004,7 +999,7 @@ public Builder clearBefore() { @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DeleteDocumentRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DeleteDocumentRequest.java index 22d4f63166c9..d5710fcee50d 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DeleteDocumentRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DeleteDocumentRequest.java @@ -75,7 +75,7 @@ private DeleteDocumentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -247,14 +247,13 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.DeleteDocumentRequest other = (com.google.firestore.v1beta1.DeleteDocumentRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (hasCurrentDocument() == other.hasCurrentDocument()); + if (!getName().equals(other.getName())) return false; + if (hasCurrentDocument() != other.hasCurrentDocument()) return false; if (hasCurrentDocument()) { - result = result && getCurrentDocument().equals(other.getCurrentDocument()); + if (!getCurrentDocument().equals(other.getCurrentDocument())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -462,35 +461,35 @@ public com.google.firestore.v1beta1.DeleteDocumentRequest 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 @@ -642,7 +641,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.firestore.v1beta1.Precondition currentDocument_ = null; + private com.google.firestore.v1beta1.Precondition currentDocument_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1beta1.Precondition, com.google.firestore.v1beta1.Precondition.Builder, @@ -835,7 +834,7 @@ public com.google.firestore.v1beta1.PreconditionOrBuilder getCurrentDocumentOrBu @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Document.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Document.java index a9c6896c5bc5..cc48c6e45938 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Document.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Document.java @@ -60,7 +60,7 @@ private Document( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { fields_ = com.google.protobuf.MapField.newMapField(FieldsDefaultEntryHolder.defaultEntry); mutable_bitField0_ |= 0x00000002; @@ -105,7 +105,7 @@ private Document( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -530,19 +530,18 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1beta1.Document other = (com.google.firestore.v1beta1.Document) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && internalGetFields().equals(other.internalGetFields()); - result = result && (hasCreateTime() == other.hasCreateTime()); + if (!getName().equals(other.getName())) return false; + if (!internalGetFields().equals(other.internalGetFields())) 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 && (hasUpdateTime() == other.hasUpdateTime()); + if (hasUpdateTime() != other.hasUpdateTime()) return false; if (hasUpdateTime()) { - result = result && getUpdateTime().equals(other.getUpdateTime()); + if (!getUpdateTime().equals(other.getUpdateTime())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -795,35 +794,35 @@ public com.google.firestore.v1beta1.Document 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 @@ -1262,7 +1261,7 @@ public Builder putAllFields( 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, @@ -1468,7 +1467,7 @@ public com.google.protobuf.TimestampOrBuilder getCreateTimeOrBuilder() { return createTimeBuilder_; } - private com.google.protobuf.Timestamp updateTime_ = null; + private com.google.protobuf.Timestamp updateTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1676,7 +1675,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentChange.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentChange.java index 9a3ed07ab98b..2af32f297669 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentChange.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentChange.java @@ -27,8 +27,8 @@ private DocumentChange(com.google.protobuf.GeneratedMessageV3.Builder builder } private DocumentChange() { - targetIds_ = java.util.Collections.emptyList(); - removedTargetIds_ = java.util.Collections.emptyList(); + targetIds_ = emptyIntList(); + removedTargetIds_ = emptyIntList(); } @java.lang.Override @@ -73,55 +73,53 @@ private DocumentChange( } case 40: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - targetIds_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000002) != 0)) { + targetIds_ = newIntList(); mutable_bitField0_ |= 0x00000002; } - targetIds_.add(input.readInt32()); + targetIds_.addInt(input.readInt32()); break; } case 42: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002) - && input.getBytesUntilLimit() > 0) { - targetIds_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { + targetIds_ = newIntList(); mutable_bitField0_ |= 0x00000002; } while (input.getBytesUntilLimit() > 0) { - targetIds_.add(input.readInt32()); + targetIds_.addInt(input.readInt32()); } input.popLimit(limit); break; } case 48: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { - removedTargetIds_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000004) != 0)) { + removedTargetIds_ = newIntList(); mutable_bitField0_ |= 0x00000004; } - removedTargetIds_.add(input.readInt32()); + removedTargetIds_.addInt(input.readInt32()); break; } case 50: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004) - && input.getBytesUntilLimit() > 0) { - removedTargetIds_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000004) != 0) && input.getBytesUntilLimit() > 0) { + removedTargetIds_ = newIntList(); mutable_bitField0_ |= 0x00000004; } while (input.getBytesUntilLimit() > 0) { - removedTargetIds_.add(input.readInt32()); + removedTargetIds_.addInt(input.readInt32()); } input.popLimit(limit); break; } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -133,11 +131,11 @@ private DocumentChange( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - targetIds_ = java.util.Collections.unmodifiableList(targetIds_); + if (((mutable_bitField0_ & 0x00000002) != 0)) { + targetIds_.makeImmutable(); // C } - if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) { - removedTargetIds_ = java.util.Collections.unmodifiableList(removedTargetIds_); + if (((mutable_bitField0_ & 0x00000004) != 0)) { + removedTargetIds_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -205,7 +203,7 @@ public com.google.firestore.v1beta1.DocumentOrBuilder getDocumentOrBuilder() { } public static final int TARGET_IDS_FIELD_NUMBER = 5; - private java.util.List targetIds_; + private com.google.protobuf.Internal.IntList targetIds_; /** * * @@ -240,13 +238,13 @@ public int getTargetIdsCount() { * repeated int32 target_ids = 5; */ public int getTargetIds(int index) { - return targetIds_.get(index); + return targetIds_.getInt(index); } private int targetIdsMemoizedSerializedSize = -1; public static final int REMOVED_TARGET_IDS_FIELD_NUMBER = 6; - private java.util.List removedTargetIds_; + private com.google.protobuf.Internal.IntList removedTargetIds_; /** * * @@ -281,7 +279,7 @@ public int getRemovedTargetIdsCount() { * repeated int32 removed_target_ids = 6; */ public int getRemovedTargetIds(int index) { - return removedTargetIds_.get(index); + return removedTargetIds_.getInt(index); } private int removedTargetIdsMemoizedSerializedSize = -1; @@ -309,14 +307,14 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io output.writeUInt32NoTag(targetIdsMemoizedSerializedSize); } for (int i = 0; i < targetIds_.size(); i++) { - output.writeInt32NoTag(targetIds_.get(i)); + output.writeInt32NoTag(targetIds_.getInt(i)); } if (getRemovedTargetIdsList().size() > 0) { output.writeUInt32NoTag(50); output.writeUInt32NoTag(removedTargetIdsMemoizedSerializedSize); } for (int i = 0; i < removedTargetIds_.size(); i++) { - output.writeInt32NoTag(removedTargetIds_.get(i)); + output.writeInt32NoTag(removedTargetIds_.getInt(i)); } unknownFields.writeTo(output); } @@ -333,7 +331,8 @@ public int getSerializedSize() { { int dataSize = 0; for (int i = 0; i < targetIds_.size(); i++) { - dataSize += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(targetIds_.get(i)); + dataSize += + com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(targetIds_.getInt(i)); } size += dataSize; if (!getTargetIdsList().isEmpty()) { @@ -346,7 +345,8 @@ public int getSerializedSize() { int dataSize = 0; for (int i = 0; i < removedTargetIds_.size(); i++) { dataSize += - com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(removedTargetIds_.get(i)); + com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag( + removedTargetIds_.getInt(i)); } size += dataSize; if (!getRemovedTargetIdsList().isEmpty()) { @@ -371,15 +371,14 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.DocumentChange other = (com.google.firestore.v1beta1.DocumentChange) obj; - boolean result = true; - result = result && (hasDocument() == other.hasDocument()); + if (hasDocument() != other.hasDocument()) return false; if (hasDocument()) { - result = result && getDocument().equals(other.getDocument()); + if (!getDocument().equals(other.getDocument())) return false; } - result = result && getTargetIdsList().equals(other.getTargetIdsList()); - result = result && getRemovedTargetIdsList().equals(other.getRemovedTargetIdsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTargetIdsList().equals(other.getTargetIdsList())) return false; + if (!getRemovedTargetIdsList().equals(other.getRemovedTargetIdsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -556,9 +555,9 @@ public Builder clear() { document_ = null; documentBuilder_ = null; } - targetIds_ = java.util.Collections.emptyList(); + targetIds_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); - removedTargetIds_ = java.util.Collections.emptyList(); + removedTargetIds_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000004); return this; } @@ -594,13 +593,13 @@ public com.google.firestore.v1beta1.DocumentChange buildPartial() { } else { result.document_ = documentBuilder_.build(); } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - targetIds_ = java.util.Collections.unmodifiableList(targetIds_); + if (((bitField0_ & 0x00000002) != 0)) { + targetIds_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000002); } result.targetIds_ = targetIds_; - if (((bitField0_ & 0x00000004) == 0x00000004)) { - removedTargetIds_ = java.util.Collections.unmodifiableList(removedTargetIds_); + if (((bitField0_ & 0x00000004) != 0)) { + removedTargetIds_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000004); } result.removedTargetIds_ = removedTargetIds_; @@ -611,35 +610,35 @@ public com.google.firestore.v1beta1.DocumentChange 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 @@ -708,7 +707,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.firestore.v1beta1.Document document_ = null; + private com.google.firestore.v1beta1.Document document_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1beta1.Document, com.google.firestore.v1beta1.Document.Builder, @@ -898,11 +897,11 @@ public com.google.firestore.v1beta1.DocumentOrBuilder getDocumentOrBuilder() { return documentBuilder_; } - private java.util.List targetIds_ = java.util.Collections.emptyList(); + private com.google.protobuf.Internal.IntList targetIds_ = emptyIntList(); private void ensureTargetIdsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { - targetIds_ = new java.util.ArrayList(targetIds_); + if (!((bitField0_ & 0x00000002) != 0)) { + targetIds_ = mutableCopy(targetIds_); bitField0_ |= 0x00000002; } } @@ -916,7 +915,9 @@ private void ensureTargetIdsIsMutable() { * repeated int32 target_ids = 5; */ public java.util.List getTargetIdsList() { - return java.util.Collections.unmodifiableList(targetIds_); + return ((bitField0_ & 0x00000002) != 0) + ? java.util.Collections.unmodifiableList(targetIds_) + : targetIds_; } /** * @@ -940,7 +941,7 @@ public int getTargetIdsCount() { * repeated int32 target_ids = 5; */ public int getTargetIds(int index) { - return targetIds_.get(index); + return targetIds_.getInt(index); } /** * @@ -953,7 +954,7 @@ public int getTargetIds(int index) { */ public Builder setTargetIds(int index, int value) { ensureTargetIdsIsMutable(); - targetIds_.set(index, value); + targetIds_.setInt(index, value); onChanged(); return this; } @@ -968,7 +969,7 @@ public Builder setTargetIds(int index, int value) { */ public Builder addTargetIds(int value) { ensureTargetIdsIsMutable(); - targetIds_.add(value); + targetIds_.addInt(value); onChanged(); return this; } @@ -997,17 +998,17 @@ public Builder addAllTargetIds(java.lang.Iterable v * repeated int32 target_ids = 5; */ public Builder clearTargetIds() { - targetIds_ = java.util.Collections.emptyList(); + targetIds_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } - private java.util.List removedTargetIds_ = java.util.Collections.emptyList(); + private com.google.protobuf.Internal.IntList removedTargetIds_ = emptyIntList(); private void ensureRemovedTargetIdsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { - removedTargetIds_ = new java.util.ArrayList(removedTargetIds_); + if (!((bitField0_ & 0x00000004) != 0)) { + removedTargetIds_ = mutableCopy(removedTargetIds_); bitField0_ |= 0x00000004; } } @@ -1021,7 +1022,9 @@ private void ensureRemovedTargetIdsIsMutable() { * repeated int32 removed_target_ids = 6; */ public java.util.List getRemovedTargetIdsList() { - return java.util.Collections.unmodifiableList(removedTargetIds_); + return ((bitField0_ & 0x00000004) != 0) + ? java.util.Collections.unmodifiableList(removedTargetIds_) + : removedTargetIds_; } /** * @@ -1045,7 +1048,7 @@ public int getRemovedTargetIdsCount() { * repeated int32 removed_target_ids = 6; */ public int getRemovedTargetIds(int index) { - return removedTargetIds_.get(index); + return removedTargetIds_.getInt(index); } /** * @@ -1058,7 +1061,7 @@ public int getRemovedTargetIds(int index) { */ public Builder setRemovedTargetIds(int index, int value) { ensureRemovedTargetIdsIsMutable(); - removedTargetIds_.set(index, value); + removedTargetIds_.setInt(index, value); onChanged(); return this; } @@ -1073,7 +1076,7 @@ public Builder setRemovedTargetIds(int index, int value) { */ public Builder addRemovedTargetIds(int value) { ensureRemovedTargetIdsIsMutable(); - removedTargetIds_.add(value); + removedTargetIds_.addInt(value); onChanged(); return this; } @@ -1102,7 +1105,7 @@ public Builder addAllRemovedTargetIds(java.lang.Iterablerepeated int32 removed_target_ids = 6; */ public Builder clearRemovedTargetIds() { - removedTargetIds_ = java.util.Collections.emptyList(); + removedTargetIds_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000004); onChanged(); return this; @@ -1110,7 +1113,7 @@ public Builder clearRemovedTargetIds() { @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentDelete.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentDelete.java index 1fa5c97df7c7..0e9f4c7753f0 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentDelete.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentDelete.java @@ -28,7 +28,7 @@ private DocumentDelete(com.google.protobuf.GeneratedMessageV3.Builder builder private DocumentDelete() { document_ = ""; - removedTargetIds_ = java.util.Collections.emptyList(); + removedTargetIds_ = emptyIntList(); } @java.lang.Override @@ -79,31 +79,30 @@ private DocumentDelete( } case 48: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - removedTargetIds_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000002) != 0)) { + removedTargetIds_ = newIntList(); mutable_bitField0_ |= 0x00000002; } - removedTargetIds_.add(input.readInt32()); + removedTargetIds_.addInt(input.readInt32()); break; } case 50: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002) - && input.getBytesUntilLimit() > 0) { - removedTargetIds_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { + removedTargetIds_ = newIntList(); mutable_bitField0_ |= 0x00000002; } while (input.getBytesUntilLimit() > 0) { - removedTargetIds_.add(input.readInt32()); + removedTargetIds_.addInt(input.readInt32()); } input.popLimit(limit); break; } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -115,8 +114,8 @@ private DocumentDelete( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - removedTargetIds_ = java.util.Collections.unmodifiableList(removedTargetIds_); + if (((mutable_bitField0_ & 0x00000002) != 0)) { + removedTargetIds_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -183,7 +182,7 @@ public com.google.protobuf.ByteString getDocumentBytes() { } public static final int REMOVED_TARGET_IDS_FIELD_NUMBER = 6; - private java.util.List removedTargetIds_; + private com.google.protobuf.Internal.IntList removedTargetIds_; /** * * @@ -218,7 +217,7 @@ public int getRemovedTargetIdsCount() { * repeated int32 removed_target_ids = 6; */ public int getRemovedTargetIds(int index) { - return removedTargetIds_.get(index); + return removedTargetIds_.getInt(index); } private int removedTargetIdsMemoizedSerializedSize = -1; @@ -291,7 +290,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io output.writeUInt32NoTag(removedTargetIdsMemoizedSerializedSize); } for (int i = 0; i < removedTargetIds_.size(); i++) { - output.writeInt32NoTag(removedTargetIds_.get(i)); + output.writeInt32NoTag(removedTargetIds_.getInt(i)); } unknownFields.writeTo(output); } @@ -312,7 +311,8 @@ public int getSerializedSize() { int dataSize = 0; for (int i = 0; i < removedTargetIds_.size(); i++) { dataSize += - com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(removedTargetIds_.get(i)); + com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag( + removedTargetIds_.getInt(i)); } size += dataSize; if (!getRemovedTargetIdsList().isEmpty()) { @@ -337,15 +337,14 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.DocumentDelete other = (com.google.firestore.v1beta1.DocumentDelete) obj; - boolean result = true; - result = result && getDocument().equals(other.getDocument()); - result = result && getRemovedTargetIdsList().equals(other.getRemovedTargetIdsList()); - result = result && (hasReadTime() == other.hasReadTime()); + if (!getDocument().equals(other.getDocument())) return false; + if (!getRemovedTargetIdsList().equals(other.getRemovedTargetIdsList())) return false; + if (hasReadTime() != other.hasReadTime()) return false; if (hasReadTime()) { - result = result && getReadTime().equals(other.getReadTime()); + if (!getReadTime().equals(other.getReadTime())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -516,7 +515,7 @@ public Builder clear() { super.clear(); document_ = ""; - removedTargetIds_ = java.util.Collections.emptyList(); + removedTargetIds_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); if (readTimeBuilder_ == null) { readTime_ = null; @@ -554,8 +553,8 @@ public com.google.firestore.v1beta1.DocumentDelete buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.document_ = document_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { - removedTargetIds_ = java.util.Collections.unmodifiableList(removedTargetIds_); + if (((bitField0_ & 0x00000002) != 0)) { + removedTargetIds_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000002); } result.removedTargetIds_ = removedTargetIds_; @@ -571,35 +570,35 @@ public com.google.firestore.v1beta1.DocumentDelete 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 @@ -756,11 +755,11 @@ public Builder setDocumentBytes(com.google.protobuf.ByteString value) { return this; } - private java.util.List removedTargetIds_ = java.util.Collections.emptyList(); + private com.google.protobuf.Internal.IntList removedTargetIds_ = emptyIntList(); private void ensureRemovedTargetIdsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { - removedTargetIds_ = new java.util.ArrayList(removedTargetIds_); + if (!((bitField0_ & 0x00000002) != 0)) { + removedTargetIds_ = mutableCopy(removedTargetIds_); bitField0_ |= 0x00000002; } } @@ -774,7 +773,9 @@ private void ensureRemovedTargetIdsIsMutable() { * repeated int32 removed_target_ids = 6; */ public java.util.List getRemovedTargetIdsList() { - return java.util.Collections.unmodifiableList(removedTargetIds_); + return ((bitField0_ & 0x00000002) != 0) + ? java.util.Collections.unmodifiableList(removedTargetIds_) + : removedTargetIds_; } /** * @@ -798,7 +799,7 @@ public int getRemovedTargetIdsCount() { * repeated int32 removed_target_ids = 6; */ public int getRemovedTargetIds(int index) { - return removedTargetIds_.get(index); + return removedTargetIds_.getInt(index); } /** * @@ -811,7 +812,7 @@ public int getRemovedTargetIds(int index) { */ public Builder setRemovedTargetIds(int index, int value) { ensureRemovedTargetIdsIsMutable(); - removedTargetIds_.set(index, value); + removedTargetIds_.setInt(index, value); onChanged(); return this; } @@ -826,7 +827,7 @@ public Builder setRemovedTargetIds(int index, int value) { */ public Builder addRemovedTargetIds(int value) { ensureRemovedTargetIdsIsMutable(); - removedTargetIds_.add(value); + removedTargetIds_.addInt(value); onChanged(); return this; } @@ -855,13 +856,13 @@ public Builder addAllRemovedTargetIds(java.lang.Iterablerepeated int32 removed_target_ids = 6; */ public Builder clearRemovedTargetIds() { - removedTargetIds_ = java.util.Collections.emptyList(); + removedTargetIds_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } - private com.google.protobuf.Timestamp readTime_ = null; + private com.google.protobuf.Timestamp readTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1047,7 +1048,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() { @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentMask.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentMask.java index 5a508a77a26c..9a053cc69b7f 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentMask.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentMask.java @@ -57,7 +57,7 @@ private DocumentMask( case 10: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { fieldPaths_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -66,7 +66,7 @@ private DocumentMask( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -78,7 +78,7 @@ private DocumentMask( } 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)) { fieldPaths_ = fieldPaths_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -206,10 +206,9 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.DocumentMask other = (com.google.firestore.v1beta1.DocumentMask) obj; - boolean result = true; - result = result && getFieldPathsList().equals(other.getFieldPathsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getFieldPathsList().equals(other.getFieldPathsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -402,7 +401,7 @@ public com.google.firestore.v1beta1.DocumentMask buildPartial() { com.google.firestore.v1beta1.DocumentMask result = new com.google.firestore.v1beta1.DocumentMask(this); int from_bitField0_ = bitField0_; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { fieldPaths_ = fieldPaths_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } @@ -413,35 +412,35 @@ public com.google.firestore.v1beta1.DocumentMask 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 @@ -501,7 +500,7 @@ public Builder mergeFrom( com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureFieldPathsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { fieldPaths_ = new com.google.protobuf.LazyStringArrayList(fieldPaths_); bitField0_ |= 0x00000001; } @@ -651,7 +650,7 @@ public Builder addFieldPathsBytes(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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentRemove.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentRemove.java index ab7d5e16d236..0fc1d5f7e735 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentRemove.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentRemove.java @@ -29,7 +29,7 @@ private DocumentRemove(com.google.protobuf.GeneratedMessageV3.Builder builder private DocumentRemove() { document_ = ""; - removedTargetIds_ = java.util.Collections.emptyList(); + removedTargetIds_ = emptyIntList(); } @java.lang.Override @@ -65,24 +65,23 @@ private DocumentRemove( } case 16: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - removedTargetIds_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000002) != 0)) { + removedTargetIds_ = newIntList(); mutable_bitField0_ |= 0x00000002; } - removedTargetIds_.add(input.readInt32()); + removedTargetIds_.addInt(input.readInt32()); break; } case 18: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002) - && input.getBytesUntilLimit() > 0) { - removedTargetIds_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { + removedTargetIds_ = newIntList(); mutable_bitField0_ |= 0x00000002; } while (input.getBytesUntilLimit() > 0) { - removedTargetIds_.add(input.readInt32()); + removedTargetIds_.addInt(input.readInt32()); } input.popLimit(limit); break; @@ -104,7 +103,7 @@ private DocumentRemove( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -116,8 +115,8 @@ private DocumentRemove( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - removedTargetIds_ = java.util.Collections.unmodifiableList(removedTargetIds_); + if (((mutable_bitField0_ & 0x00000002) != 0)) { + removedTargetIds_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -184,7 +183,7 @@ public com.google.protobuf.ByteString getDocumentBytes() { } public static final int REMOVED_TARGET_IDS_FIELD_NUMBER = 2; - private java.util.List removedTargetIds_; + private com.google.protobuf.Internal.IntList removedTargetIds_; /** * * @@ -219,7 +218,7 @@ public int getRemovedTargetIdsCount() { * repeated int32 removed_target_ids = 2; */ public int getRemovedTargetIds(int index) { - return removedTargetIds_.get(index); + return removedTargetIds_.getInt(index); } private int removedTargetIdsMemoizedSerializedSize = -1; @@ -289,7 +288,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io output.writeUInt32NoTag(removedTargetIdsMemoizedSerializedSize); } for (int i = 0; i < removedTargetIds_.size(); i++) { - output.writeInt32NoTag(removedTargetIds_.get(i)); + output.writeInt32NoTag(removedTargetIds_.getInt(i)); } if (readTime_ != null) { output.writeMessage(4, getReadTime()); @@ -310,7 +309,8 @@ public int getSerializedSize() { int dataSize = 0; for (int i = 0; i < removedTargetIds_.size(); i++) { dataSize += - com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(removedTargetIds_.get(i)); + com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag( + removedTargetIds_.getInt(i)); } size += dataSize; if (!getRemovedTargetIdsList().isEmpty()) { @@ -338,15 +338,14 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.DocumentRemove other = (com.google.firestore.v1beta1.DocumentRemove) obj; - boolean result = true; - result = result && getDocument().equals(other.getDocument()); - result = result && getRemovedTargetIdsList().equals(other.getRemovedTargetIdsList()); - result = result && (hasReadTime() == other.hasReadTime()); + if (!getDocument().equals(other.getDocument())) return false; + if (!getRemovedTargetIdsList().equals(other.getRemovedTargetIdsList())) return false; + if (hasReadTime() != other.hasReadTime()) return false; if (hasReadTime()) { - result = result && getReadTime().equals(other.getReadTime()); + if (!getReadTime().equals(other.getReadTime())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -518,7 +517,7 @@ public Builder clear() { super.clear(); document_ = ""; - removedTargetIds_ = java.util.Collections.emptyList(); + removedTargetIds_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); if (readTimeBuilder_ == null) { readTime_ = null; @@ -556,8 +555,8 @@ public com.google.firestore.v1beta1.DocumentRemove buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.document_ = document_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { - removedTargetIds_ = java.util.Collections.unmodifiableList(removedTargetIds_); + if (((bitField0_ & 0x00000002) != 0)) { + removedTargetIds_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000002); } result.removedTargetIds_ = removedTargetIds_; @@ -573,35 +572,35 @@ public com.google.firestore.v1beta1.DocumentRemove 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 @@ -758,11 +757,11 @@ public Builder setDocumentBytes(com.google.protobuf.ByteString value) { return this; } - private java.util.List removedTargetIds_ = java.util.Collections.emptyList(); + private com.google.protobuf.Internal.IntList removedTargetIds_ = emptyIntList(); private void ensureRemovedTargetIdsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { - removedTargetIds_ = new java.util.ArrayList(removedTargetIds_); + if (!((bitField0_ & 0x00000002) != 0)) { + removedTargetIds_ = mutableCopy(removedTargetIds_); bitField0_ |= 0x00000002; } } @@ -776,7 +775,9 @@ private void ensureRemovedTargetIdsIsMutable() { * repeated int32 removed_target_ids = 2; */ public java.util.List getRemovedTargetIdsList() { - return java.util.Collections.unmodifiableList(removedTargetIds_); + return ((bitField0_ & 0x00000002) != 0) + ? java.util.Collections.unmodifiableList(removedTargetIds_) + : removedTargetIds_; } /** * @@ -800,7 +801,7 @@ public int getRemovedTargetIdsCount() { * repeated int32 removed_target_ids = 2; */ public int getRemovedTargetIds(int index) { - return removedTargetIds_.get(index); + return removedTargetIds_.getInt(index); } /** * @@ -813,7 +814,7 @@ public int getRemovedTargetIds(int index) { */ public Builder setRemovedTargetIds(int index, int value) { ensureRemovedTargetIdsIsMutable(); - removedTargetIds_.set(index, value); + removedTargetIds_.setInt(index, value); onChanged(); return this; } @@ -828,7 +829,7 @@ public Builder setRemovedTargetIds(int index, int value) { */ public Builder addRemovedTargetIds(int value) { ensureRemovedTargetIdsIsMutable(); - removedTargetIds_.add(value); + removedTargetIds_.addInt(value); onChanged(); return this; } @@ -857,13 +858,13 @@ public Builder addAllRemovedTargetIds(java.lang.Iterablerepeated int32 removed_target_ids = 2; */ public Builder clearRemovedTargetIds() { - removedTargetIds_ = java.util.Collections.emptyList(); + removedTargetIds_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } - private com.google.protobuf.Timestamp readTime_ = null; + private com.google.protobuf.Timestamp readTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1049,7 +1050,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() { @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentTransform.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentTransform.java index 06581b27b1a1..2bcca357e103 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentTransform.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/DocumentTransform.java @@ -60,7 +60,7 @@ private DocumentTransform( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { fieldTransforms_ = new java.util.ArrayList< com.google.firestore.v1beta1.DocumentTransform.FieldTransform>(); @@ -74,7 +74,7 @@ private DocumentTransform( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -86,7 +86,7 @@ private DocumentTransform( } 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)) { fieldTransforms_ = java.util.Collections.unmodifiableList(fieldTransforms_); } this.unknownFields = unknownFields.build(); @@ -597,7 +597,7 @@ private FieldTransform( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -1342,34 +1342,32 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.DocumentTransform.FieldTransform other = (com.google.firestore.v1beta1.DocumentTransform.FieldTransform) obj; - boolean result = true; - result = result && getFieldPath().equals(other.getFieldPath()); - result = result && getTransformTypeCase().equals(other.getTransformTypeCase()); - if (!result) return false; + if (!getFieldPath().equals(other.getFieldPath())) return false; + if (!getTransformTypeCase().equals(other.getTransformTypeCase())) return false; switch (transformTypeCase_) { case 2: - result = result && getSetToServerValueValue() == other.getSetToServerValueValue(); + if (getSetToServerValueValue() != other.getSetToServerValueValue()) return false; break; case 3: - result = result && getIncrement().equals(other.getIncrement()); + if (!getIncrement().equals(other.getIncrement())) return false; break; case 4: - result = result && getMaximum().equals(other.getMaximum()); + if (!getMaximum().equals(other.getMaximum())) return false; break; case 5: - result = result && getMinimum().equals(other.getMinimum()); + if (!getMinimum().equals(other.getMinimum())) return false; break; case 6: - result = result && getAppendMissingElements().equals(other.getAppendMissingElements()); + if (!getAppendMissingElements().equals(other.getAppendMissingElements())) return false; break; case 7: - result = result && getRemoveAllFromArray().equals(other.getRemoveAllFromArray()); + if (!getRemoveAllFromArray().equals(other.getRemoveAllFromArray())) 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 @@ -1635,23 +1633,23 @@ public com.google.firestore.v1beta1.DocumentTransform.FieldTransform 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 @@ -1659,13 +1657,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 @@ -3374,7 +3372,7 @@ public com.google.firestore.v1beta1.ArrayValueOrBuilder getRemoveAllFromArrayOrB @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -3605,11 +3603,10 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.DocumentTransform other = (com.google.firestore.v1beta1.DocumentTransform) obj; - boolean result = true; - result = result && getDocument().equals(other.getDocument()); - result = result && getFieldTransformsList().equals(other.getFieldTransformsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDocument().equals(other.getDocument())) return false; + if (!getFieldTransformsList().equals(other.getFieldTransformsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -3811,7 +3808,7 @@ public com.google.firestore.v1beta1.DocumentTransform buildPartial() { int to_bitField0_ = 0; result.document_ = document_; if (fieldTransformsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { fieldTransforms_ = java.util.Collections.unmodifiableList(fieldTransforms_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -3826,35 +3823,35 @@ public com.google.firestore.v1beta1.DocumentTransform 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 @@ -4029,7 +4026,7 @@ public Builder setDocumentBytes(com.google.protobuf.ByteString value) { fieldTransforms_ = java.util.Collections.emptyList(); private void ensureFieldTransformsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { fieldTransforms_ = new java.util.ArrayList( fieldTransforms_); @@ -4460,7 +4457,7 @@ public Builder removeFieldTransforms(int index) { com.google.firestore.v1beta1.DocumentTransform.FieldTransform.Builder, com.google.firestore.v1beta1.DocumentTransform.FieldTransformOrBuilder>( fieldTransforms_, - ((bitField0_ & 0x00000002) == 0x00000002), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); fieldTransforms_ = null; @@ -4470,7 +4467,7 @@ public Builder removeFieldTransforms(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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ExistenceFilter.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ExistenceFilter.java index 9583f51e2b01..ecaf80eb4b72 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ExistenceFilter.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ExistenceFilter.java @@ -22,10 +22,7 @@ private ExistenceFilter(com.google.protobuf.GeneratedMessageV3.Builder builde super(builder); } - private ExistenceFilter() { - targetId_ = 0; - count_ = 0; - } + private ExistenceFilter() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -63,7 +60,7 @@ private ExistenceFilter( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -178,11 +175,10 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.ExistenceFilter other = (com.google.firestore.v1beta1.ExistenceFilter) obj; - boolean result = true; - result = result && (getTargetId() == other.getTargetId()); - result = result && (getCount() == other.getCount()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getTargetId() != other.getTargetId()) return false; + if (getCount() != other.getCount()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -380,35 +376,35 @@ public com.google.firestore.v1beta1.ExistenceFilter 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 +550,7 @@ public Builder clearCount() { @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/GetDocumentRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/GetDocumentRequest.java index 0627b32b93e4..c944dc7634d1 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/GetDocumentRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/GetDocumentRequest.java @@ -96,7 +96,7 @@ private GetDocumentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -389,26 +389,24 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.GetDocumentRequest other = (com.google.firestore.v1beta1.GetDocumentRequest) obj; - boolean result = true; - result = result && getName().equals(other.getName()); - result = result && (hasMask() == other.hasMask()); + if (!getName().equals(other.getName())) return false; + if (hasMask() != other.hasMask()) return false; if (hasMask()) { - result = result && getMask().equals(other.getMask()); + if (!getMask().equals(other.getMask())) return false; } - result = result && getConsistencySelectorCase().equals(other.getConsistencySelectorCase()); - if (!result) return false; + if (!getConsistencySelectorCase().equals(other.getConsistencySelectorCase())) return false; switch (consistencySelectorCase_) { case 3: - result = result && getTransaction().equals(other.getTransaction()); + if (!getTransaction().equals(other.getTransaction())) return false; break; case 5: - result = result && getReadTime().equals(other.getReadTime()); + if (!getReadTime().equals(other.getReadTime())) 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 @@ -641,35 +639,35 @@ public com.google.firestore.v1beta1.GetDocumentRequest 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 @@ -850,7 +848,7 @@ public Builder setNameBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.firestore.v1beta1.DocumentMask mask_ = null; + private com.google.firestore.v1beta1.DocumentMask mask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1beta1.DocumentMask, com.google.firestore.v1beta1.DocumentMask.Builder, @@ -1312,7 +1310,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() { @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListCollectionIdsRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListCollectionIdsRequest.java index 9b878725d386..14c17f3469fe 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListCollectionIdsRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListCollectionIdsRequest.java @@ -24,7 +24,6 @@ private ListCollectionIdsRequest(com.google.protobuf.GeneratedMessageV3.Builder< private ListCollectionIdsRequest() { parent_ = ""; - pageSize_ = 0; pageToken_ = ""; } @@ -73,7 +72,7 @@ private ListCollectionIdsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -271,12 +270,11 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.ListCollectionIdsRequest other = (com.google.firestore.v1beta1.ListCollectionIdsRequest) 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.firestore.v1beta1.ListCollectionIdsRequest 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 @@ -819,7 +817,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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListCollectionIdsResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListCollectionIdsResponse.java index 3f5c4a7f84fd..f5223a42633f 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListCollectionIdsResponse.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListCollectionIdsResponse.java @@ -54,7 +54,7 @@ private ListCollectionIdsResponse( case 10: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { collectionIds_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -70,7 +70,7 @@ private ListCollectionIdsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -82,7 +82,7 @@ private ListCollectionIdsResponse( } 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)) { collectionIds_ = collectionIds_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -256,11 +256,10 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.ListCollectionIdsResponse other = (com.google.firestore.v1beta1.ListCollectionIdsResponse) obj; - boolean result = true; - result = result && getCollectionIdsList().equals(other.getCollectionIdsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getCollectionIdsList().equals(other.getCollectionIdsList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -455,7 +454,7 @@ public com.google.firestore.v1beta1.ListCollectionIdsResponse buildPartial() { new com.google.firestore.v1beta1.ListCollectionIdsResponse(this); int from_bitField0_ = bitField0_; int to_bitField0_ = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { collectionIds_ = collectionIds_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } @@ -468,35 +467,35 @@ public com.google.firestore.v1beta1.ListCollectionIdsResponse 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 @@ -562,7 +561,7 @@ public Builder mergeFrom( com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureCollectionIdsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { collectionIds_ = new com.google.protobuf.LazyStringArrayList(collectionIds_); bitField0_ |= 0x00000001; } @@ -797,7 +796,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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListDocumentsRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListDocumentsRequest.java index 9cb472880599..79129e3f30a4 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListDocumentsRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListDocumentsRequest.java @@ -25,10 +25,8 @@ private ListDocumentsRequest(com.google.protobuf.GeneratedMessageV3.Builder b private ListDocumentsRequest() { parent_ = ""; collectionId_ = ""; - pageSize_ = 0; pageToken_ = ""; orderBy_ = ""; - showMissing_ = false; } @java.lang.Override @@ -132,7 +130,7 @@ private ListDocumentsRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -629,31 +627,29 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.ListDocumentsRequest other = (com.google.firestore.v1beta1.ListDocumentsRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getCollectionId().equals(other.getCollectionId()); - result = result && (getPageSize() == other.getPageSize()); - result = result && getPageToken().equals(other.getPageToken()); - result = result && getOrderBy().equals(other.getOrderBy()); - result = result && (hasMask() == other.hasMask()); + if (!getParent().equals(other.getParent())) return false; + if (!getCollectionId().equals(other.getCollectionId())) return false; + if (getPageSize() != other.getPageSize()) return false; + if (!getPageToken().equals(other.getPageToken())) return false; + if (!getOrderBy().equals(other.getOrderBy())) return false; + if (hasMask() != other.hasMask()) return false; if (hasMask()) { - result = result && getMask().equals(other.getMask()); + if (!getMask().equals(other.getMask())) return false; } - result = result && (getShowMissing() == other.getShowMissing()); - result = result && getConsistencySelectorCase().equals(other.getConsistencySelectorCase()); - if (!result) return false; + if (getShowMissing() != other.getShowMissing()) return false; + if (!getConsistencySelectorCase().equals(other.getConsistencySelectorCase())) return false; switch (consistencySelectorCase_) { case 8: - result = result && getTransaction().equals(other.getTransaction()); + if (!getTransaction().equals(other.getTransaction())) return false; break; case 10: - result = result && getReadTime().equals(other.getReadTime()); + if (!getReadTime().equals(other.getReadTime())) 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 @@ -911,35 +907,35 @@ public com.google.firestore.v1beta1.ListDocumentsRequest 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 @@ -1490,7 +1486,7 @@ public Builder setOrderByBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.firestore.v1beta1.DocumentMask mask_ = null; + private com.google.firestore.v1beta1.DocumentMask mask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1beta1.DocumentMask, com.google.firestore.v1beta1.DocumentMask.Builder, @@ -2011,7 +2007,7 @@ public Builder clearShowMissing() { @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListDocumentsResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListDocumentsResponse.java index b1fd71813834..65a2ccbe02ce 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListDocumentsResponse.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListDocumentsResponse.java @@ -53,7 +53,7 @@ private ListDocumentsResponse( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { documents_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -71,7 +71,7 @@ private ListDocumentsResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -83,7 +83,7 @@ private ListDocumentsResponse( } 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)) { documents_ = java.util.Collections.unmodifiableList(documents_); } this.unknownFields = unknownFields.build(); @@ -265,11 +265,10 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.ListDocumentsResponse other = (com.google.firestore.v1beta1.ListDocumentsResponse) obj; - boolean result = true; - result = result && getDocumentsList().equals(other.getDocumentsList()); - result = result && getNextPageToken().equals(other.getNextPageToken()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDocumentsList().equals(other.getDocumentsList())) return false; + if (!getNextPageToken().equals(other.getNextPageToken())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -470,7 +469,7 @@ public com.google.firestore.v1beta1.ListDocumentsResponse buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; if (documentsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { documents_ = java.util.Collections.unmodifiableList(documents_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -486,35 +485,35 @@ public com.google.firestore.v1beta1.ListDocumentsResponse 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 @@ -597,7 +596,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureDocumentsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { documents_ = new java.util.ArrayList(documents_); bitField0_ |= 0x00000001; } @@ -935,10 +934,7 @@ public java.util.List getDocument com.google.firestore.v1beta1.Document, com.google.firestore.v1beta1.Document.Builder, com.google.firestore.v1beta1.DocumentOrBuilder>( - documents_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + documents_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); documents_ = null; } return documentsBuilder_; @@ -1040,7 +1036,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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListenRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListenRequest.java index 3d985347b27f..748822c1433b 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListenRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListenRequest.java @@ -81,7 +81,7 @@ private ListenRequest( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry); mutable_bitField0_ |= 0x00000008; @@ -94,7 +94,7 @@ private ListenRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -450,23 +450,21 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.ListenRequest other = (com.google.firestore.v1beta1.ListenRequest) obj; - boolean result = true; - result = result && getDatabase().equals(other.getDatabase()); - result = result && internalGetLabels().equals(other.internalGetLabels()); - result = result && getTargetChangeCase().equals(other.getTargetChangeCase()); - if (!result) return false; + if (!getDatabase().equals(other.getDatabase())) return false; + if (!internalGetLabels().equals(other.internalGetLabels())) return false; + if (!getTargetChangeCase().equals(other.getTargetChangeCase())) return false; switch (targetChangeCase_) { case 2: - result = result && getAddTarget().equals(other.getAddTarget()); + if (!getAddTarget().equals(other.getAddTarget())) return false; break; case 3: - result = result && (getRemoveTarget() == other.getRemoveTarget()); + if (getRemoveTarget() != other.getRemoveTarget()) 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 @@ -714,35 +712,35 @@ public com.google.firestore.v1beta1.ListenRequest 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 @@ -1325,7 +1323,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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListenResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListenResponse.java index c9ed0f5feb5d..2bbcb5e3aad4 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListenResponse.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/ListenResponse.java @@ -135,7 +135,7 @@ private ListenResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -527,30 +527,28 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.ListenResponse other = (com.google.firestore.v1beta1.ListenResponse) obj; - boolean result = true; - result = result && getResponseTypeCase().equals(other.getResponseTypeCase()); - if (!result) return false; + if (!getResponseTypeCase().equals(other.getResponseTypeCase())) return false; switch (responseTypeCase_) { case 2: - result = result && getTargetChange().equals(other.getTargetChange()); + if (!getTargetChange().equals(other.getTargetChange())) return false; break; case 3: - result = result && getDocumentChange().equals(other.getDocumentChange()); + if (!getDocumentChange().equals(other.getDocumentChange())) return false; break; case 4: - result = result && getDocumentDelete().equals(other.getDocumentDelete()); + if (!getDocumentDelete().equals(other.getDocumentDelete())) return false; break; case 6: - result = result && getDocumentRemove().equals(other.getDocumentRemove()); + if (!getDocumentRemove().equals(other.getDocumentRemove())) return false; break; case 5: - result = result && getFilter().equals(other.getFilter()); + if (!getFilter().equals(other.getFilter())) 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 @@ -800,35 +798,35 @@ public com.google.firestore.v1beta1.ListenResponse 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 @@ -1964,7 +1962,7 @@ public com.google.firestore.v1beta1.ExistenceFilterOrBuilder getFilterOrBuilder( @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/MapValue.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/MapValue.java index 45dae62d1f7c..39d51926391d 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/MapValue.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/MapValue.java @@ -50,7 +50,7 @@ private MapValue( break; case 10: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { fields_ = com.google.protobuf.MapField.newMapField(FieldsDefaultEntryHolder.defaultEntry); mutable_bitField0_ |= 0x00000001; @@ -65,7 +65,7 @@ private MapValue( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -274,10 +274,9 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1beta1.MapValue other = (com.google.firestore.v1beta1.MapValue) obj; - boolean result = true; - result = result && internalGetFields().equals(other.internalGetFields()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!internalGetFields().equals(other.internalGetFields())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -492,35 +491,35 @@ public com.google.firestore.v1beta1.MapValue 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 @@ -754,7 +753,7 @@ public Builder putAllFields( @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Precondition.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Precondition.java index 28dbc721722a..ca314a8e16b0 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Precondition.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Precondition.java @@ -71,7 +71,7 @@ private Precondition( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -263,21 +263,19 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.Precondition other = (com.google.firestore.v1beta1.Precondition) obj; - boolean result = true; - result = result && getConditionTypeCase().equals(other.getConditionTypeCase()); - if (!result) return false; + if (!getConditionTypeCase().equals(other.getConditionTypeCase())) return false; switch (conditionTypeCase_) { case 1: - result = result && (getExists() == other.getExists()); + if (getExists() != other.getExists()) return false; break; case 2: - result = result && getUpdateTime().equals(other.getUpdateTime()); + if (!getUpdateTime().equals(other.getUpdateTime())) 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 @@ -490,35 +488,35 @@ public com.google.firestore.v1beta1.Precondition 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 @@ -853,7 +851,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RollbackRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RollbackRequest.java index e6a1c1a66f58..8c1c66821df1 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RollbackRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RollbackRequest.java @@ -65,7 +65,7 @@ private RollbackRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -208,11 +208,10 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.RollbackRequest other = (com.google.firestore.v1beta1.RollbackRequest) obj; - boolean result = true; - result = result && getDatabase().equals(other.getDatabase()); - result = result && getTransaction().equals(other.getTransaction()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDatabase().equals(other.getDatabase())) return false; + if (!getTransaction().equals(other.getTransaction())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -410,35 +409,35 @@ public com.google.firestore.v1beta1.RollbackRequest buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -637,7 +636,7 @@ public Builder clearTransaction() { @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RunQueryRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RunQueryRequest.java index 14d3a31702cd..de11d699d647 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RunQueryRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RunQueryRequest.java @@ -116,7 +116,7 @@ private RunQueryRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -520,34 +520,31 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.RunQueryRequest other = (com.google.firestore.v1beta1.RunQueryRequest) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getQueryTypeCase().equals(other.getQueryTypeCase()); - if (!result) return false; + if (!getParent().equals(other.getParent())) return false; + if (!getQueryTypeCase().equals(other.getQueryTypeCase())) return false; switch (queryTypeCase_) { case 2: - result = result && getStructuredQuery().equals(other.getStructuredQuery()); + if (!getStructuredQuery().equals(other.getStructuredQuery())) return false; break; case 0: default: } - result = result && getConsistencySelectorCase().equals(other.getConsistencySelectorCase()); - if (!result) return false; + if (!getConsistencySelectorCase().equals(other.getConsistencySelectorCase())) return false; switch (consistencySelectorCase_) { case 5: - result = result && getTransaction().equals(other.getTransaction()); + if (!getTransaction().equals(other.getTransaction())) return false; break; case 6: - result = result && getNewTransaction().equals(other.getNewTransaction()); + if (!getNewTransaction().equals(other.getNewTransaction())) return false; break; case 7: - result = result && getReadTime().equals(other.getReadTime()); + if (!getReadTime().equals(other.getReadTime())) 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 @@ -794,35 +791,35 @@ public com.google.firestore.v1beta1.RunQueryRequest 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 @@ -1745,7 +1742,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() { @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RunQueryResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RunQueryResponse.java index 40c97c5d1b5f..4ab3e9007389 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RunQueryResponse.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/RunQueryResponse.java @@ -24,7 +24,6 @@ private RunQueryResponse(com.google.protobuf.GeneratedMessageV3.Builder build private RunQueryResponse() { transaction_ = com.google.protobuf.ByteString.EMPTY; - skippedResults_ = 0; } @java.lang.Override @@ -94,7 +93,7 @@ private RunQueryResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -321,19 +320,18 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.RunQueryResponse other = (com.google.firestore.v1beta1.RunQueryResponse) obj; - boolean result = true; - result = result && getTransaction().equals(other.getTransaction()); - result = result && (hasDocument() == other.hasDocument()); + if (!getTransaction().equals(other.getTransaction())) return false; + if (hasDocument() != other.hasDocument()) return false; if (hasDocument()) { - result = result && getDocument().equals(other.getDocument()); + if (!getDocument().equals(other.getDocument())) return false; } - result = result && (hasReadTime() == other.hasReadTime()); + if (hasReadTime() != other.hasReadTime()) return false; if (hasReadTime()) { - result = result && getReadTime().equals(other.getReadTime()); + if (!getReadTime().equals(other.getReadTime())) return false; } - result = result && (getSkippedResults() == other.getSkippedResults()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (getSkippedResults() != other.getSkippedResults()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -561,35 +559,35 @@ public com.google.firestore.v1beta1.RunQueryResponse 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 @@ -701,7 +699,7 @@ public Builder clearTransaction() { return this; } - private com.google.firestore.v1beta1.Document document_ = null; + private com.google.firestore.v1beta1.Document document_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1beta1.Document, com.google.firestore.v1beta1.Document.Builder, @@ -891,7 +889,7 @@ public com.google.firestore.v1beta1.DocumentOrBuilder getDocumentOrBuilder() { return documentBuilder_; } - private com.google.protobuf.Timestamp readTime_ = null; + private com.google.protobuf.Timestamp readTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1160,7 +1158,7 @@ public Builder clearSkippedResults() { @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/StructuredQuery.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/StructuredQuery.java index 41b541416a8c..b492e4734ca3 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/StructuredQuery.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/StructuredQuery.java @@ -25,7 +25,6 @@ private StructuredQuery(com.google.protobuf.GeneratedMessageV3.Builder builde private StructuredQuery() { from_ = java.util.Collections.emptyList(); orderBy_ = java.util.Collections.emptyList(); - offset_ = 0; } @java.lang.Override @@ -71,7 +70,7 @@ private StructuredQuery( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { from_ = new java.util.ArrayList< com.google.firestore.v1beta1.StructuredQuery.CollectionSelector>(); @@ -102,7 +101,7 @@ private StructuredQuery( } case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (!((mutable_bitField0_ & 0x00000008) != 0)) { orderBy_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000008; @@ -167,7 +166,7 @@ private StructuredQuery( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -179,10 +178,10 @@ private StructuredQuery( } 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)) { from_ = java.util.Collections.unmodifiableList(from_); } - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { + if (((mutable_bitField0_ & 0x00000008) != 0)) { orderBy_ = java.util.Collections.unmodifiableList(orderBy_); } this.unknownFields = unknownFields.build(); @@ -412,7 +411,6 @@ private CollectionSelector(com.google.protobuf.GeneratedMessageV3.Builder bui private CollectionSelector() { collectionId_ = ""; - allDescendants_ = false; } @java.lang.Override @@ -453,7 +451,7 @@ private CollectionSelector( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -598,11 +596,10 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.StructuredQuery.CollectionSelector other = (com.google.firestore.v1beta1.StructuredQuery.CollectionSelector) obj; - boolean result = true; - result = result && getCollectionId().equals(other.getCollectionId()); - result = result && (getAllDescendants() == other.getAllDescendants()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getCollectionId().equals(other.getCollectionId())) return false; + if (getAllDescendants() != other.getAllDescendants()) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -806,23 +803,23 @@ public com.google.firestore.v1beta1.StructuredQuery.CollectionSelector buildPart @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -830,13 +827,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 @@ -1044,7 +1041,7 @@ public Builder clearAllDescendants() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1305,7 +1302,7 @@ private Filter( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -1581,24 +1578,22 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.StructuredQuery.Filter other = (com.google.firestore.v1beta1.StructuredQuery.Filter) obj; - boolean result = true; - result = result && getFilterTypeCase().equals(other.getFilterTypeCase()); - if (!result) return false; + if (!getFilterTypeCase().equals(other.getFilterTypeCase())) return false; switch (filterTypeCase_) { case 1: - result = result && getCompositeFilter().equals(other.getCompositeFilter()); + if (!getCompositeFilter().equals(other.getCompositeFilter())) return false; break; case 2: - result = result && getFieldFilter().equals(other.getFieldFilter()); + if (!getFieldFilter().equals(other.getFieldFilter())) return false; break; case 3: - result = result && getUnaryFilter().equals(other.getUnaryFilter()); + if (!getUnaryFilter().equals(other.getUnaryFilter())) 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 @@ -1829,23 +1824,23 @@ public com.google.firestore.v1beta1.StructuredQuery.Filter 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 @@ -1853,13 +1848,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 @@ -2579,7 +2574,7 @@ public Builder clearUnaryFilter() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -2768,7 +2763,7 @@ private CompositeFilter( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { filters_ = new java.util.ArrayList< com.google.firestore.v1beta1.StructuredQuery.Filter>(); @@ -2782,7 +2777,7 @@ private CompositeFilter( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -2794,7 +2789,7 @@ private CompositeFilter( } 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)) { filters_ = java.util.Collections.unmodifiableList(filters_); } this.unknownFields = unknownFields.build(); @@ -3102,11 +3097,10 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.StructuredQuery.CompositeFilter other = (com.google.firestore.v1beta1.StructuredQuery.CompositeFilter) obj; - boolean result = true; - result = result && op_ == other.op_; - result = result && getFiltersList().equals(other.getFiltersList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (op_ != other.op_) return false; + if (!getFiltersList().equals(other.getFiltersList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -3312,7 +3306,7 @@ public com.google.firestore.v1beta1.StructuredQuery.CompositeFilter buildPartial int to_bitField0_ = 0; result.op_ = op_; if (filtersBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { filters_ = java.util.Collections.unmodifiableList(filters_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -3327,23 +3321,23 @@ public com.google.firestore.v1beta1.StructuredQuery.CompositeFilter 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 @@ -3351,13 +3345,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 @@ -3520,7 +3514,7 @@ public Builder clearOp() { java.util.Collections.emptyList(); private void ensureFiltersIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { filters_ = new java.util.ArrayList( filters_); @@ -3887,10 +3881,7 @@ public com.google.firestore.v1beta1.StructuredQuery.Filter.Builder addFiltersBui com.google.firestore.v1beta1.StructuredQuery.Filter, com.google.firestore.v1beta1.StructuredQuery.Filter.Builder, com.google.firestore.v1beta1.StructuredQuery.FilterOrBuilder>( - filters_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + filters_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); filters_ = null; } return filtersBuilder_; @@ -3899,7 +3890,7 @@ public com.google.firestore.v1beta1.StructuredQuery.Filter.Builder addFiltersBui @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -4129,7 +4120,7 @@ private FieldFilter( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -4572,18 +4563,17 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.StructuredQuery.FieldFilter other = (com.google.firestore.v1beta1.StructuredQuery.FieldFilter) obj; - boolean result = true; - result = result && (hasField() == other.hasField()); + if (hasField() != other.hasField()) return false; if (hasField()) { - result = result && getField().equals(other.getField()); + if (!getField().equals(other.getField())) return false; } - result = result && op_ == other.op_; - result = result && (hasValue() == other.hasValue()); + if (op_ != other.op_) return false; + if (hasValue() != other.hasValue()) return false; if (hasValue()) { - result = result && getValue().equals(other.getValue()); + if (!getValue().equals(other.getValue())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -4809,23 +4799,23 @@ public com.google.firestore.v1beta1.StructuredQuery.FieldFilter 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 @@ -4833,13 +4823,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 @@ -4894,7 +4884,7 @@ public Builder mergeFrom( return this; } - private com.google.firestore.v1beta1.StructuredQuery.FieldReference field_ = null; + private com.google.firestore.v1beta1.StructuredQuery.FieldReference field_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1beta1.StructuredQuery.FieldReference, com.google.firestore.v1beta1.StructuredQuery.FieldReference.Builder, @@ -5156,7 +5146,7 @@ public Builder clearOp() { return this; } - private com.google.firestore.v1beta1.Value value_ = null; + private com.google.firestore.v1beta1.Value value_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1beta1.Value, com.google.firestore.v1beta1.Value.Builder, @@ -5336,7 +5326,7 @@ public com.google.firestore.v1beta1.ValueOrBuilder getValueOrBuilder() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -5502,7 +5492,7 @@ private Projection( break; case 18: { - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { fields_ = new java.util.ArrayList< com.google.firestore.v1beta1.StructuredQuery.FieldReference>(); @@ -5516,7 +5506,7 @@ private Projection( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -5528,7 +5518,7 @@ private Projection( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (((mutable_bitField0_ & 0x00000001) != 0)) { fields_ = java.util.Collections.unmodifiableList(fields_); } this.unknownFields = unknownFields.build(); @@ -5673,10 +5663,9 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.StructuredQuery.Projection other = (com.google.firestore.v1beta1.StructuredQuery.Projection) obj; - boolean result = true; - result = result && getFieldsList().equals(other.getFieldsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getFieldsList().equals(other.getFieldsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -5875,7 +5864,7 @@ public com.google.firestore.v1beta1.StructuredQuery.Projection buildPartial() { new com.google.firestore.v1beta1.StructuredQuery.Projection(this); int from_bitField0_ = bitField0_; if (fieldsBuilder_ == null) { - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { fields_ = java.util.Collections.unmodifiableList(fields_); bitField0_ = (bitField0_ & ~0x00000001); } @@ -5889,23 +5878,23 @@ public com.google.firestore.v1beta1.StructuredQuery.Projection 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 @@ -5913,13 +5902,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 @@ -5998,7 +5987,7 @@ public Builder mergeFrom( java.util.Collections.emptyList(); private void ensureFieldsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { fields_ = new java.util.ArrayList( fields_); @@ -6390,10 +6379,7 @@ public com.google.firestore.v1beta1.StructuredQuery.FieldReference.Builder addFi com.google.firestore.v1beta1.StructuredQuery.FieldReference, com.google.firestore.v1beta1.StructuredQuery.FieldReference.Builder, com.google.firestore.v1beta1.StructuredQuery.FieldReferenceOrBuilder>( - fields_, - ((bitField0_ & 0x00000001) == 0x00000001), - getParentForChildren(), - isClean()); + fields_, ((bitField0_ & 0x00000001) != 0), getParentForChildren(), isClean()); fields_ = null; } return fieldsBuilder_; @@ -6402,7 +6388,7 @@ public com.google.firestore.v1beta1.StructuredQuery.FieldReference.Builder addFi @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -6588,7 +6574,7 @@ private UnaryFilter( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -6939,19 +6925,17 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.StructuredQuery.UnaryFilter other = (com.google.firestore.v1beta1.StructuredQuery.UnaryFilter) obj; - boolean result = true; - result = result && op_ == other.op_; - result = result && getOperandTypeCase().equals(other.getOperandTypeCase()); - if (!result) return false; + if (op_ != other.op_) return false; + if (!getOperandTypeCase().equals(other.getOperandTypeCase())) return false; switch (operandTypeCase_) { case 2: - result = result && getField().equals(other.getField()); + if (!getField().equals(other.getField())) 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 @@ -7165,23 +7149,23 @@ public com.google.firestore.v1beta1.StructuredQuery.UnaryFilter 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 @@ -7189,13 +7173,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 @@ -7557,7 +7541,7 @@ public com.google.firestore.v1beta1.StructuredQuery.FieldReference.Builder getFi @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -7737,7 +7721,7 @@ private Order( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -7898,14 +7882,13 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.StructuredQuery.Order other = (com.google.firestore.v1beta1.StructuredQuery.Order) obj; - boolean result = true; - result = result && (hasField() == other.hasField()); + if (hasField() != other.hasField()) return false; if (hasField()) { - result = result && getField().equals(other.getField()); + if (!getField().equals(other.getField())) return false; } - result = result && direction_ == other.direction_; - result = result && unknownFields.equals(other.unknownFields); - return result; + if (direction_ != other.direction_) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -8115,23 +8098,23 @@ public com.google.firestore.v1beta1.StructuredQuery.Order 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 @@ -8139,13 +8122,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 @@ -8197,7 +8180,7 @@ public Builder mergeFrom( return this; } - private com.google.firestore.v1beta1.StructuredQuery.FieldReference field_ = null; + private com.google.firestore.v1beta1.StructuredQuery.FieldReference field_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1beta1.StructuredQuery.FieldReference, com.google.firestore.v1beta1.StructuredQuery.FieldReference.Builder, @@ -8461,7 +8444,7 @@ public Builder clearDirection() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -8576,7 +8559,7 @@ private FieldReference( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -8680,10 +8663,9 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.StructuredQuery.FieldReference other = (com.google.firestore.v1beta1.StructuredQuery.FieldReference) obj; - boolean result = true; - result = result && getFieldPath().equals(other.getFieldPath()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getFieldPath().equals(other.getFieldPath())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -8880,23 +8862,23 @@ public com.google.firestore.v1beta1.StructuredQuery.FieldReference 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 @@ -8904,13 +8886,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 @@ -9019,7 +9001,7 @@ public Builder setFieldPathBytes(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 @@ -9576,32 +9558,31 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.StructuredQuery other = (com.google.firestore.v1beta1.StructuredQuery) obj; - boolean result = true; - result = result && (hasSelect() == other.hasSelect()); + if (hasSelect() != other.hasSelect()) return false; if (hasSelect()) { - result = result && getSelect().equals(other.getSelect()); + if (!getSelect().equals(other.getSelect())) return false; } - result = result && getFromList().equals(other.getFromList()); - result = result && (hasWhere() == other.hasWhere()); + if (!getFromList().equals(other.getFromList())) return false; + if (hasWhere() != other.hasWhere()) return false; if (hasWhere()) { - result = result && getWhere().equals(other.getWhere()); + if (!getWhere().equals(other.getWhere())) return false; } - result = result && getOrderByList().equals(other.getOrderByList()); - result = result && (hasStartAt() == other.hasStartAt()); + if (!getOrderByList().equals(other.getOrderByList())) return false; + if (hasStartAt() != other.hasStartAt()) return false; if (hasStartAt()) { - result = result && getStartAt().equals(other.getStartAt()); + if (!getStartAt().equals(other.getStartAt())) return false; } - result = result && (hasEndAt() == other.hasEndAt()); + if (hasEndAt() != other.hasEndAt()) return false; if (hasEndAt()) { - result = result && getEndAt().equals(other.getEndAt()); + if (!getEndAt().equals(other.getEndAt())) return false; } - result = result && (getOffset() == other.getOffset()); - result = result && (hasLimit() == other.hasLimit()); + if (getOffset() != other.getOffset()) return false; + if (hasLimit() != other.hasLimit()) return false; if (hasLimit()) { - result = result && getLimit().equals(other.getLimit()); + if (!getLimit().equals(other.getLimit())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -9868,7 +9849,7 @@ public com.google.firestore.v1beta1.StructuredQuery buildPartial() { result.select_ = selectBuilder_.build(); } if (fromBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { from_ = java.util.Collections.unmodifiableList(from_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -9882,7 +9863,7 @@ public com.google.firestore.v1beta1.StructuredQuery buildPartial() { result.where_ = whereBuilder_.build(); } if (orderByBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { + if (((bitField0_ & 0x00000008) != 0)) { orderBy_ = java.util.Collections.unmodifiableList(orderBy_); bitField0_ = (bitField0_ & ~0x00000008); } @@ -9913,35 +9894,35 @@ public com.google.firestore.v1beta1.StructuredQuery 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 @@ -10059,7 +10040,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.firestore.v1beta1.StructuredQuery.Projection select_ = null; + private com.google.firestore.v1beta1.StructuredQuery.Projection select_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1beta1.StructuredQuery.Projection, com.google.firestore.v1beta1.StructuredQuery.Projection.Builder, @@ -10245,7 +10226,7 @@ public com.google.firestore.v1beta1.StructuredQuery.ProjectionOrBuilder getSelec java.util.Collections.emptyList(); private void ensureFromIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { from_ = new java.util.ArrayList< com.google.firestore.v1beta1.StructuredQuery.CollectionSelector>(from_); @@ -10602,16 +10583,13 @@ public com.google.firestore.v1beta1.StructuredQuery.CollectionSelector.Builder a com.google.firestore.v1beta1.StructuredQuery.CollectionSelector, com.google.firestore.v1beta1.StructuredQuery.CollectionSelector.Builder, com.google.firestore.v1beta1.StructuredQuery.CollectionSelectorOrBuilder>( - from_, - ((bitField0_ & 0x00000002) == 0x00000002), - getParentForChildren(), - isClean()); + from_, ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); from_ = null; } return fromBuilder_; } - private com.google.firestore.v1beta1.StructuredQuery.Filter where_ = null; + private com.google.firestore.v1beta1.StructuredQuery.Filter where_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1beta1.StructuredQuery.Filter, com.google.firestore.v1beta1.StructuredQuery.Filter.Builder, @@ -10797,7 +10775,7 @@ public com.google.firestore.v1beta1.StructuredQuery.FilterOrBuilder getWhereOrBu java.util.Collections.emptyList(); private void ensureOrderByIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { + if (!((bitField0_ & 0x00000008) != 0)) { orderBy_ = new java.util.ArrayList(orderBy_); bitField0_ |= 0x00000008; @@ -11374,16 +11352,13 @@ public com.google.firestore.v1beta1.StructuredQuery.Order.Builder addOrderByBuil com.google.firestore.v1beta1.StructuredQuery.Order, com.google.firestore.v1beta1.StructuredQuery.Order.Builder, com.google.firestore.v1beta1.StructuredQuery.OrderOrBuilder>( - orderBy_, - ((bitField0_ & 0x00000008) == 0x00000008), - getParentForChildren(), - isClean()); + orderBy_, ((bitField0_ & 0x00000008) != 0), getParentForChildren(), isClean()); orderBy_ = null; } return orderByBuilder_; } - private com.google.firestore.v1beta1.Cursor startAt_ = null; + private com.google.firestore.v1beta1.Cursor startAt_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1beta1.Cursor, com.google.firestore.v1beta1.Cursor.Builder, @@ -11564,7 +11539,7 @@ public com.google.firestore.v1beta1.CursorOrBuilder getStartAtOrBuilder() { return startAtBuilder_; } - private com.google.firestore.v1beta1.Cursor endAt_ = null; + private com.google.firestore.v1beta1.Cursor endAt_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1beta1.Cursor, com.google.firestore.v1beta1.Cursor.Builder, @@ -11791,7 +11766,7 @@ public Builder clearOffset() { return this; } - private com.google.protobuf.Int32Value limit_ = null; + private com.google.protobuf.Int32Value limit_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Int32Value, com.google.protobuf.Int32Value.Builder, @@ -11986,7 +11961,7 @@ public com.google.protobuf.Int32ValueOrBuilder getLimitOrBuilder() { @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Target.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Target.java index 8acdc9b5d372..22f9f292fe6b 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Target.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Target.java @@ -22,10 +22,7 @@ private Target(com.google.protobuf.GeneratedMessageV3.Builder builder) { super(builder); } - private Target() { - targetId_ = 0; - once_ = false; - } + private Target() {} @java.lang.Override public final com.google.protobuf.UnknownFieldSet getUnknownFields() { @@ -120,7 +117,7 @@ private Target( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -260,7 +257,7 @@ private DocumentsTarget( case 18: { java.lang.String s = input.readStringRequireUtf8(); - if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + if (!((mutable_bitField0_ & 0x00000001) != 0)) { documents_ = new com.google.protobuf.LazyStringArrayList(); mutable_bitField0_ |= 0x00000001; } @@ -269,7 +266,7 @@ private DocumentsTarget( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -281,7 +278,7 @@ private DocumentsTarget( } 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)) { documents_ = documents_.getUnmodifiableView(); } this.unknownFields = unknownFields.build(); @@ -417,10 +414,9 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.Target.DocumentsTarget other = (com.google.firestore.v1beta1.Target.DocumentsTarget) obj; - boolean result = true; - result = result && getDocumentsList().equals(other.getDocumentsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDocumentsList().equals(other.getDocumentsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -612,7 +608,7 @@ public com.google.firestore.v1beta1.Target.DocumentsTarget buildPartial() { com.google.firestore.v1beta1.Target.DocumentsTarget result = new com.google.firestore.v1beta1.Target.DocumentsTarget(this); int from_bitField0_ = bitField0_; - if (((bitField0_ & 0x00000001) == 0x00000001)) { + if (((bitField0_ & 0x00000001) != 0)) { documents_ = documents_.getUnmodifiableView(); bitField0_ = (bitField0_ & ~0x00000001); } @@ -623,23 +619,23 @@ public com.google.firestore.v1beta1.Target.DocumentsTarget 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 @@ -647,13 +643,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 @@ -715,7 +711,7 @@ public Builder mergeFrom( com.google.protobuf.LazyStringArrayList.EMPTY; private void ensureDocumentsIsMutable() { - if (!((bitField0_ & 0x00000001) == 0x00000001)) { + if (!((bitField0_ & 0x00000001) != 0)) { documents_ = new com.google.protobuf.LazyStringArrayList(documents_); bitField0_ |= 0x00000001; } @@ -884,7 +880,7 @@ public Builder addDocumentsBytes(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 @@ -1075,7 +1071,7 @@ private QueryTarget( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -1294,19 +1290,17 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.Target.QueryTarget other = (com.google.firestore.v1beta1.Target.QueryTarget) obj; - boolean result = true; - result = result && getParent().equals(other.getParent()); - result = result && getQueryTypeCase().equals(other.getQueryTypeCase()); - if (!result) return false; + if (!getParent().equals(other.getParent())) return false; + if (!getQueryTypeCase().equals(other.getQueryTypeCase())) return false; switch (queryTypeCase_) { case 2: - result = result && getStructuredQuery().equals(other.getStructuredQuery()); + if (!getStructuredQuery().equals(other.getStructuredQuery())) 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 @@ -1519,23 +1513,23 @@ public com.google.firestore.v1beta1.Target.QueryTarget 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 @@ -1543,13 +1537,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 @@ -1948,7 +1942,7 @@ public com.google.firestore.v1beta1.StructuredQueryOrBuilder getStructuredQueryO @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -2347,35 +2341,32 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1beta1.Target other = (com.google.firestore.v1beta1.Target) obj; - boolean result = true; - result = result && (getTargetId() == other.getTargetId()); - result = result && (getOnce() == other.getOnce()); - result = result && getTargetTypeCase().equals(other.getTargetTypeCase()); - if (!result) return false; + if (getTargetId() != other.getTargetId()) return false; + if (getOnce() != other.getOnce()) return false; + if (!getTargetTypeCase().equals(other.getTargetTypeCase())) return false; switch (targetTypeCase_) { case 2: - result = result && getQuery().equals(other.getQuery()); + if (!getQuery().equals(other.getQuery())) return false; break; case 3: - result = result && getDocuments().equals(other.getDocuments()); + if (!getDocuments().equals(other.getDocuments())) return false; break; case 0: default: } - result = result && getResumeTypeCase().equals(other.getResumeTypeCase()); - if (!result) return false; + if (!getResumeTypeCase().equals(other.getResumeTypeCase())) return false; switch (resumeTypeCase_) { case 4: - result = result && getResumeToken().equals(other.getResumeToken()); + if (!getResumeToken().equals(other.getResumeToken())) return false; break; case 11: - result = result && getReadTime().equals(other.getReadTime()); + if (!getReadTime().equals(other.getReadTime())) 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 @@ -2625,35 +2616,35 @@ public com.google.firestore.v1beta1.Target 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 @@ -3535,7 +3526,7 @@ public Builder clearOnce() { @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/TargetChange.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/TargetChange.java index cb6e289058d3..48129f1aa26c 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/TargetChange.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/TargetChange.java @@ -24,7 +24,7 @@ private TargetChange(com.google.protobuf.GeneratedMessageV3.Builder builder) private TargetChange() { targetChangeType_ = 0; - targetIds_ = java.util.Collections.emptyList(); + targetIds_ = emptyIntList(); resumeToken_ = com.google.protobuf.ByteString.EMPTY; } @@ -61,24 +61,23 @@ private TargetChange( } case 16: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - targetIds_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000002) != 0)) { + targetIds_ = newIntList(); mutable_bitField0_ |= 0x00000002; } - targetIds_.add(input.readInt32()); + targetIds_.addInt(input.readInt32()); break; } case 18: { int length = input.readRawVarint32(); int limit = input.pushLimit(length); - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002) - && input.getBytesUntilLimit() > 0) { - targetIds_ = new java.util.ArrayList(); + if (!((mutable_bitField0_ & 0x00000002) != 0) && input.getBytesUntilLimit() > 0) { + targetIds_ = newIntList(); mutable_bitField0_ |= 0x00000002; } while (input.getBytesUntilLimit() > 0) { - targetIds_.add(input.readInt32()); + targetIds_.addInt(input.readInt32()); } input.popLimit(limit); break; @@ -119,7 +118,7 @@ private TargetChange( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -131,8 +130,8 @@ private TargetChange( } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException(e).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { - targetIds_ = java.util.Collections.unmodifiableList(targetIds_); + if (((mutable_bitField0_ & 0x00000002) != 0)) { + targetIds_.makeImmutable(); // C } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -395,7 +394,7 @@ public com.google.firestore.v1beta1.TargetChange.TargetChangeType getTargetChang } public static final int TARGET_IDS_FIELD_NUMBER = 2; - private java.util.List targetIds_; + private com.google.protobuf.Internal.IntList targetIds_; /** * * @@ -445,7 +444,7 @@ public int getTargetIdsCount() { * repeated int32 target_ids = 2; */ public int getTargetIds(int index) { - return targetIds_.get(index); + return targetIds_.getInt(index); } private int targetIdsMemoizedSerializedSize = -1; @@ -590,7 +589,7 @@ public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io output.writeUInt32NoTag(targetIdsMemoizedSerializedSize); } for (int i = 0; i < targetIds_.size(); i++) { - output.writeInt32NoTag(targetIds_.get(i)); + output.writeInt32NoTag(targetIds_.getInt(i)); } if (cause_ != null) { output.writeMessage(3, getCause()); @@ -617,7 +616,8 @@ public int getSerializedSize() { { int dataSize = 0; for (int i = 0; i < targetIds_.size(); i++) { - dataSize += com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(targetIds_.get(i)); + dataSize += + com.google.protobuf.CodedOutputStream.computeInt32SizeNoTag(targetIds_.getInt(i)); } size += dataSize; if (!getTargetIdsList().isEmpty()) { @@ -651,20 +651,19 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.TargetChange other = (com.google.firestore.v1beta1.TargetChange) obj; - boolean result = true; - result = result && targetChangeType_ == other.targetChangeType_; - result = result && getTargetIdsList().equals(other.getTargetIdsList()); - result = result && (hasCause() == other.hasCause()); + if (targetChangeType_ != other.targetChangeType_) return false; + if (!getTargetIdsList().equals(other.getTargetIdsList())) return false; + if (hasCause() != other.hasCause()) return false; if (hasCause()) { - result = result && getCause().equals(other.getCause()); + if (!getCause().equals(other.getCause())) return false; } - result = result && getResumeToken().equals(other.getResumeToken()); - result = result && (hasReadTime() == other.hasReadTime()); + if (!getResumeToken().equals(other.getResumeToken())) return false; + if (hasReadTime() != other.hasReadTime()) return false; if (hasReadTime()) { - result = result && getReadTime().equals(other.getReadTime()); + if (!getReadTime().equals(other.getReadTime())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -837,7 +836,7 @@ public Builder clear() { super.clear(); targetChangeType_ = 0; - targetIds_ = java.util.Collections.emptyList(); + targetIds_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); if (causeBuilder_ == null) { cause_ = null; @@ -883,8 +882,8 @@ public com.google.firestore.v1beta1.TargetChange buildPartial() { int from_bitField0_ = bitField0_; int to_bitField0_ = 0; result.targetChangeType_ = targetChangeType_; - if (((bitField0_ & 0x00000002) == 0x00000002)) { - targetIds_ = java.util.Collections.unmodifiableList(targetIds_); + if (((bitField0_ & 0x00000002) != 0)) { + targetIds_.makeImmutable(); bitField0_ = (bitField0_ & ~0x00000002); } result.targetIds_ = targetIds_; @@ -906,35 +905,35 @@ public com.google.firestore.v1beta1.TargetChange buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -1081,11 +1080,11 @@ public Builder clearTargetChangeType() { return this; } - private java.util.List targetIds_ = java.util.Collections.emptyList(); + private com.google.protobuf.Internal.IntList targetIds_ = emptyIntList(); private void ensureTargetIdsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { - targetIds_ = new java.util.ArrayList(targetIds_); + if (!((bitField0_ & 0x00000002) != 0)) { + targetIds_ = mutableCopy(targetIds_); bitField0_ |= 0x00000002; } } @@ -1104,7 +1103,9 @@ private void ensureTargetIdsIsMutable() { * repeated int32 target_ids = 2; */ public java.util.List getTargetIdsList() { - return java.util.Collections.unmodifiableList(targetIds_); + return ((bitField0_ & 0x00000002) != 0) + ? java.util.Collections.unmodifiableList(targetIds_) + : targetIds_; } /** * @@ -1138,7 +1139,7 @@ public int getTargetIdsCount() { * repeated int32 target_ids = 2; */ public int getTargetIds(int index) { - return targetIds_.get(index); + return targetIds_.getInt(index); } /** * @@ -1156,7 +1157,7 @@ public int getTargetIds(int index) { */ public Builder setTargetIds(int index, int value) { ensureTargetIdsIsMutable(); - targetIds_.set(index, value); + targetIds_.setInt(index, value); onChanged(); return this; } @@ -1176,7 +1177,7 @@ public Builder setTargetIds(int index, int value) { */ public Builder addTargetIds(int value) { ensureTargetIdsIsMutable(); - targetIds_.add(value); + targetIds_.addInt(value); onChanged(); return this; } @@ -1215,13 +1216,13 @@ public Builder addAllTargetIds(java.lang.Iterable v * repeated int32 target_ids = 2; */ public Builder clearTargetIds() { - targetIds_ = java.util.Collections.emptyList(); + targetIds_ = emptyIntList(); bitField0_ = (bitField0_ & ~0x00000002); onChanged(); return this; } - private com.google.rpc.Status cause_ = null; + private com.google.rpc.Status cause_; private com.google.protobuf.SingleFieldBuilderV3< com.google.rpc.Status, com.google.rpc.Status.Builder, com.google.rpc.StatusOrBuilder> causeBuilder_; @@ -1443,7 +1444,7 @@ public Builder clearResumeToken() { return this; } - private com.google.protobuf.Timestamp readTime_ = null; + private com.google.protobuf.Timestamp readTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1683,7 +1684,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() { @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/TransactionOptions.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/TransactionOptions.java index db4aaf6263a2..242ba32565e7 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/TransactionOptions.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/TransactionOptions.java @@ -88,7 +88,7 @@ private TransactionOptions( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -190,7 +190,7 @@ private ReadWrite( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -282,10 +282,9 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.TransactionOptions.ReadWrite other = (com.google.firestore.v1beta1.TransactionOptions.ReadWrite) obj; - boolean result = true; - result = result && getRetryTransaction().equals(other.getRetryTransaction()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getRetryTransaction().equals(other.getRetryTransaction())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -481,23 +480,23 @@ public com.google.firestore.v1beta1.TransactionOptions.ReadWrite buildPartial() @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -505,13 +504,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 @@ -611,7 +610,7 @@ public Builder clearRetryTransaction() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -764,7 +763,7 @@ private ReadOnly( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -927,18 +926,16 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.TransactionOptions.ReadOnly other = (com.google.firestore.v1beta1.TransactionOptions.ReadOnly) obj; - boolean result = true; - result = result && getConsistencySelectorCase().equals(other.getConsistencySelectorCase()); - if (!result) return false; + if (!getConsistencySelectorCase().equals(other.getConsistencySelectorCase())) return false; switch (consistencySelectorCase_) { case 2: - result = result && getReadTime().equals(other.getReadTime()); + if (!getReadTime().equals(other.getReadTime())) 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 @@ -1147,23 +1144,23 @@ public com.google.firestore.v1beta1.TransactionOptions.ReadOnly buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override @@ -1171,13 +1168,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 @@ -1461,7 +1458,7 @@ public com.google.protobuf.TimestampOrBuilder getReadTimeOrBuilder() { @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { - return super.setUnknownFieldsProto3(unknownFields); + return super.setUnknownFields(unknownFields); } @java.lang.Override @@ -1694,21 +1691,19 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.TransactionOptions other = (com.google.firestore.v1beta1.TransactionOptions) obj; - boolean result = true; - result = result && getModeCase().equals(other.getModeCase()); - if (!result) return false; + if (!getModeCase().equals(other.getModeCase())) return false; switch (modeCase_) { case 2: - result = result && getReadOnly().equals(other.getReadOnly()); + if (!getReadOnly().equals(other.getReadOnly())) return false; break; case 3: - result = result && getReadWrite().equals(other.getReadWrite()); + if (!getReadWrite().equals(other.getReadWrite())) 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 @@ -1925,35 +1920,35 @@ public com.google.firestore.v1beta1.TransactionOptions buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override public Builder setRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, int index, java.lang.Object value) { - return (Builder) super.setRepeatedField(field, index, value); + return super.setRepeatedField(field, index, value); } @java.lang.Override public Builder addRepeatedField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.addRepeatedField(field, value); + return super.addRepeatedField(field, value); } @java.lang.Override @@ -2438,7 +2433,7 @@ public com.google.firestore.v1beta1.TransactionOptions.ReadWrite.Builder getRead @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/UpdateDocumentRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/UpdateDocumentRequest.java index 1080e8c2e680..28e1a16730ab 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/UpdateDocumentRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/UpdateDocumentRequest.java @@ -114,7 +114,7 @@ private UpdateDocumentRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -398,25 +398,24 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.UpdateDocumentRequest other = (com.google.firestore.v1beta1.UpdateDocumentRequest) obj; - boolean result = true; - result = result && (hasDocument() == other.hasDocument()); + if (hasDocument() != other.hasDocument()) return false; if (hasDocument()) { - result = result && getDocument().equals(other.getDocument()); + if (!getDocument().equals(other.getDocument())) 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 && (hasMask() == other.hasMask()); + if (hasMask() != other.hasMask()) return false; if (hasMask()) { - result = result && getMask().equals(other.getMask()); + if (!getMask().equals(other.getMask())) return false; } - result = result && (hasCurrentDocument() == other.hasCurrentDocument()); + if (hasCurrentDocument() != other.hasCurrentDocument()) return false; if (hasCurrentDocument()) { - result = result && getCurrentDocument().equals(other.getCurrentDocument()); + if (!getCurrentDocument().equals(other.getCurrentDocument())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -664,35 +663,35 @@ public com.google.firestore.v1beta1.UpdateDocumentRequest 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 @@ -750,7 +749,7 @@ public Builder mergeFrom( return this; } - private com.google.firestore.v1beta1.Document document_ = null; + private com.google.firestore.v1beta1.Document document_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1beta1.Document, com.google.firestore.v1beta1.Document.Builder, @@ -940,7 +939,7 @@ public com.google.firestore.v1beta1.DocumentOrBuilder getDocumentOrBuilder() { return documentBuilder_; } - private com.google.firestore.v1beta1.DocumentMask updateMask_ = null; + private com.google.firestore.v1beta1.DocumentMask updateMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1beta1.DocumentMask, com.google.firestore.v1beta1.DocumentMask.Builder, @@ -1167,7 +1166,7 @@ public com.google.firestore.v1beta1.DocumentMaskOrBuilder getUpdateMaskOrBuilder return updateMaskBuilder_; } - private com.google.firestore.v1beta1.DocumentMask mask_ = null; + private com.google.firestore.v1beta1.DocumentMask mask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1beta1.DocumentMask, com.google.firestore.v1beta1.DocumentMask.Builder, @@ -1366,7 +1365,7 @@ public com.google.firestore.v1beta1.DocumentMaskOrBuilder getMaskOrBuilder() { return maskBuilder_; } - private com.google.firestore.v1beta1.Precondition currentDocument_ = null; + private com.google.firestore.v1beta1.Precondition currentDocument_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1beta1.Precondition, com.google.firestore.v1beta1.Precondition.Builder, @@ -1559,7 +1558,7 @@ public com.google.firestore.v1beta1.PreconditionOrBuilder getCurrentDocumentOrBu @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Value.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Value.java index 01ee8ba1362f..ed0f04af3dec 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Value.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Value.java @@ -156,7 +156,7 @@ private Value( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -782,51 +782,47 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1beta1.Value other = (com.google.firestore.v1beta1.Value) obj; - boolean result = true; - result = result && getValueTypeCase().equals(other.getValueTypeCase()); - if (!result) return false; + if (!getValueTypeCase().equals(other.getValueTypeCase())) return false; switch (valueTypeCase_) { case 11: - result = result && getNullValueValue() == other.getNullValueValue(); + if (getNullValueValue() != other.getNullValueValue()) return false; break; case 1: - result = result && (getBooleanValue() == other.getBooleanValue()); + if (getBooleanValue() != other.getBooleanValue()) return false; break; case 2: - result = result && (getIntegerValue() == other.getIntegerValue()); + if (getIntegerValue() != other.getIntegerValue()) return false; break; case 3: - result = - result - && (java.lang.Double.doubleToLongBits(getDoubleValue()) - == java.lang.Double.doubleToLongBits(other.getDoubleValue())); + if (java.lang.Double.doubleToLongBits(getDoubleValue()) + != java.lang.Double.doubleToLongBits(other.getDoubleValue())) return false; break; case 10: - result = result && getTimestampValue().equals(other.getTimestampValue()); + if (!getTimestampValue().equals(other.getTimestampValue())) return false; break; case 17: - result = result && getStringValue().equals(other.getStringValue()); + if (!getStringValue().equals(other.getStringValue())) return false; break; case 18: - result = result && getBytesValue().equals(other.getBytesValue()); + if (!getBytesValue().equals(other.getBytesValue())) return false; break; case 5: - result = result && getReferenceValue().equals(other.getReferenceValue()); + if (!getReferenceValue().equals(other.getReferenceValue())) return false; break; case 8: - result = result && getGeoPointValue().equals(other.getGeoPointValue()); + if (!getGeoPointValue().equals(other.getGeoPointValue())) return false; break; case 9: - result = result && getArrayValue().equals(other.getArrayValue()); + if (!getArrayValue().equals(other.getArrayValue())) return false; break; case 6: - result = result && getMapValue().equals(other.getMapValue()); + if (!getMapValue().equals(other.getMapValue())) 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 @@ -1115,35 +1111,35 @@ public com.google.firestore.v1beta1.Value 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 @@ -2612,7 +2608,7 @@ public com.google.firestore.v1beta1.MapValueOrBuilder getMapValueOrBuilder() { @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Write.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Write.java index bf65f5cb7b98..56b0b17e56e2 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Write.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/Write.java @@ -122,7 +122,7 @@ private Write( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -529,32 +529,30 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1beta1.Write other = (com.google.firestore.v1beta1.Write) obj; - boolean result = true; - 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 && (hasCurrentDocument() == other.hasCurrentDocument()); + if (hasCurrentDocument() != other.hasCurrentDocument()) return false; if (hasCurrentDocument()) { - result = result && getCurrentDocument().equals(other.getCurrentDocument()); + if (!getCurrentDocument().equals(other.getCurrentDocument())) return false; } - result = result && getOperationCase().equals(other.getOperationCase()); - if (!result) return false; + if (!getOperationCase().equals(other.getOperationCase())) return false; switch (operationCase_) { case 1: - result = result && getUpdate().equals(other.getUpdate()); + if (!getUpdate().equals(other.getUpdate())) return false; break; case 2: - result = result && getDelete().equals(other.getDelete()); + if (!getDelete().equals(other.getDelete())) return false; break; case 6: - result = result && getTransform().equals(other.getTransform()); + if (!getTransform().equals(other.getTransform())) 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 @@ -806,35 +804,35 @@ public com.google.firestore.v1beta1.Write buildPartial() { @java.lang.Override public Builder clone() { - return (Builder) super.clone(); + return super.clone(); } @java.lang.Override public Builder setField( com.google.protobuf.Descriptors.FieldDescriptor field, java.lang.Object value) { - return (Builder) super.setField(field, value); + return super.setField(field, value); } @java.lang.Override public Builder clearField(com.google.protobuf.Descriptors.FieldDescriptor field) { - return (Builder) super.clearField(field); + return super.clearField(field); } @java.lang.Override public Builder clearOneof(com.google.protobuf.Descriptors.OneofDescriptor oneof) { - return (Builder) super.clearOneof(oneof); + return super.clearOneof(oneof); } @java.lang.Override 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 @@ -1461,7 +1459,7 @@ public com.google.firestore.v1beta1.DocumentTransformOrBuilder getTransformOrBui return transformBuilder_; } - private com.google.firestore.v1beta1.DocumentMask updateMask_ = null; + private com.google.firestore.v1beta1.DocumentMask updateMask_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1beta1.DocumentMask, com.google.firestore.v1beta1.DocumentMask.Builder, @@ -1715,7 +1713,7 @@ public com.google.firestore.v1beta1.DocumentMaskOrBuilder getUpdateMaskOrBuilder return updateMaskBuilder_; } - private com.google.firestore.v1beta1.Precondition currentDocument_ = null; + private com.google.firestore.v1beta1.Precondition currentDocument_; private com.google.protobuf.SingleFieldBuilderV3< com.google.firestore.v1beta1.Precondition, com.google.firestore.v1beta1.Precondition.Builder, @@ -1908,7 +1906,7 @@ public com.google.firestore.v1beta1.PreconditionOrBuilder getCurrentDocumentOrBu @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteRequest.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteRequest.java index 556fafaed98d..76ae0e301f17 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteRequest.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteRequest.java @@ -75,7 +75,7 @@ private WriteRequest( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { writes_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -91,7 +91,7 @@ private WriteRequest( } case 42: { - if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + if (!((mutable_bitField0_ & 0x00000010) != 0)) { labels_ = com.google.protobuf.MapField.newMapField(LabelsDefaultEntryHolder.defaultEntry); mutable_bitField0_ |= 0x00000010; @@ -104,7 +104,7 @@ private WriteRequest( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -116,7 +116,7 @@ private WriteRequest( } 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)) { writes_ = java.util.Collections.unmodifiableList(writes_); } this.unknownFields = unknownFields.build(); @@ -521,14 +521,13 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.WriteRequest other = (com.google.firestore.v1beta1.WriteRequest) obj; - boolean result = true; - result = result && getDatabase().equals(other.getDatabase()); - result = result && getStreamId().equals(other.getStreamId()); - result = result && getWritesList().equals(other.getWritesList()); - result = result && getStreamToken().equals(other.getStreamToken()); - result = result && internalGetLabels().equals(other.internalGetLabels()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getDatabase().equals(other.getDatabase())) return false; + if (!getStreamId().equals(other.getStreamId())) return false; + if (!getWritesList().equals(other.getWritesList())) return false; + if (!getStreamToken().equals(other.getStreamToken())) return false; + if (!internalGetLabels().equals(other.internalGetLabels())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -770,7 +769,7 @@ public com.google.firestore.v1beta1.WriteRequest buildPartial() { result.database_ = database_; result.streamId_ = streamId_; if (writesBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { writes_ = java.util.Collections.unmodifiableList(writes_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -788,35 +787,35 @@ public com.google.firestore.v1beta1.WriteRequest 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 @@ -1113,7 +1112,7 @@ public Builder setStreamIdBytes(com.google.protobuf.ByteString value) { java.util.Collections.emptyList(); private void ensureWritesIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { writes_ = new java.util.ArrayList(writes_); bitField0_ |= 0x00000004; } @@ -1523,10 +1522,7 @@ public java.util.List getWritesBuild com.google.firestore.v1beta1.Write, com.google.firestore.v1beta1.Write.Builder, com.google.firestore.v1beta1.WriteOrBuilder>( - writes_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + writes_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); writes_ = null; } return writesBuilder_; @@ -1760,7 +1756,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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteResponse.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteResponse.java index b6857e50c244..cc70f59e7785 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteResponse.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteResponse.java @@ -66,7 +66,7 @@ private WriteResponse( } case 26: { - if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) { + if (!((mutable_bitField0_ & 0x00000004) != 0)) { writeResults_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000004; } @@ -92,7 +92,7 @@ private WriteResponse( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -104,7 +104,7 @@ private WriteResponse( } 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)) { writeResults_ = java.util.Collections.unmodifiableList(writeResults_); } this.unknownFields = unknownFields.build(); @@ -366,16 +366,15 @@ public boolean equals(final java.lang.Object obj) { com.google.firestore.v1beta1.WriteResponse other = (com.google.firestore.v1beta1.WriteResponse) obj; - boolean result = true; - result = result && getStreamId().equals(other.getStreamId()); - result = result && getStreamToken().equals(other.getStreamToken()); - result = result && getWriteResultsList().equals(other.getWriteResultsList()); - result = result && (hasCommitTime() == other.hasCommitTime()); + if (!getStreamId().equals(other.getStreamId())) return false; + if (!getStreamToken().equals(other.getStreamToken())) return false; + if (!getWriteResultsList().equals(other.getWriteResultsList())) return false; + if (hasCommitTime() != other.hasCommitTime()) return false; if (hasCommitTime()) { - result = result && getCommitTime().equals(other.getCommitTime()); + if (!getCommitTime().equals(other.getCommitTime())) return false; } - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -592,7 +591,7 @@ public com.google.firestore.v1beta1.WriteResponse buildPartial() { result.streamId_ = streamId_; result.streamToken_ = streamToken_; if (writeResultsBuilder_ == null) { - if (((bitField0_ & 0x00000004) == 0x00000004)) { + if (((bitField0_ & 0x00000004) != 0)) { writeResults_ = java.util.Collections.unmodifiableList(writeResults_); bitField0_ = (bitField0_ & ~0x00000004); } @@ -612,35 +611,35 @@ public com.google.firestore.v1beta1.WriteResponse 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 @@ -879,7 +878,7 @@ public Builder clearStreamToken() { java.util.Collections.emptyList(); private void ensureWriteResultsIsMutable() { - if (!((bitField0_ & 0x00000004) == 0x00000004)) { + if (!((bitField0_ & 0x00000004) != 0)) { writeResults_ = new java.util.ArrayList(writeResults_); bitField0_ |= 0x00000004; @@ -1256,16 +1255,13 @@ public com.google.firestore.v1beta1.WriteResult.Builder addWriteResultsBuilder(i com.google.firestore.v1beta1.WriteResult, com.google.firestore.v1beta1.WriteResult.Builder, com.google.firestore.v1beta1.WriteResultOrBuilder>( - writeResults_, - ((bitField0_ & 0x00000004) == 0x00000004), - getParentForChildren(), - isClean()); + writeResults_, ((bitField0_ & 0x00000004) != 0), getParentForChildren(), isClean()); writeResults_ = null; } return writeResultsBuilder_; } - private com.google.protobuf.Timestamp commitTime_ = null; + private com.google.protobuf.Timestamp commitTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -1446,7 +1442,7 @@ public com.google.protobuf.TimestampOrBuilder getCommitTimeOrBuilder() { @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-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteResult.java b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteResult.java index 5d728f0b4555..61a803a75c57 100644 --- a/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteResult.java +++ b/google-api-grpc/proto-google-cloud-firestore-v1beta1/src/main/java/com/google/firestore/v1beta1/WriteResult.java @@ -67,7 +67,7 @@ private WriteResult( } case 18: { - if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + if (!((mutable_bitField0_ & 0x00000002) != 0)) { transformResults_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000002; } @@ -78,7 +78,7 @@ private WriteResult( } default: { - if (!parseUnknownFieldProto3(input, unknownFields, extensionRegistry, tag)) { + if (!parseUnknownField(input, unknownFields, extensionRegistry, tag)) { done = true; } break; @@ -90,7 +90,7 @@ private WriteResult( } 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)) { transformResults_ = java.util.Collections.unmodifiableList(transformResults_); } this.unknownFields = unknownFields.build(); @@ -281,14 +281,13 @@ public boolean equals(final java.lang.Object obj) { } com.google.firestore.v1beta1.WriteResult other = (com.google.firestore.v1beta1.WriteResult) obj; - boolean result = true; - result = result && (hasUpdateTime() == other.hasUpdateTime()); + if (hasUpdateTime() != other.hasUpdateTime()) return false; if (hasUpdateTime()) { - result = result && getUpdateTime().equals(other.getUpdateTime()); + if (!getUpdateTime().equals(other.getUpdateTime())) return false; } - result = result && getTransformResultsList().equals(other.getTransformResultsList()); - result = result && unknownFields.equals(other.unknownFields); - return result; + if (!getTransformResultsList().equals(other.getTransformResultsList())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; } @java.lang.Override @@ -500,7 +499,7 @@ public com.google.firestore.v1beta1.WriteResult buildPartial() { result.updateTime_ = updateTimeBuilder_.build(); } if (transformResultsBuilder_ == null) { - if (((bitField0_ & 0x00000002) == 0x00000002)) { + if (((bitField0_ & 0x00000002) != 0)) { transformResults_ = java.util.Collections.unmodifiableList(transformResults_); bitField0_ = (bitField0_ & ~0x00000002); } @@ -515,35 +514,35 @@ public com.google.firestore.v1beta1.WriteResult 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 @@ -619,7 +618,7 @@ public Builder mergeFrom( private int bitField0_; - private com.google.protobuf.Timestamp updateTime_ = null; + private com.google.protobuf.Timestamp updateTime_; private com.google.protobuf.SingleFieldBuilderV3< com.google.protobuf.Timestamp, com.google.protobuf.Timestamp.Builder, @@ -829,7 +828,7 @@ public com.google.protobuf.TimestampOrBuilder getUpdateTimeOrBuilder() { java.util.Collections.emptyList(); private void ensureTransformResultsIsMutable() { - if (!((bitField0_ & 0x00000002) == 0x00000002)) { + if (!((bitField0_ & 0x00000002) != 0)) { transformResults_ = new java.util.ArrayList(transformResults_); bitField0_ |= 0x00000002; @@ -1188,7 +1187,7 @@ public com.google.firestore.v1beta1.Value.Builder addTransformResultsBuilder(int com.google.firestore.v1beta1.Value.Builder, com.google.firestore.v1beta1.ValueOrBuilder>( transformResults_, - ((bitField0_ & 0x00000002) == 0x00000002), + ((bitField0_ & 0x00000002) != 0), getParentForChildren(), isClean()); transformResults_ = null; @@ -1198,7 +1197,7 @@ public com.google.firestore.v1beta1.Value.Builder addTransformResultsBuilder(int @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-firestore/synth.metadata b/google-cloud-clients/google-cloud-firestore/synth.metadata index de90cf5870bd..1ad1350b9aca 100644 --- a/google-cloud-clients/google-cloud-firestore/synth.metadata +++ b/google-cloud-clients/google-cloud-firestore/synth.metadata @@ -1,19 +1,19 @@ { - "updateTime": "2019-03-28T07:45:57.748956Z", + "updateTime": "2019-03-30T07:45:26.469058Z", "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": "fd67be4b51a8c809b97100ccf1c3cffd15b85d7b", + "internalRef": "241096997" } } ],