From 3b7a6d1142b5fd5239c98548f2e64d8a0c75881e Mon Sep 17 00:00:00 2001 From: Michael Lehenbauer Date: Wed, 30 Jan 2019 08:44:07 -0800 Subject: [PATCH] Firestore: Migrate client to use v1 gapic client / protos. --- .../cloud/firestore/CollectionReference.java | 8 +- .../cloud/firestore/DocumentReference.java | 4 +- .../cloud/firestore/DocumentSnapshot.java | 6 +- .../cloud/firestore/DocumentTransform.java | 6 +- .../com/google/cloud/firestore/FieldMask.java | 6 +- .../google/cloud/firestore/FieldValue.java | 4 +- .../google/cloud/firestore/FirestoreImpl.java | 8 +- .../cloud/firestore/FirestoreOptions.java | 6 +- .../com/google/cloud/firestore/Order.java | 4 +- .../google/cloud/firestore/Precondition.java | 6 +- .../com/google/cloud/firestore/Query.java | 32 +- .../firestore/QueryDocumentSnapshot.java | 4 +- .../google/cloud/firestore/ResourcePath.java | 2 +- .../google/cloud/firestore/Transaction.java | 6 +- .../google/cloud/firestore/UpdateBuilder.java | 12 +- .../cloud/firestore/UserDataConverter.java | 6 +- .../com/google/cloud/firestore/Watch.java | 12 +- .../google/cloud/firestore/WriteResult.java | 3 +- .../spi/{v1beta1 => v1}/FirestoreRpc.java | 32 +- .../spi/{v1beta1 => v1}/GrpcFirestoreRpc.java | 42 +- .../firestore/CollectionReferenceTest.java | 6 +- .../cloud/firestore/ConformanceTest.java | 18 +- .../firestore/DocumentReferenceTest.java | 20 +- .../google/cloud/firestore/FirestoreTest.java | 6 +- .../cloud/firestore/LocalFirestoreHelper.java | 48 +- .../com/google/cloud/firestore/OrderTest.java | 6 +- .../com/google/cloud/firestore/QueryTest.java | 12 +- .../cloud/firestore/TransactionTest.java | 12 +- .../com/google/cloud/firestore/WatchTest.java | 22 +- .../cloud/firestore/WriteBatchTest.java | 22 +- .../firestore/conformance/TestDefinition.java | 1254 ++++++++--------- 31 files changed, 807 insertions(+), 828 deletions(-) rename google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/spi/{v1beta1 => v1}/FirestoreRpc.java (69%) rename google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/spi/{v1beta1 => v1}/GrpcFirestoreRpc.java (85%) diff --git a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/CollectionReference.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/CollectionReference.java index 87ba8c9394f9..f6d472a2aeb2 100644 --- a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/CollectionReference.java +++ b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/CollectionReference.java @@ -21,11 +21,11 @@ import com.google.api.core.ApiFutures; import com.google.api.gax.rpc.ApiException; import com.google.api.gax.rpc.ApiExceptions; -import com.google.cloud.firestore.v1beta1.FirestoreClient.ListDocumentsPagedResponse; +import com.google.cloud.firestore.v1.FirestoreClient.ListDocumentsPagedResponse; import com.google.common.base.Preconditions; -import com.google.firestore.v1beta1.Document; -import com.google.firestore.v1beta1.DocumentMask; -import com.google.firestore.v1beta1.ListDocumentsRequest; +import com.google.firestore.v1.Document; +import com.google.firestore.v1.DocumentMask; +import com.google.firestore.v1.ListDocumentsRequest; import java.util.Iterator; import java.util.Map; import javax.annotation.Nonnull; diff --git a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentReference.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentReference.java index f8fe3880371a..26ee1cfee022 100644 --- a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentReference.java +++ b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentReference.java @@ -21,8 +21,8 @@ import com.google.api.core.ApiFutures; import com.google.api.gax.rpc.ApiException; import com.google.api.gax.rpc.ApiExceptions; -import com.google.cloud.firestore.v1beta1.FirestoreClient.ListCollectionIdsPagedResponse; -import com.google.firestore.v1beta1.ListCollectionIdsRequest; +import com.google.cloud.firestore.v1.FirestoreClient.ListCollectionIdsPagedResponse; +import com.google.firestore.v1.ListCollectionIdsRequest; import java.util.Iterator; import java.util.List; import java.util.Map; diff --git a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentSnapshot.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentSnapshot.java index 295dc1d4b804..54b43af6b1b8 100644 --- a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentSnapshot.java +++ b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentSnapshot.java @@ -19,9 +19,9 @@ import com.google.cloud.Timestamp; import com.google.cloud.firestore.UserDataConverter.EncodingOptions; import com.google.common.base.Preconditions; -import com.google.firestore.v1beta1.Document; -import com.google.firestore.v1beta1.Value; -import com.google.firestore.v1beta1.Write; +import com.google.firestore.v1.Document; +import com.google.firestore.v1.Value; +import com.google.firestore.v1.Write; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; diff --git a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentTransform.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentTransform.java index 000bbef1f3f3..a90b0ec5ecf4 100644 --- a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentTransform.java +++ b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentTransform.java @@ -16,8 +16,8 @@ package com.google.cloud.firestore; -import com.google.firestore.v1beta1.DocumentTransform.FieldTransform; -import com.google.firestore.v1beta1.Write; +import com.google.firestore.v1.DocumentTransform.FieldTransform; +import com.google.firestore.v1.Write; import java.util.Collections; import java.util.List; import java.util.Map; @@ -118,7 +118,7 @@ Set getFields() { Write.Builder toPb() { Write.Builder write = Write.newBuilder(); - com.google.firestore.v1beta1.DocumentTransform.Builder transform = write.getTransformBuilder(); + com.google.firestore.v1.DocumentTransform.Builder transform = write.getTransformBuilder(); transform.addAllFieldTransforms(transforms.values()); transform.setDocument(documentReference.getName()); return write; diff --git a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FieldMask.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FieldMask.java index 89aefce06f10..2bcfa252bd83 100644 --- a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FieldMask.java +++ b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FieldMask.java @@ -91,9 +91,9 @@ private static List extractFromMap(Map values, FieldP return fieldPaths; } - com.google.firestore.v1beta1.DocumentMask toPb() { - com.google.firestore.v1beta1.DocumentMask.Builder updateMask = - com.google.firestore.v1beta1.DocumentMask.newBuilder(); + com.google.firestore.v1.DocumentMask toPb() { + com.google.firestore.v1.DocumentMask.Builder updateMask = + com.google.firestore.v1.DocumentMask.newBuilder(); for (FieldPath fieldPath : fieldPaths) { updateMask.addFieldPaths(fieldPath.getEncodedPath()); } diff --git a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FieldValue.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FieldValue.java index c7480ce653b4..395810a326fa 100644 --- a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FieldValue.java +++ b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FieldValue.java @@ -17,8 +17,8 @@ package com.google.cloud.firestore; import com.google.common.base.Preconditions; -import com.google.firestore.v1beta1.ArrayValue; -import com.google.firestore.v1beta1.DocumentTransform.FieldTransform; +import com.google.firestore.v1.ArrayValue; +import com.google.firestore.v1.DocumentTransform.FieldTransform; import java.util.Arrays; import java.util.List; import java.util.Objects; diff --git a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreImpl.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreImpl.java index fda247f81626..3a1c677aaccc 100644 --- a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreImpl.java +++ b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreImpl.java @@ -26,12 +26,12 @@ import com.google.api.gax.rpc.ServerStreamingCallable; import com.google.api.gax.rpc.UnaryCallable; import com.google.cloud.Timestamp; -import com.google.cloud.firestore.spi.v1beta1.FirestoreRpc; +import com.google.cloud.firestore.spi.v1.FirestoreRpc; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; -import com.google.firestore.v1beta1.BatchGetDocumentsRequest; -import com.google.firestore.v1beta1.BatchGetDocumentsResponse; -import com.google.firestore.v1beta1.DatabaseRootName; +import com.google.firestore.v1.BatchGetDocumentsRequest; +import com.google.firestore.v1.BatchGetDocumentsResponse; +import com.google.firestore.v1.DatabaseRootName; import com.google.protobuf.ByteString; import io.grpc.Context; import io.grpc.Status; diff --git a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreOptions.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreOptions.java index 7bee4c05b871..d3815959fbe9 100644 --- a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreOptions.java +++ b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreOptions.java @@ -24,9 +24,9 @@ import com.google.cloud.ServiceDefaults; import com.google.cloud.ServiceOptions; import com.google.cloud.TransportOptions; -import com.google.cloud.firestore.spi.v1beta1.FirestoreRpc; -import com.google.cloud.firestore.spi.v1beta1.GrpcFirestoreRpc; -import com.google.cloud.firestore.v1beta1.FirestoreSettings; +import com.google.cloud.firestore.spi.v1.FirestoreRpc; +import com.google.cloud.firestore.spi.v1.GrpcFirestoreRpc; +import com.google.cloud.firestore.v1.FirestoreSettings; import com.google.cloud.grpc.GrpcTransportOptions; import com.google.common.collect.ImmutableSet; import java.io.IOException; diff --git a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Order.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Order.java index b114d597e51e..46d1ffa7ce41 100644 --- a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Order.java +++ b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Order.java @@ -16,8 +16,8 @@ package com.google.cloud.firestore; -import com.google.firestore.v1beta1.Value; -import com.google.firestore.v1beta1.Value.ValueTypeCase; +import com.google.firestore.v1.Value; +import com.google.firestore.v1.Value.ValueTypeCase; import com.google.protobuf.ByteString; import java.util.Comparator; import java.util.Iterator; diff --git a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Precondition.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Precondition.java index e22900e9bf36..54b55b81884c 100644 --- a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Precondition.java +++ b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Precondition.java @@ -66,9 +66,9 @@ boolean hasExists() { return exists != null; } - com.google.firestore.v1beta1.Precondition toPb() { - com.google.firestore.v1beta1.Precondition.Builder precondition = - com.google.firestore.v1beta1.Precondition.newBuilder(); + com.google.firestore.v1.Precondition toPb() { + com.google.firestore.v1.Precondition.Builder precondition = + com.google.firestore.v1.Precondition.newBuilder(); if (exists != null) { precondition.setExists(exists); diff --git a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Query.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Query.java index 1f72da177ce4..739f57e14883 100644 --- a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Query.java +++ b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Query.java @@ -16,12 +16,12 @@ package com.google.cloud.firestore; -import static com.google.firestore.v1beta1.StructuredQuery.FieldFilter.Operator.ARRAY_CONTAINS; -import static com.google.firestore.v1beta1.StructuredQuery.FieldFilter.Operator.EQUAL; -import static com.google.firestore.v1beta1.StructuredQuery.FieldFilter.Operator.GREATER_THAN; -import static com.google.firestore.v1beta1.StructuredQuery.FieldFilter.Operator.GREATER_THAN_OR_EQUAL; -import static com.google.firestore.v1beta1.StructuredQuery.FieldFilter.Operator.LESS_THAN; -import static com.google.firestore.v1beta1.StructuredQuery.FieldFilter.Operator.LESS_THAN_OR_EQUAL; +import static com.google.firestore.v1.StructuredQuery.FieldFilter.Operator.ARRAY_CONTAINS; +import static com.google.firestore.v1.StructuredQuery.FieldFilter.Operator.EQUAL; +import static com.google.firestore.v1.StructuredQuery.FieldFilter.Operator.GREATER_THAN; +import static com.google.firestore.v1.StructuredQuery.FieldFilter.Operator.GREATER_THAN_OR_EQUAL; +import static com.google.firestore.v1.StructuredQuery.FieldFilter.Operator.LESS_THAN; +import static com.google.firestore.v1.StructuredQuery.FieldFilter.Operator.LESS_THAN_OR_EQUAL; import com.google.api.core.ApiFuture; import com.google.api.core.SettableApiFuture; @@ -29,16 +29,16 @@ import com.google.cloud.Timestamp; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; -import com.google.firestore.v1beta1.Cursor; -import com.google.firestore.v1beta1.Document; -import com.google.firestore.v1beta1.RunQueryRequest; -import com.google.firestore.v1beta1.RunQueryResponse; -import com.google.firestore.v1beta1.StructuredQuery; -import com.google.firestore.v1beta1.StructuredQuery.CompositeFilter; -import com.google.firestore.v1beta1.StructuredQuery.FieldReference; -import com.google.firestore.v1beta1.StructuredQuery.Filter; -import com.google.firestore.v1beta1.StructuredQuery.Order; -import com.google.firestore.v1beta1.Value; +import com.google.firestore.v1.Cursor; +import com.google.firestore.v1.Document; +import com.google.firestore.v1.RunQueryRequest; +import com.google.firestore.v1.RunQueryResponse; +import com.google.firestore.v1.StructuredQuery; +import com.google.firestore.v1.StructuredQuery.CompositeFilter; +import com.google.firestore.v1.StructuredQuery.FieldReference; +import com.google.firestore.v1.StructuredQuery.Filter; +import com.google.firestore.v1.StructuredQuery.Order; +import com.google.firestore.v1.Value; import com.google.protobuf.ByteString; import com.google.protobuf.Int32Value; import io.opencensus.trace.AttributeValue; diff --git a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/QueryDocumentSnapshot.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/QueryDocumentSnapshot.java index 7a434f20c18f..899e5f160e77 100644 --- a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/QueryDocumentSnapshot.java +++ b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/QueryDocumentSnapshot.java @@ -18,8 +18,8 @@ import com.google.cloud.Timestamp; import com.google.common.base.Preconditions; -import com.google.firestore.v1beta1.Document; -import com.google.firestore.v1beta1.Value; +import com.google.firestore.v1.Document; +import com.google.firestore.v1.Value; import java.util.Map; import javax.annotation.Nonnull; diff --git a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/ResourcePath.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/ResourcePath.java index 6f6be76a9829..bc96e89bd722 100644 --- a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/ResourcePath.java +++ b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/ResourcePath.java @@ -18,7 +18,7 @@ import com.google.auto.value.AutoValue; import com.google.common.collect.ImmutableList; -import com.google.firestore.v1beta1.DatabaseRootName; +import com.google.firestore.v1.DatabaseRootName; import java.util.Arrays; import java.util.Comparator; import javax.annotation.Nonnull; diff --git a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Transaction.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Transaction.java index 6954e83ecad1..5daf2ef89cc8 100644 --- a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Transaction.java +++ b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Transaction.java @@ -20,9 +20,9 @@ import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; import com.google.common.base.Preconditions; -import com.google.firestore.v1beta1.BeginTransactionRequest; -import com.google.firestore.v1beta1.BeginTransactionResponse; -import com.google.firestore.v1beta1.RollbackRequest; +import com.google.firestore.v1.BeginTransactionRequest; +import com.google.firestore.v1.BeginTransactionResponse; +import com.google.firestore.v1.RollbackRequest; import com.google.protobuf.ByteString; import com.google.protobuf.Empty; import java.util.List; diff --git a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/UpdateBuilder.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/UpdateBuilder.java index b5d0c0a7a6ce..3d7240211c50 100644 --- a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/UpdateBuilder.java +++ b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/UpdateBuilder.java @@ -22,9 +22,9 @@ import com.google.cloud.firestore.UserDataConverter.EncodingOptions; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; -import com.google.firestore.v1beta1.CommitRequest; -import com.google.firestore.v1beta1.CommitResponse; -import com.google.firestore.v1beta1.Write; +import com.google.firestore.v1.CommitRequest; +import com.google.firestore.v1.CommitResponse; +import com.google.firestore.v1.Write; import com.google.protobuf.ByteString; import io.opencensus.trace.AttributeValue; import io.opencensus.trace.Tracing; @@ -48,7 +48,7 @@ public abstract class UpdateBuilder { private static class Mutation { Write.Builder document; Write.Builder transform; - com.google.firestore.v1beta1.Precondition precondition; + com.google.firestore.v1.Precondition precondition; } final FirestoreImpl firestore; @@ -625,7 +625,7 @@ ApiFuture> commit(@Nullable ByteString transactionId) { new ApiFunction>() { @Override public List apply(CommitResponse commitResponse) { - List writeResults = + List writeResults = commitResponse.getWriteResultsList(); List result = new ArrayList<>(); @@ -637,7 +637,7 @@ public List apply(CommitResponse commitResponse) { request.getWritesCount()); Iterator mutationIterator = mutations.iterator(); - Iterator responseIterator = + Iterator responseIterator = writeResults.iterator(); while (mutationIterator.hasNext()) { diff --git a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/UserDataConverter.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/UserDataConverter.java index bda5ad48f0f7..9bedd8b5d7ce 100644 --- a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/UserDataConverter.java +++ b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/UserDataConverter.java @@ -18,9 +18,9 @@ import com.google.cloud.Timestamp; import com.google.common.base.Preconditions; -import com.google.firestore.v1beta1.ArrayValue; -import com.google.firestore.v1beta1.MapValue; -import com.google.firestore.v1beta1.Value; +import com.google.firestore.v1.ArrayValue; +import com.google.firestore.v1.MapValue; +import com.google.firestore.v1.Value; import com.google.protobuf.NullValue; import java.util.Date; import java.util.List; diff --git a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Watch.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Watch.java index cc7624bb25d9..6d937aa2306e 100644 --- a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Watch.java +++ b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Watch.java @@ -26,12 +26,12 @@ import com.google.cloud.Timestamp; import com.google.cloud.firestore.DocumentChange.Type; import com.google.common.base.Preconditions; -import com.google.firestore.v1beta1.Document; -import com.google.firestore.v1beta1.ListenRequest; -import com.google.firestore.v1beta1.ListenResponse; -import com.google.firestore.v1beta1.Target; -import com.google.firestore.v1beta1.Target.QueryTarget; -import com.google.firestore.v1beta1.TargetChange; +import com.google.firestore.v1.Document; +import com.google.firestore.v1.ListenRequest; +import com.google.firestore.v1.ListenResponse; +import com.google.firestore.v1.Target; +import com.google.firestore.v1.Target.QueryTarget; +import com.google.firestore.v1.TargetChange; import com.google.protobuf.ByteString; import io.grpc.Status; import io.grpc.Status.Code; diff --git a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/WriteResult.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/WriteResult.java index 5e98804c8468..12106b835165 100644 --- a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/WriteResult.java +++ b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/WriteResult.java @@ -40,8 +40,7 @@ public Timestamp getUpdateTime() { } static WriteResult fromProto( - com.google.firestore.v1beta1.WriteResult writeResult, - com.google.protobuf.Timestamp commitTime) { + com.google.firestore.v1.WriteResult writeResult, com.google.protobuf.Timestamp commitTime) { Timestamp timestamp = Timestamp.fromProto(writeResult.hasUpdateTime() ? writeResult.getUpdateTime() : commitTime); return new WriteResult(timestamp); diff --git a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/spi/v1beta1/FirestoreRpc.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/spi/v1/FirestoreRpc.java similarity index 69% rename from google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/spi/v1beta1/FirestoreRpc.java rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/spi/v1/FirestoreRpc.java index 24ba05008fd7..2353e0138a26 100644 --- a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/spi/v1beta1/FirestoreRpc.java +++ b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/spi/v1/FirestoreRpc.java @@ -14,27 +14,27 @@ * limitations under the License. */ -package com.google.cloud.firestore.spi.v1beta1; +package com.google.cloud.firestore.spi.v1; import com.google.api.gax.rpc.BidiStreamingCallable; import com.google.api.gax.rpc.ServerStreamingCallable; import com.google.api.gax.rpc.UnaryCallable; import com.google.cloud.ServiceRpc; -import com.google.cloud.firestore.v1beta1.FirestoreClient.ListCollectionIdsPagedResponse; -import com.google.cloud.firestore.v1beta1.FirestoreClient.ListDocumentsPagedResponse; -import com.google.firestore.v1beta1.BatchGetDocumentsRequest; -import com.google.firestore.v1beta1.BatchGetDocumentsResponse; -import com.google.firestore.v1beta1.BeginTransactionRequest; -import com.google.firestore.v1beta1.BeginTransactionResponse; -import com.google.firestore.v1beta1.CommitRequest; -import com.google.firestore.v1beta1.CommitResponse; -import com.google.firestore.v1beta1.ListCollectionIdsRequest; -import com.google.firestore.v1beta1.ListDocumentsRequest; -import com.google.firestore.v1beta1.ListenRequest; -import com.google.firestore.v1beta1.ListenResponse; -import com.google.firestore.v1beta1.RollbackRequest; -import com.google.firestore.v1beta1.RunQueryRequest; -import com.google.firestore.v1beta1.RunQueryResponse; +import com.google.cloud.firestore.v1.FirestoreClient.ListCollectionIdsPagedResponse; +import com.google.cloud.firestore.v1.FirestoreClient.ListDocumentsPagedResponse; +import com.google.firestore.v1.BatchGetDocumentsRequest; +import com.google.firestore.v1.BatchGetDocumentsResponse; +import com.google.firestore.v1.BeginTransactionRequest; +import com.google.firestore.v1.BeginTransactionResponse; +import com.google.firestore.v1.CommitRequest; +import com.google.firestore.v1.CommitResponse; +import com.google.firestore.v1.ListCollectionIdsRequest; +import com.google.firestore.v1.ListDocumentsRequest; +import com.google.firestore.v1.ListenRequest; +import com.google.firestore.v1.ListenResponse; +import com.google.firestore.v1.RollbackRequest; +import com.google.firestore.v1.RunQueryRequest; +import com.google.firestore.v1.RunQueryResponse; import com.google.protobuf.Empty; import java.util.concurrent.ScheduledExecutorService; diff --git a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/spi/v1beta1/GrpcFirestoreRpc.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/spi/v1/GrpcFirestoreRpc.java similarity index 85% rename from google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/spi/v1beta1/GrpcFirestoreRpc.java rename to google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/spi/v1/GrpcFirestoreRpc.java index f9103cb59fab..451eb6c8e593 100644 --- a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/spi/v1beta1/GrpcFirestoreRpc.java +++ b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/spi/v1/GrpcFirestoreRpc.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.cloud.firestore.spi.v1beta1; +package com.google.cloud.firestore.spi.v1; import com.google.api.core.ApiFunction; import com.google.api.gax.core.BackgroundResource; @@ -33,28 +33,28 @@ import com.google.cloud.NoCredentials; import com.google.cloud.ServiceOptions; import com.google.cloud.firestore.FirestoreOptions; -import com.google.cloud.firestore.v1beta1.FirestoreClient.ListCollectionIdsPagedResponse; -import com.google.cloud.firestore.v1beta1.FirestoreClient.ListDocumentsPagedResponse; -import com.google.cloud.firestore.v1beta1.FirestoreSettings; -import com.google.cloud.firestore.v1beta1.stub.FirestoreStub; -import com.google.cloud.firestore.v1beta1.stub.FirestoreStubSettings; -import com.google.cloud.firestore.v1beta1.stub.GrpcFirestoreStub; +import com.google.cloud.firestore.v1.FirestoreClient.ListCollectionIdsPagedResponse; +import com.google.cloud.firestore.v1.FirestoreClient.ListDocumentsPagedResponse; +import com.google.cloud.firestore.v1.FirestoreSettings; +import com.google.cloud.firestore.v1.stub.FirestoreStub; +import com.google.cloud.firestore.v1.stub.FirestoreStubSettings; +import com.google.cloud.firestore.v1.stub.GrpcFirestoreStub; import com.google.cloud.grpc.GrpcTransportOptions; import com.google.cloud.grpc.GrpcTransportOptions.ExecutorFactory; -import com.google.firestore.v1beta1.BatchGetDocumentsRequest; -import com.google.firestore.v1beta1.BatchGetDocumentsResponse; -import com.google.firestore.v1beta1.BeginTransactionRequest; -import com.google.firestore.v1beta1.BeginTransactionResponse; -import com.google.firestore.v1beta1.CommitRequest; -import com.google.firestore.v1beta1.CommitResponse; -import com.google.firestore.v1beta1.DatabaseRootName; -import com.google.firestore.v1beta1.ListCollectionIdsRequest; -import com.google.firestore.v1beta1.ListDocumentsRequest; -import com.google.firestore.v1beta1.ListenRequest; -import com.google.firestore.v1beta1.ListenResponse; -import com.google.firestore.v1beta1.RollbackRequest; -import com.google.firestore.v1beta1.RunQueryRequest; -import com.google.firestore.v1beta1.RunQueryResponse; +import com.google.firestore.v1.BatchGetDocumentsRequest; +import com.google.firestore.v1.BatchGetDocumentsResponse; +import com.google.firestore.v1.BeginTransactionRequest; +import com.google.firestore.v1.BeginTransactionResponse; +import com.google.firestore.v1.CommitRequest; +import com.google.firestore.v1.CommitResponse; +import com.google.firestore.v1.DatabaseRootName; +import com.google.firestore.v1.ListCollectionIdsRequest; +import com.google.firestore.v1.ListDocumentsRequest; +import com.google.firestore.v1.ListenRequest; +import com.google.firestore.v1.ListenResponse; +import com.google.firestore.v1.RollbackRequest; +import com.google.firestore.v1.RunQueryRequest; +import com.google.firestore.v1.RunQueryResponse; import com.google.protobuf.Empty; import io.grpc.CallOptions; import io.grpc.ManagedChannel; diff --git a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/CollectionReferenceTest.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/CollectionReferenceTest.java index 47934c4d2890..f95882926b98 100644 --- a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/CollectionReferenceTest.java +++ b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/CollectionReferenceTest.java @@ -24,9 +24,9 @@ import com.google.api.core.ApiFuture; import com.google.api.gax.rpc.UnaryCallable; -import com.google.cloud.firestore.spi.v1beta1.FirestoreRpc; -import com.google.firestore.v1beta1.CommitRequest; -import com.google.firestore.v1beta1.CommitResponse; +import com.google.cloud.firestore.spi.v1.FirestoreRpc; +import com.google.firestore.v1.CommitRequest; +import com.google.firestore.v1.CommitResponse; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java index 64e97ac86cbd..cd85027b79b1 100644 --- a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java +++ b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java @@ -47,16 +47,16 @@ import com.google.cloud.firestore.conformance.TestDefinition.UpdatePathsTest; import com.google.cloud.firestore.conformance.TestDefinition.UpdateTest; import com.google.cloud.firestore.conformance.TestDefinition.Where; -import com.google.cloud.firestore.spi.v1beta1.FirestoreRpc; +import com.google.cloud.firestore.spi.v1.FirestoreRpc; import com.google.common.base.Preconditions; -import com.google.firestore.v1beta1.BatchGetDocumentsRequest; -import com.google.firestore.v1beta1.CommitRequest; -import com.google.firestore.v1beta1.Document; -import com.google.firestore.v1beta1.ListenRequest; -import com.google.firestore.v1beta1.ListenResponse; -import com.google.firestore.v1beta1.Precondition; -import com.google.firestore.v1beta1.RunQueryRequest; -import com.google.firestore.v1beta1.Value; +import com.google.firestore.v1.BatchGetDocumentsRequest; +import com.google.firestore.v1.CommitRequest; +import com.google.firestore.v1.Document; +import com.google.firestore.v1.ListenRequest; +import com.google.firestore.v1.ListenResponse; +import com.google.firestore.v1.Precondition; +import com.google.firestore.v1.RunQueryRequest; +import com.google.firestore.v1.Value; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; import com.google.protobuf.GeneratedMessageV3; diff --git a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/DocumentReferenceTest.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/DocumentReferenceTest.java index eb4a165b1732..a07dab86f326 100644 --- a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/DocumentReferenceTest.java +++ b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/DocumentReferenceTest.java @@ -65,13 +65,13 @@ import com.google.api.gax.rpc.ServerStreamingCallable; import com.google.api.gax.rpc.UnaryCallable; import com.google.cloud.Timestamp; -import com.google.cloud.firestore.spi.v1beta1.FirestoreRpc; +import com.google.cloud.firestore.spi.v1.FirestoreRpc; import com.google.common.collect.ImmutableList; -import com.google.firestore.v1beta1.BatchGetDocumentsRequest; -import com.google.firestore.v1beta1.BatchGetDocumentsResponse; -import com.google.firestore.v1beta1.CommitRequest; -import com.google.firestore.v1beta1.CommitResponse; -import com.google.firestore.v1beta1.Value; +import com.google.firestore.v1.BatchGetDocumentsRequest; +import com.google.firestore.v1.BatchGetDocumentsResponse; +import com.google.firestore.v1.CommitRequest; +import com.google.firestore.v1.CommitResponse; +import com.google.firestore.v1.Value; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -300,8 +300,8 @@ public void deleteDocument() throws Exception { List commitRequests = commitCapture.getAllValues(); assertCommitEquals(commit(delete()), commitRequests.get(0)); - com.google.firestore.v1beta1.Precondition.Builder precondition = - com.google.firestore.v1beta1.Precondition.newBuilder(); + com.google.firestore.v1.Precondition.Builder precondition = + com.google.firestore.v1.Precondition.newBuilder(); precondition.getUpdateTimeBuilder().setSeconds(479978400).setNanos(123000000); assertCommitEquals(commit(delete(precondition.build())), commitRequests.get(1)); } @@ -926,8 +926,8 @@ public void updateDocumentWithPreconditions() throws Exception { documentReference.update(SINGLE_FIELD_MAP, options).get(); documentReference.update(options, "foo", "bar").get(); - com.google.firestore.v1beta1.Precondition.Builder precondition = - com.google.firestore.v1beta1.Precondition.newBuilder(); + com.google.firestore.v1.Precondition.Builder precondition = + com.google.firestore.v1.Precondition.newBuilder(); precondition.getUpdateTimeBuilder().setSeconds(479978400).setNanos(123000000); CommitRequest expectedCommit = diff --git a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/FirestoreTest.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/FirestoreTest.java index 2051b7b05939..42e4cd5e0407 100644 --- a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/FirestoreTest.java +++ b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/FirestoreTest.java @@ -25,9 +25,9 @@ import com.google.api.gax.rpc.ApiStreamObserver; import com.google.api.gax.rpc.ServerStreamingCallable; -import com.google.cloud.firestore.spi.v1beta1.FirestoreRpc; -import com.google.firestore.v1beta1.BatchGetDocumentsRequest; -import com.google.firestore.v1beta1.ListCollectionIdsRequest; +import com.google.cloud.firestore.spi.v1.FirestoreRpc; +import com.google.firestore.v1.BatchGetDocumentsRequest; +import com.google.firestore.v1.ListCollectionIdsRequest; import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/LocalFirestoreHelper.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/LocalFirestoreHelper.java index fe740c7cc476..718064bc5feb 100644 --- a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/LocalFirestoreHelper.java +++ b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/LocalFirestoreHelper.java @@ -24,30 +24,30 @@ import com.google.cloud.Timestamp; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import com.google.firestore.v1beta1.ArrayValue; -import com.google.firestore.v1beta1.BatchGetDocumentsRequest; -import com.google.firestore.v1beta1.BatchGetDocumentsResponse; -import com.google.firestore.v1beta1.BeginTransactionRequest; -import com.google.firestore.v1beta1.BeginTransactionResponse; -import com.google.firestore.v1beta1.CommitRequest; -import com.google.firestore.v1beta1.CommitResponse; -import com.google.firestore.v1beta1.Cursor; -import com.google.firestore.v1beta1.DatabaseRootName; -import com.google.firestore.v1beta1.Document; -import com.google.firestore.v1beta1.DocumentMask; -import com.google.firestore.v1beta1.DocumentTransform; -import com.google.firestore.v1beta1.DocumentTransform.FieldTransform; -import com.google.firestore.v1beta1.MapValue; -import com.google.firestore.v1beta1.Precondition; -import com.google.firestore.v1beta1.RollbackRequest; -import com.google.firestore.v1beta1.RunQueryRequest; -import com.google.firestore.v1beta1.RunQueryResponse; -import com.google.firestore.v1beta1.StructuredQuery; -import com.google.firestore.v1beta1.StructuredQuery.CompositeFilter; -import com.google.firestore.v1beta1.StructuredQuery.FieldFilter; -import com.google.firestore.v1beta1.StructuredQuery.UnaryFilter; -import com.google.firestore.v1beta1.Value; -import com.google.firestore.v1beta1.Write; +import com.google.firestore.v1.ArrayValue; +import com.google.firestore.v1.BatchGetDocumentsRequest; +import com.google.firestore.v1.BatchGetDocumentsResponse; +import com.google.firestore.v1.BeginTransactionRequest; +import com.google.firestore.v1.BeginTransactionResponse; +import com.google.firestore.v1.CommitRequest; +import com.google.firestore.v1.CommitResponse; +import com.google.firestore.v1.Cursor; +import com.google.firestore.v1.DatabaseRootName; +import com.google.firestore.v1.Document; +import com.google.firestore.v1.DocumentMask; +import com.google.firestore.v1.DocumentTransform; +import com.google.firestore.v1.DocumentTransform.FieldTransform; +import com.google.firestore.v1.MapValue; +import com.google.firestore.v1.Precondition; +import com.google.firestore.v1.RollbackRequest; +import com.google.firestore.v1.RunQueryRequest; +import com.google.firestore.v1.RunQueryResponse; +import com.google.firestore.v1.StructuredQuery; +import com.google.firestore.v1.StructuredQuery.CompositeFilter; +import com.google.firestore.v1.StructuredQuery.FieldFilter; +import com.google.firestore.v1.StructuredQuery.UnaryFilter; +import com.google.firestore.v1.Value; +import com.google.firestore.v1.Write; import com.google.protobuf.ByteString; import com.google.protobuf.Empty; import com.google.protobuf.NullValue; diff --git a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/OrderTest.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/OrderTest.java index 716741cf80a9..7a43f331a48c 100644 --- a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/OrderTest.java +++ b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/OrderTest.java @@ -18,9 +18,9 @@ import static org.junit.Assert.assertEquals; -import com.google.firestore.v1beta1.ArrayValue; -import com.google.firestore.v1beta1.MapValue; -import com.google.firestore.v1beta1.Value; +import com.google.firestore.v1.ArrayValue; +import com.google.firestore.v1.MapValue; +import com.google.firestore.v1.Value; import com.google.protobuf.ByteString; import com.google.protobuf.NullValue; import com.google.protobuf.Timestamp; diff --git a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/QueryTest.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/QueryTest.java index 564c1b335de3..770864f6ee31 100644 --- a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/QueryTest.java +++ b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/QueryTest.java @@ -36,12 +36,12 @@ import com.google.api.gax.rpc.ApiStreamObserver; import com.google.api.gax.rpc.ServerStreamingCallable; import com.google.cloud.Timestamp; -import com.google.cloud.firestore.spi.v1beta1.FirestoreRpc; -import com.google.firestore.v1beta1.RunQueryRequest; -import com.google.firestore.v1beta1.StructuredQuery; -import com.google.firestore.v1beta1.StructuredQuery.Direction; -import com.google.firestore.v1beta1.StructuredQuery.FieldFilter.Operator; -import com.google.firestore.v1beta1.Value; +import com.google.cloud.firestore.spi.v1.FirestoreRpc; +import com.google.firestore.v1.RunQueryRequest; +import com.google.firestore.v1.StructuredQuery; +import com.google.firestore.v1.StructuredQuery.Direction; +import com.google.firestore.v1.StructuredQuery.FieldFilter.Operator; +import com.google.firestore.v1.Value; import java.util.Arrays; import java.util.Iterator; import java.util.concurrent.Semaphore; diff --git a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/TransactionTest.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/TransactionTest.java index 528309195c9d..0a227af0bbbf 100644 --- a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/TransactionTest.java +++ b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/TransactionTest.java @@ -45,10 +45,10 @@ import com.google.api.gax.rpc.ServerStreamingCallable; import com.google.api.gax.rpc.UnaryCallable; import com.google.cloud.Timestamp; -import com.google.cloud.firestore.spi.v1beta1.FirestoreRpc; -import com.google.firestore.v1beta1.BatchGetDocumentsRequest; -import com.google.firestore.v1beta1.DocumentMask; -import com.google.firestore.v1beta1.Write; +import com.google.cloud.firestore.spi.v1.FirestoreRpc; +import com.google.firestore.v1.BatchGetDocumentsRequest; +import com.google.firestore.v1.DocumentMask; +import com.google.firestore.v1.Write; import com.google.protobuf.ByteString; import com.google.protobuf.Message; import java.util.ArrayList; @@ -593,8 +593,8 @@ public String updateCallback(Transaction transaction) { List writes = new ArrayList<>(); writes.add(delete()); - com.google.firestore.v1beta1.Precondition.Builder precondition = - com.google.firestore.v1beta1.Precondition.newBuilder(); + com.google.firestore.v1.Precondition.Builder precondition = + com.google.firestore.v1.Precondition.newBuilder(); precondition.getUpdateTimeBuilder().setSeconds(1).setNanos(2); writes.add(delete(precondition.build())); diff --git a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/WatchTest.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/WatchTest.java index 7d450e397f7c..2b71c28b05d4 100644 --- a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/WatchTest.java +++ b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/WatchTest.java @@ -36,17 +36,17 @@ import com.google.api.gax.rpc.BidiStreamingCallable; import com.google.cloud.firestore.Query.Direction; import com.google.cloud.firestore.WatchTest.SnapshotDocument.ChangeType; -import com.google.cloud.firestore.spi.v1beta1.FirestoreRpc; -import com.google.firestore.v1beta1.Document; -import com.google.firestore.v1beta1.DocumentChange; -import com.google.firestore.v1beta1.DocumentDelete; -import com.google.firestore.v1beta1.DocumentRemove; -import com.google.firestore.v1beta1.ExistenceFilter; -import com.google.firestore.v1beta1.ListenRequest; -import com.google.firestore.v1beta1.ListenResponse; -import com.google.firestore.v1beta1.TargetChange; -import com.google.firestore.v1beta1.TargetChange.TargetChangeType; -import com.google.firestore.v1beta1.Value; +import com.google.cloud.firestore.spi.v1.FirestoreRpc; +import com.google.firestore.v1.Document; +import com.google.firestore.v1.DocumentChange; +import com.google.firestore.v1.DocumentDelete; +import com.google.firestore.v1.DocumentRemove; +import com.google.firestore.v1.ExistenceFilter; +import com.google.firestore.v1.ListenRequest; +import com.google.firestore.v1.ListenResponse; +import com.google.firestore.v1.TargetChange; +import com.google.firestore.v1.TargetChange.TargetChangeType; +import com.google.firestore.v1.Value; import com.google.protobuf.ByteString; import com.google.protobuf.Timestamp; import com.google.rpc.Status; diff --git a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/WriteBatchTest.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/WriteBatchTest.java index f29d87ca0948..7ac71a5cf137 100644 --- a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/WriteBatchTest.java +++ b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/WriteBatchTest.java @@ -28,10 +28,10 @@ import com.google.api.gax.rpc.UnaryCallable; import com.google.cloud.Timestamp; -import com.google.cloud.firestore.spi.v1beta1.FirestoreRpc; -import com.google.firestore.v1beta1.CommitRequest; -import com.google.firestore.v1beta1.CommitResponse; -import com.google.firestore.v1beta1.Write; +import com.google.cloud.firestore.spi.v1.FirestoreRpc; +import com.google.firestore.v1.CommitRequest; +import com.google.firestore.v1.CommitResponse; +import com.google.firestore.v1.Write; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; @@ -73,14 +73,14 @@ public void updateDocument() throws Exception { .sendRequest( commitCapture.capture(), Matchers.>any()); - List preconditions = + List preconditions = Arrays.asList( - com.google.firestore.v1beta1.Precondition.newBuilder().setExists(true).build(), - com.google.firestore.v1beta1.Precondition.newBuilder().setExists(true).build(), - com.google.firestore.v1beta1.Precondition.newBuilder() + com.google.firestore.v1.Precondition.newBuilder().setExists(true).build(), + com.google.firestore.v1.Precondition.newBuilder().setExists(true).build(), + com.google.firestore.v1.Precondition.newBuilder() .setUpdateTime(com.google.protobuf.Timestamp.getDefaultInstance()) .build(), - com.google.firestore.v1beta1.Precondition.newBuilder() + com.google.firestore.v1.Precondition.newBuilder() .setUpdateTime(com.google.protobuf.Timestamp.getDefaultInstance()) .build()); @@ -183,8 +183,8 @@ public void deleteDocument() throws Exception { writes.add(delete()); batch.delete(documentReference, Precondition.updatedAt(Timestamp.ofTimeSecondsAndNanos(1, 2))); - com.google.firestore.v1beta1.Precondition.Builder precondition = - com.google.firestore.v1beta1.Precondition.newBuilder(); + com.google.firestore.v1.Precondition.Builder precondition = + com.google.firestore.v1.Precondition.newBuilder(); precondition.getUpdateTimeBuilder().setSeconds(1).setNanos(2); writes.add(delete(precondition.build())); diff --git a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/conformance/TestDefinition.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/conformance/TestDefinition.java index 7f412d9d60ce..936437fd7fd1 100644 --- a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/conformance/TestDefinition.java +++ b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/conformance/TestDefinition.java @@ -3267,7 +3267,7 @@ public interface GetTestOrBuilder * The request that the call should send to the Firestore service. * * - * .google.firestore.v1beta1.GetDocumentRequest request = 2; + * .google.firestore.v1.GetDocumentRequest request = 2; */ boolean hasRequest(); /** @@ -3277,9 +3277,9 @@ public interface GetTestOrBuilder * The request that the call should send to the Firestore service. * * - * .google.firestore.v1beta1.GetDocumentRequest request = 2; + * .google.firestore.v1.GetDocumentRequest request = 2; */ - com.google.firestore.v1beta1.GetDocumentRequest getRequest(); + com.google.firestore.v1.GetDocumentRequest getRequest(); /** * * @@ -3287,9 +3287,9 @@ public interface GetTestOrBuilder * The request that the call should send to the Firestore service. * * - * .google.firestore.v1beta1.GetDocumentRequest request = 2; + * .google.firestore.v1.GetDocumentRequest request = 2; */ - com.google.firestore.v1beta1.GetDocumentRequestOrBuilder getRequestOrBuilder(); + com.google.firestore.v1.GetDocumentRequestOrBuilder getRequestOrBuilder(); } /** * @@ -3354,14 +3354,13 @@ private GetTest( } case 18: { - com.google.firestore.v1beta1.GetDocumentRequest.Builder subBuilder = null; + com.google.firestore.v1.GetDocumentRequest.Builder subBuilder = null; if (request_ != null) { subBuilder = request_.toBuilder(); } request_ = input.readMessage( - com.google.firestore.v1beta1.GetDocumentRequest.parser(), - extensionRegistry); + com.google.firestore.v1.GetDocumentRequest.parser(), extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(request_); request_ = subBuilder.buildPartial(); @@ -3438,7 +3437,7 @@ public com.google.protobuf.ByteString getDocRefPathBytes() { } public static final int REQUEST_FIELD_NUMBER = 2; - private com.google.firestore.v1beta1.GetDocumentRequest request_; + private com.google.firestore.v1.GetDocumentRequest request_; /** * * @@ -3446,7 +3445,7 @@ public com.google.protobuf.ByteString getDocRefPathBytes() { * The request that the call should send to the Firestore service. * * - * .google.firestore.v1beta1.GetDocumentRequest request = 2; + * .google.firestore.v1.GetDocumentRequest request = 2; */ public boolean hasRequest() { return request_ != null; @@ -3458,11 +3457,11 @@ public boolean hasRequest() { * The request that the call should send to the Firestore service. * * - * .google.firestore.v1beta1.GetDocumentRequest request = 2; + * .google.firestore.v1.GetDocumentRequest request = 2; */ - public com.google.firestore.v1beta1.GetDocumentRequest getRequest() { + public com.google.firestore.v1.GetDocumentRequest getRequest() { return request_ == null - ? com.google.firestore.v1beta1.GetDocumentRequest.getDefaultInstance() + ? com.google.firestore.v1.GetDocumentRequest.getDefaultInstance() : request_; } /** @@ -3472,9 +3471,9 @@ public com.google.firestore.v1beta1.GetDocumentRequest getRequest() { * The request that the call should send to the Firestore service. * * - * .google.firestore.v1beta1.GetDocumentRequest request = 2; + * .google.firestore.v1.GetDocumentRequest request = 2; */ - public com.google.firestore.v1beta1.GetDocumentRequestOrBuilder getRequestOrBuilder() { + public com.google.firestore.v1.GetDocumentRequestOrBuilder getRequestOrBuilder() { return getRequest(); } @@ -3907,11 +3906,11 @@ public Builder setDocRefPathBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.firestore.v1beta1.GetDocumentRequest request_ = null; + private com.google.firestore.v1.GetDocumentRequest request_ = null; private com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.GetDocumentRequest, - com.google.firestore.v1beta1.GetDocumentRequest.Builder, - com.google.firestore.v1beta1.GetDocumentRequestOrBuilder> + com.google.firestore.v1.GetDocumentRequest, + com.google.firestore.v1.GetDocumentRequest.Builder, + com.google.firestore.v1.GetDocumentRequestOrBuilder> requestBuilder_; /** * @@ -3920,7 +3919,7 @@ public Builder setDocRefPathBytes(com.google.protobuf.ByteString value) { * The request that the call should send to the Firestore service. * * - * .google.firestore.v1beta1.GetDocumentRequest request = 2; + * .google.firestore.v1.GetDocumentRequest request = 2; */ public boolean hasRequest() { return requestBuilder_ != null || request_ != null; @@ -3932,12 +3931,12 @@ public boolean hasRequest() { * The request that the call should send to the Firestore service. * * - * .google.firestore.v1beta1.GetDocumentRequest request = 2; + * .google.firestore.v1.GetDocumentRequest request = 2; */ - public com.google.firestore.v1beta1.GetDocumentRequest getRequest() { + public com.google.firestore.v1.GetDocumentRequest getRequest() { if (requestBuilder_ == null) { return request_ == null - ? com.google.firestore.v1beta1.GetDocumentRequest.getDefaultInstance() + ? com.google.firestore.v1.GetDocumentRequest.getDefaultInstance() : request_; } else { return requestBuilder_.getMessage(); @@ -3950,9 +3949,9 @@ public com.google.firestore.v1beta1.GetDocumentRequest getRequest() { * The request that the call should send to the Firestore service. * * - * .google.firestore.v1beta1.GetDocumentRequest request = 2; + * .google.firestore.v1.GetDocumentRequest request = 2; */ - public Builder setRequest(com.google.firestore.v1beta1.GetDocumentRequest value) { + public Builder setRequest(com.google.firestore.v1.GetDocumentRequest value) { if (requestBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -3972,10 +3971,10 @@ public Builder setRequest(com.google.firestore.v1beta1.GetDocumentRequest value) * The request that the call should send to the Firestore service. * * - * .google.firestore.v1beta1.GetDocumentRequest request = 2; + * .google.firestore.v1.GetDocumentRequest request = 2; */ public Builder setRequest( - com.google.firestore.v1beta1.GetDocumentRequest.Builder builderForValue) { + com.google.firestore.v1.GetDocumentRequest.Builder builderForValue) { if (requestBuilder_ == null) { request_ = builderForValue.build(); onChanged(); @@ -3992,13 +3991,13 @@ public Builder setRequest( * The request that the call should send to the Firestore service. * * - * .google.firestore.v1beta1.GetDocumentRequest request = 2; + * .google.firestore.v1.GetDocumentRequest request = 2; */ - public Builder mergeRequest(com.google.firestore.v1beta1.GetDocumentRequest value) { + public Builder mergeRequest(com.google.firestore.v1.GetDocumentRequest value) { if (requestBuilder_ == null) { if (request_ != null) { request_ = - com.google.firestore.v1beta1.GetDocumentRequest.newBuilder(request_) + com.google.firestore.v1.GetDocumentRequest.newBuilder(request_) .mergeFrom(value) .buildPartial(); } else { @@ -4018,7 +4017,7 @@ public Builder mergeRequest(com.google.firestore.v1beta1.GetDocumentRequest valu * The request that the call should send to the Firestore service. * * - * .google.firestore.v1beta1.GetDocumentRequest request = 2; + * .google.firestore.v1.GetDocumentRequest request = 2; */ public Builder clearRequest() { if (requestBuilder_ == null) { @@ -4038,9 +4037,9 @@ public Builder clearRequest() { * The request that the call should send to the Firestore service. * * - * .google.firestore.v1beta1.GetDocumentRequest request = 2; + * .google.firestore.v1.GetDocumentRequest request = 2; */ - public com.google.firestore.v1beta1.GetDocumentRequest.Builder getRequestBuilder() { + public com.google.firestore.v1.GetDocumentRequest.Builder getRequestBuilder() { onChanged(); return getRequestFieldBuilder().getBuilder(); @@ -4052,14 +4051,14 @@ public com.google.firestore.v1beta1.GetDocumentRequest.Builder getRequestBuilder * The request that the call should send to the Firestore service. * * - * .google.firestore.v1beta1.GetDocumentRequest request = 2; + * .google.firestore.v1.GetDocumentRequest request = 2; */ - public com.google.firestore.v1beta1.GetDocumentRequestOrBuilder getRequestOrBuilder() { + public com.google.firestore.v1.GetDocumentRequestOrBuilder getRequestOrBuilder() { if (requestBuilder_ != null) { return requestBuilder_.getMessageOrBuilder(); } else { return request_ == null - ? com.google.firestore.v1beta1.GetDocumentRequest.getDefaultInstance() + ? com.google.firestore.v1.GetDocumentRequest.getDefaultInstance() : request_; } } @@ -4070,19 +4069,19 @@ public com.google.firestore.v1beta1.GetDocumentRequestOrBuilder getRequestOrBuil * The request that the call should send to the Firestore service. * * - * .google.firestore.v1beta1.GetDocumentRequest request = 2; + * .google.firestore.v1.GetDocumentRequest request = 2; */ private com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.GetDocumentRequest, - com.google.firestore.v1beta1.GetDocumentRequest.Builder, - com.google.firestore.v1beta1.GetDocumentRequestOrBuilder> + com.google.firestore.v1.GetDocumentRequest, + com.google.firestore.v1.GetDocumentRequest.Builder, + com.google.firestore.v1.GetDocumentRequestOrBuilder> getRequestFieldBuilder() { if (requestBuilder_ == null) { requestBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.GetDocumentRequest, - com.google.firestore.v1beta1.GetDocumentRequest.Builder, - com.google.firestore.v1beta1.GetDocumentRequestOrBuilder>( + com.google.firestore.v1.GetDocumentRequest, + com.google.firestore.v1.GetDocumentRequest.Builder, + com.google.firestore.v1.GetDocumentRequestOrBuilder>( getRequest(), getParentForChildren(), isClean()); request_ = null; } @@ -4198,7 +4197,7 @@ public interface CreateTestOrBuilder * The request that the call should generate. * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ boolean hasRequest(); /** @@ -4208,9 +4207,9 @@ public interface CreateTestOrBuilder * The request that the call should generate. * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ - com.google.firestore.v1beta1.CommitRequest getRequest(); + com.google.firestore.v1.CommitRequest getRequest(); /** * * @@ -4218,9 +4217,9 @@ public interface CreateTestOrBuilder * The request that the call should generate. * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ - com.google.firestore.v1beta1.CommitRequestOrBuilder getRequestOrBuilder(); + com.google.firestore.v1.CommitRequestOrBuilder getRequestOrBuilder(); /** * @@ -4306,13 +4305,13 @@ private CreateTest( } case 26: { - com.google.firestore.v1beta1.CommitRequest.Builder subBuilder = null; + com.google.firestore.v1.CommitRequest.Builder subBuilder = null; if (request_ != null) { subBuilder = request_.toBuilder(); } request_ = input.readMessage( - com.google.firestore.v1beta1.CommitRequest.parser(), extensionRegistry); + com.google.firestore.v1.CommitRequest.parser(), extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(request_); request_ = subBuilder.buildPartial(); @@ -4441,7 +4440,7 @@ public com.google.protobuf.ByteString getJsonDataBytes() { } public static final int REQUEST_FIELD_NUMBER = 3; - private com.google.firestore.v1beta1.CommitRequest request_; + private com.google.firestore.v1.CommitRequest request_; /** * * @@ -4449,7 +4448,7 @@ public com.google.protobuf.ByteString getJsonDataBytes() { * The request that the call should generate. * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ public boolean hasRequest() { return request_ != null; @@ -4461,11 +4460,11 @@ public boolean hasRequest() { * The request that the call should generate. * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ - public com.google.firestore.v1beta1.CommitRequest getRequest() { + public com.google.firestore.v1.CommitRequest getRequest() { return request_ == null - ? com.google.firestore.v1beta1.CommitRequest.getDefaultInstance() + ? com.google.firestore.v1.CommitRequest.getDefaultInstance() : request_; } /** @@ -4475,9 +4474,9 @@ public com.google.firestore.v1beta1.CommitRequest getRequest() { * The request that the call should generate. * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ - public com.google.firestore.v1beta1.CommitRequestOrBuilder getRequestOrBuilder() { + public com.google.firestore.v1.CommitRequestOrBuilder getRequestOrBuilder() { return getRequest(); } @@ -5065,11 +5064,11 @@ public Builder setJsonDataBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.firestore.v1beta1.CommitRequest request_ = null; + private com.google.firestore.v1.CommitRequest request_ = null; private com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.CommitRequest, - com.google.firestore.v1beta1.CommitRequest.Builder, - com.google.firestore.v1beta1.CommitRequestOrBuilder> + com.google.firestore.v1.CommitRequest, + com.google.firestore.v1.CommitRequest.Builder, + com.google.firestore.v1.CommitRequestOrBuilder> requestBuilder_; /** * @@ -5078,7 +5077,7 @@ public Builder setJsonDataBytes(com.google.protobuf.ByteString value) { * The request that the call should generate. * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ public boolean hasRequest() { return requestBuilder_ != null || request_ != null; @@ -5090,12 +5089,12 @@ public boolean hasRequest() { * The request that the call should generate. * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ - public com.google.firestore.v1beta1.CommitRequest getRequest() { + public com.google.firestore.v1.CommitRequest getRequest() { if (requestBuilder_ == null) { return request_ == null - ? com.google.firestore.v1beta1.CommitRequest.getDefaultInstance() + ? com.google.firestore.v1.CommitRequest.getDefaultInstance() : request_; } else { return requestBuilder_.getMessage(); @@ -5108,9 +5107,9 @@ public com.google.firestore.v1beta1.CommitRequest getRequest() { * The request that the call should generate. * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ - public Builder setRequest(com.google.firestore.v1beta1.CommitRequest value) { + public Builder setRequest(com.google.firestore.v1.CommitRequest value) { if (requestBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -5130,10 +5129,9 @@ public Builder setRequest(com.google.firestore.v1beta1.CommitRequest value) { * The request that the call should generate. * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ - public Builder setRequest( - com.google.firestore.v1beta1.CommitRequest.Builder builderForValue) { + public Builder setRequest(com.google.firestore.v1.CommitRequest.Builder builderForValue) { if (requestBuilder_ == null) { request_ = builderForValue.build(); onChanged(); @@ -5150,13 +5148,13 @@ public Builder setRequest( * The request that the call should generate. * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ - public Builder mergeRequest(com.google.firestore.v1beta1.CommitRequest value) { + public Builder mergeRequest(com.google.firestore.v1.CommitRequest value) { if (requestBuilder_ == null) { if (request_ != null) { request_ = - com.google.firestore.v1beta1.CommitRequest.newBuilder(request_) + com.google.firestore.v1.CommitRequest.newBuilder(request_) .mergeFrom(value) .buildPartial(); } else { @@ -5176,7 +5174,7 @@ public Builder mergeRequest(com.google.firestore.v1beta1.CommitRequest value) { * The request that the call should generate. * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ public Builder clearRequest() { if (requestBuilder_ == null) { @@ -5196,9 +5194,9 @@ public Builder clearRequest() { * The request that the call should generate. * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ - public com.google.firestore.v1beta1.CommitRequest.Builder getRequestBuilder() { + public com.google.firestore.v1.CommitRequest.Builder getRequestBuilder() { onChanged(); return getRequestFieldBuilder().getBuilder(); @@ -5210,14 +5208,14 @@ public com.google.firestore.v1beta1.CommitRequest.Builder getRequestBuilder() { * The request that the call should generate. * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ - public com.google.firestore.v1beta1.CommitRequestOrBuilder getRequestOrBuilder() { + public com.google.firestore.v1.CommitRequestOrBuilder getRequestOrBuilder() { if (requestBuilder_ != null) { return requestBuilder_.getMessageOrBuilder(); } else { return request_ == null - ? com.google.firestore.v1beta1.CommitRequest.getDefaultInstance() + ? com.google.firestore.v1.CommitRequest.getDefaultInstance() : request_; } } @@ -5228,19 +5226,19 @@ public com.google.firestore.v1beta1.CommitRequestOrBuilder getRequestOrBuilder() * The request that the call should generate. * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ private com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.CommitRequest, - com.google.firestore.v1beta1.CommitRequest.Builder, - com.google.firestore.v1beta1.CommitRequestOrBuilder> + com.google.firestore.v1.CommitRequest, + com.google.firestore.v1.CommitRequest.Builder, + com.google.firestore.v1.CommitRequestOrBuilder> getRequestFieldBuilder() { if (requestBuilder_ == null) { requestBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.CommitRequest, - com.google.firestore.v1beta1.CommitRequest.Builder, - com.google.firestore.v1beta1.CommitRequestOrBuilder>( + com.google.firestore.v1.CommitRequest, + com.google.firestore.v1.CommitRequest.Builder, + com.google.firestore.v1.CommitRequestOrBuilder>( getRequest(), getParentForChildren(), isClean()); request_ = null; } @@ -5430,7 +5428,7 @@ public interface SetTestOrBuilder * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ boolean hasRequest(); /** @@ -5440,9 +5438,9 @@ public interface SetTestOrBuilder * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ - com.google.firestore.v1beta1.CommitRequest getRequest(); + com.google.firestore.v1.CommitRequest getRequest(); /** * * @@ -5450,9 +5448,9 @@ public interface SetTestOrBuilder * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ - com.google.firestore.v1beta1.CommitRequestOrBuilder getRequestOrBuilder(); + com.google.firestore.v1.CommitRequestOrBuilder getRequestOrBuilder(); /** * @@ -5555,13 +5553,13 @@ private SetTest( } case 34: { - com.google.firestore.v1beta1.CommitRequest.Builder subBuilder = null; + com.google.firestore.v1.CommitRequest.Builder subBuilder = null; if (request_ != null) { subBuilder = request_.toBuilder(); } request_ = input.readMessage( - com.google.firestore.v1beta1.CommitRequest.parser(), extensionRegistry); + com.google.firestore.v1.CommitRequest.parser(), extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(request_); request_ = subBuilder.buildPartial(); @@ -5728,7 +5726,7 @@ public com.google.protobuf.ByteString getJsonDataBytes() { } public static final int REQUEST_FIELD_NUMBER = 4; - private com.google.firestore.v1beta1.CommitRequest request_; + private com.google.firestore.v1.CommitRequest request_; /** * * @@ -5736,7 +5734,7 @@ public com.google.protobuf.ByteString getJsonDataBytes() { * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ public boolean hasRequest() { return request_ != null; @@ -5748,11 +5746,11 @@ public boolean hasRequest() { * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ - public com.google.firestore.v1beta1.CommitRequest getRequest() { + public com.google.firestore.v1.CommitRequest getRequest() { return request_ == null - ? com.google.firestore.v1beta1.CommitRequest.getDefaultInstance() + ? com.google.firestore.v1.CommitRequest.getDefaultInstance() : request_; } /** @@ -5762,9 +5760,9 @@ public com.google.firestore.v1beta1.CommitRequest getRequest() { * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ - public com.google.firestore.v1beta1.CommitRequestOrBuilder getRequestOrBuilder() { + public com.google.firestore.v1.CommitRequestOrBuilder getRequestOrBuilder() { return getRequest(); } @@ -6551,11 +6549,11 @@ public Builder setJsonDataBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.firestore.v1beta1.CommitRequest request_ = null; + private com.google.firestore.v1.CommitRequest request_ = null; private com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.CommitRequest, - com.google.firestore.v1beta1.CommitRequest.Builder, - com.google.firestore.v1beta1.CommitRequestOrBuilder> + com.google.firestore.v1.CommitRequest, + com.google.firestore.v1.CommitRequest.Builder, + com.google.firestore.v1.CommitRequestOrBuilder> requestBuilder_; /** * @@ -6564,7 +6562,7 @@ public Builder setJsonDataBytes(com.google.protobuf.ByteString value) { * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ public boolean hasRequest() { return requestBuilder_ != null || request_ != null; @@ -6576,12 +6574,12 @@ public boolean hasRequest() { * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ - public com.google.firestore.v1beta1.CommitRequest getRequest() { + public com.google.firestore.v1.CommitRequest getRequest() { if (requestBuilder_ == null) { return request_ == null - ? com.google.firestore.v1beta1.CommitRequest.getDefaultInstance() + ? com.google.firestore.v1.CommitRequest.getDefaultInstance() : request_; } else { return requestBuilder_.getMessage(); @@ -6594,9 +6592,9 @@ public com.google.firestore.v1beta1.CommitRequest getRequest() { * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ - public Builder setRequest(com.google.firestore.v1beta1.CommitRequest value) { + public Builder setRequest(com.google.firestore.v1.CommitRequest value) { if (requestBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -6616,10 +6614,9 @@ public Builder setRequest(com.google.firestore.v1beta1.CommitRequest value) { * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ - public Builder setRequest( - com.google.firestore.v1beta1.CommitRequest.Builder builderForValue) { + public Builder setRequest(com.google.firestore.v1.CommitRequest.Builder builderForValue) { if (requestBuilder_ == null) { request_ = builderForValue.build(); onChanged(); @@ -6636,13 +6633,13 @@ public Builder setRequest( * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ - public Builder mergeRequest(com.google.firestore.v1beta1.CommitRequest value) { + public Builder mergeRequest(com.google.firestore.v1.CommitRequest value) { if (requestBuilder_ == null) { if (request_ != null) { request_ = - com.google.firestore.v1beta1.CommitRequest.newBuilder(request_) + com.google.firestore.v1.CommitRequest.newBuilder(request_) .mergeFrom(value) .buildPartial(); } else { @@ -6662,7 +6659,7 @@ public Builder mergeRequest(com.google.firestore.v1beta1.CommitRequest value) { * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ public Builder clearRequest() { if (requestBuilder_ == null) { @@ -6682,9 +6679,9 @@ public Builder clearRequest() { * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ - public com.google.firestore.v1beta1.CommitRequest.Builder getRequestBuilder() { + public com.google.firestore.v1.CommitRequest.Builder getRequestBuilder() { onChanged(); return getRequestFieldBuilder().getBuilder(); @@ -6696,14 +6693,14 @@ public com.google.firestore.v1beta1.CommitRequest.Builder getRequestBuilder() { * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ - public com.google.firestore.v1beta1.CommitRequestOrBuilder getRequestOrBuilder() { + public com.google.firestore.v1.CommitRequestOrBuilder getRequestOrBuilder() { if (requestBuilder_ != null) { return requestBuilder_.getMessageOrBuilder(); } else { return request_ == null - ? com.google.firestore.v1beta1.CommitRequest.getDefaultInstance() + ? com.google.firestore.v1.CommitRequest.getDefaultInstance() : request_; } } @@ -6714,19 +6711,19 @@ public com.google.firestore.v1beta1.CommitRequestOrBuilder getRequestOrBuilder() * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ private com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.CommitRequest, - com.google.firestore.v1beta1.CommitRequest.Builder, - com.google.firestore.v1beta1.CommitRequestOrBuilder> + com.google.firestore.v1.CommitRequest, + com.google.firestore.v1.CommitRequest.Builder, + com.google.firestore.v1.CommitRequestOrBuilder> getRequestFieldBuilder() { if (requestBuilder_ == null) { requestBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.CommitRequest, - com.google.firestore.v1beta1.CommitRequest.Builder, - com.google.firestore.v1beta1.CommitRequestOrBuilder>( + com.google.firestore.v1.CommitRequest, + com.google.firestore.v1.CommitRequest.Builder, + com.google.firestore.v1.CommitRequestOrBuilder>( getRequest(), getParentForChildren(), isClean()); request_ = null; } @@ -6861,7 +6858,7 @@ public interface UpdateTestOrBuilder * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ boolean hasPrecondition(); /** @@ -6871,9 +6868,9 @@ public interface UpdateTestOrBuilder * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ - com.google.firestore.v1beta1.Precondition getPrecondition(); + com.google.firestore.v1.Precondition getPrecondition(); /** * * @@ -6881,9 +6878,9 @@ public interface UpdateTestOrBuilder * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ - com.google.firestore.v1beta1.PreconditionOrBuilder getPreconditionOrBuilder(); + com.google.firestore.v1.PreconditionOrBuilder getPreconditionOrBuilder(); /** * @@ -6913,7 +6910,7 @@ public interface UpdateTestOrBuilder * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ boolean hasRequest(); /** @@ -6923,9 +6920,9 @@ public interface UpdateTestOrBuilder * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ - com.google.firestore.v1beta1.CommitRequest getRequest(); + com.google.firestore.v1.CommitRequest getRequest(); /** * * @@ -6933,9 +6930,9 @@ public interface UpdateTestOrBuilder * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ - com.google.firestore.v1beta1.CommitRequestOrBuilder getRequestOrBuilder(); + com.google.firestore.v1.CommitRequestOrBuilder getRequestOrBuilder(); /** * @@ -7014,13 +7011,13 @@ private UpdateTest( } case 18: { - com.google.firestore.v1beta1.Precondition.Builder subBuilder = null; + com.google.firestore.v1.Precondition.Builder subBuilder = null; if (precondition_ != null) { subBuilder = precondition_.toBuilder(); } precondition_ = input.readMessage( - com.google.firestore.v1beta1.Precondition.parser(), extensionRegistry); + com.google.firestore.v1.Precondition.parser(), extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(precondition_); precondition_ = subBuilder.buildPartial(); @@ -7037,13 +7034,13 @@ private UpdateTest( } case 34: { - com.google.firestore.v1beta1.CommitRequest.Builder subBuilder = null; + com.google.firestore.v1.CommitRequest.Builder subBuilder = null; if (request_ != null) { subBuilder = request_.toBuilder(); } request_ = input.readMessage( - com.google.firestore.v1beta1.CommitRequest.parser(), extensionRegistry); + com.google.firestore.v1.CommitRequest.parser(), extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(request_); request_ = subBuilder.buildPartial(); @@ -7125,7 +7122,7 @@ public com.google.protobuf.ByteString getDocRefPathBytes() { } public static final int PRECONDITION_FIELD_NUMBER = 2; - private com.google.firestore.v1beta1.Precondition precondition_; + private com.google.firestore.v1.Precondition precondition_; /** * * @@ -7133,7 +7130,7 @@ public com.google.protobuf.ByteString getDocRefPathBytes() { * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ public boolean hasPrecondition() { return precondition_ != null; @@ -7145,11 +7142,11 @@ public boolean hasPrecondition() { * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ - public com.google.firestore.v1beta1.Precondition getPrecondition() { + public com.google.firestore.v1.Precondition getPrecondition() { return precondition_ == null - ? com.google.firestore.v1beta1.Precondition.getDefaultInstance() + ? com.google.firestore.v1.Precondition.getDefaultInstance() : precondition_; } /** @@ -7159,9 +7156,9 @@ public com.google.firestore.v1beta1.Precondition getPrecondition() { * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ - public com.google.firestore.v1beta1.PreconditionOrBuilder getPreconditionOrBuilder() { + public com.google.firestore.v1.PreconditionOrBuilder getPreconditionOrBuilder() { return getPrecondition(); } @@ -7209,7 +7206,7 @@ public com.google.protobuf.ByteString getJsonDataBytes() { } public static final int REQUEST_FIELD_NUMBER = 4; - private com.google.firestore.v1beta1.CommitRequest request_; + private com.google.firestore.v1.CommitRequest request_; /** * * @@ -7217,7 +7214,7 @@ public com.google.protobuf.ByteString getJsonDataBytes() { * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ public boolean hasRequest() { return request_ != null; @@ -7229,11 +7226,11 @@ public boolean hasRequest() { * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ - public com.google.firestore.v1beta1.CommitRequest getRequest() { + public com.google.firestore.v1.CommitRequest getRequest() { return request_ == null - ? com.google.firestore.v1beta1.CommitRequest.getDefaultInstance() + ? com.google.firestore.v1.CommitRequest.getDefaultInstance() : request_; } /** @@ -7243,9 +7240,9 @@ public com.google.firestore.v1beta1.CommitRequest getRequest() { * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ - public com.google.firestore.v1beta1.CommitRequestOrBuilder getRequestOrBuilder() { + public com.google.firestore.v1.CommitRequestOrBuilder getRequestOrBuilder() { return getRequest(); } @@ -7757,11 +7754,11 @@ public Builder setDocRefPathBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.firestore.v1beta1.Precondition precondition_ = null; + private com.google.firestore.v1.Precondition precondition_ = null; private com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.Precondition, - com.google.firestore.v1beta1.Precondition.Builder, - com.google.firestore.v1beta1.PreconditionOrBuilder> + com.google.firestore.v1.Precondition, + com.google.firestore.v1.Precondition.Builder, + com.google.firestore.v1.PreconditionOrBuilder> preconditionBuilder_; /** * @@ -7770,7 +7767,7 @@ public Builder setDocRefPathBytes(com.google.protobuf.ByteString value) { * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ public boolean hasPrecondition() { return preconditionBuilder_ != null || precondition_ != null; @@ -7782,12 +7779,12 @@ public boolean hasPrecondition() { * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ - public com.google.firestore.v1beta1.Precondition getPrecondition() { + public com.google.firestore.v1.Precondition getPrecondition() { if (preconditionBuilder_ == null) { return precondition_ == null - ? com.google.firestore.v1beta1.Precondition.getDefaultInstance() + ? com.google.firestore.v1.Precondition.getDefaultInstance() : precondition_; } else { return preconditionBuilder_.getMessage(); @@ -7800,9 +7797,9 @@ public com.google.firestore.v1beta1.Precondition getPrecondition() { * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ - public Builder setPrecondition(com.google.firestore.v1beta1.Precondition value) { + public Builder setPrecondition(com.google.firestore.v1.Precondition value) { if (preconditionBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -7822,10 +7819,9 @@ public Builder setPrecondition(com.google.firestore.v1beta1.Precondition value) * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ - public Builder setPrecondition( - com.google.firestore.v1beta1.Precondition.Builder builderForValue) { + public Builder setPrecondition(com.google.firestore.v1.Precondition.Builder builderForValue) { if (preconditionBuilder_ == null) { precondition_ = builderForValue.build(); onChanged(); @@ -7842,13 +7838,13 @@ public Builder setPrecondition( * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ - public Builder mergePrecondition(com.google.firestore.v1beta1.Precondition value) { + public Builder mergePrecondition(com.google.firestore.v1.Precondition value) { if (preconditionBuilder_ == null) { if (precondition_ != null) { precondition_ = - com.google.firestore.v1beta1.Precondition.newBuilder(precondition_) + com.google.firestore.v1.Precondition.newBuilder(precondition_) .mergeFrom(value) .buildPartial(); } else { @@ -7868,7 +7864,7 @@ public Builder mergePrecondition(com.google.firestore.v1beta1.Precondition value * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ public Builder clearPrecondition() { if (preconditionBuilder_ == null) { @@ -7888,9 +7884,9 @@ public Builder clearPrecondition() { * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ - public com.google.firestore.v1beta1.Precondition.Builder getPreconditionBuilder() { + public com.google.firestore.v1.Precondition.Builder getPreconditionBuilder() { onChanged(); return getPreconditionFieldBuilder().getBuilder(); @@ -7902,14 +7898,14 @@ public com.google.firestore.v1beta1.Precondition.Builder getPreconditionBuilder( * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ - public com.google.firestore.v1beta1.PreconditionOrBuilder getPreconditionOrBuilder() { + public com.google.firestore.v1.PreconditionOrBuilder getPreconditionOrBuilder() { if (preconditionBuilder_ != null) { return preconditionBuilder_.getMessageOrBuilder(); } else { return precondition_ == null - ? com.google.firestore.v1beta1.Precondition.getDefaultInstance() + ? com.google.firestore.v1.Precondition.getDefaultInstance() : precondition_; } } @@ -7920,19 +7916,19 @@ public com.google.firestore.v1beta1.PreconditionOrBuilder getPreconditionOrBuild * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ private com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.Precondition, - com.google.firestore.v1beta1.Precondition.Builder, - com.google.firestore.v1beta1.PreconditionOrBuilder> + com.google.firestore.v1.Precondition, + com.google.firestore.v1.Precondition.Builder, + com.google.firestore.v1.PreconditionOrBuilder> getPreconditionFieldBuilder() { if (preconditionBuilder_ == null) { preconditionBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.Precondition, - com.google.firestore.v1beta1.Precondition.Builder, - com.google.firestore.v1beta1.PreconditionOrBuilder>( + com.google.firestore.v1.Precondition, + com.google.firestore.v1.Precondition.Builder, + com.google.firestore.v1.PreconditionOrBuilder>( getPrecondition(), getParentForChildren(), isClean()); precondition_ = null; } @@ -8033,11 +8029,11 @@ public Builder setJsonDataBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.firestore.v1beta1.CommitRequest request_ = null; + private com.google.firestore.v1.CommitRequest request_ = null; private com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.CommitRequest, - com.google.firestore.v1beta1.CommitRequest.Builder, - com.google.firestore.v1beta1.CommitRequestOrBuilder> + com.google.firestore.v1.CommitRequest, + com.google.firestore.v1.CommitRequest.Builder, + com.google.firestore.v1.CommitRequestOrBuilder> requestBuilder_; /** * @@ -8046,7 +8042,7 @@ public Builder setJsonDataBytes(com.google.protobuf.ByteString value) { * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ public boolean hasRequest() { return requestBuilder_ != null || request_ != null; @@ -8058,12 +8054,12 @@ public boolean hasRequest() { * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ - public com.google.firestore.v1beta1.CommitRequest getRequest() { + public com.google.firestore.v1.CommitRequest getRequest() { if (requestBuilder_ == null) { return request_ == null - ? com.google.firestore.v1beta1.CommitRequest.getDefaultInstance() + ? com.google.firestore.v1.CommitRequest.getDefaultInstance() : request_; } else { return requestBuilder_.getMessage(); @@ -8076,9 +8072,9 @@ public com.google.firestore.v1beta1.CommitRequest getRequest() { * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ - public Builder setRequest(com.google.firestore.v1beta1.CommitRequest value) { + public Builder setRequest(com.google.firestore.v1.CommitRequest value) { if (requestBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -8098,10 +8094,9 @@ public Builder setRequest(com.google.firestore.v1beta1.CommitRequest value) { * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ - public Builder setRequest( - com.google.firestore.v1beta1.CommitRequest.Builder builderForValue) { + public Builder setRequest(com.google.firestore.v1.CommitRequest.Builder builderForValue) { if (requestBuilder_ == null) { request_ = builderForValue.build(); onChanged(); @@ -8118,13 +8113,13 @@ public Builder setRequest( * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ - public Builder mergeRequest(com.google.firestore.v1beta1.CommitRequest value) { + public Builder mergeRequest(com.google.firestore.v1.CommitRequest value) { if (requestBuilder_ == null) { if (request_ != null) { request_ = - com.google.firestore.v1beta1.CommitRequest.newBuilder(request_) + com.google.firestore.v1.CommitRequest.newBuilder(request_) .mergeFrom(value) .buildPartial(); } else { @@ -8144,7 +8139,7 @@ public Builder mergeRequest(com.google.firestore.v1beta1.CommitRequest value) { * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ public Builder clearRequest() { if (requestBuilder_ == null) { @@ -8164,9 +8159,9 @@ public Builder clearRequest() { * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ - public com.google.firestore.v1beta1.CommitRequest.Builder getRequestBuilder() { + public com.google.firestore.v1.CommitRequest.Builder getRequestBuilder() { onChanged(); return getRequestFieldBuilder().getBuilder(); @@ -8178,14 +8173,14 @@ public com.google.firestore.v1beta1.CommitRequest.Builder getRequestBuilder() { * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ - public com.google.firestore.v1beta1.CommitRequestOrBuilder getRequestOrBuilder() { + public com.google.firestore.v1.CommitRequestOrBuilder getRequestOrBuilder() { if (requestBuilder_ != null) { return requestBuilder_.getMessageOrBuilder(); } else { return request_ == null - ? com.google.firestore.v1beta1.CommitRequest.getDefaultInstance() + ? com.google.firestore.v1.CommitRequest.getDefaultInstance() : request_; } } @@ -8196,19 +8191,19 @@ public com.google.firestore.v1beta1.CommitRequestOrBuilder getRequestOrBuilder() * expected request * * - * .google.firestore.v1beta1.CommitRequest request = 4; + * .google.firestore.v1.CommitRequest request = 4; */ private com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.CommitRequest, - com.google.firestore.v1beta1.CommitRequest.Builder, - com.google.firestore.v1beta1.CommitRequestOrBuilder> + com.google.firestore.v1.CommitRequest, + com.google.firestore.v1.CommitRequest.Builder, + com.google.firestore.v1.CommitRequestOrBuilder> getRequestFieldBuilder() { if (requestBuilder_ == null) { requestBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.CommitRequest, - com.google.firestore.v1beta1.CommitRequest.Builder, - com.google.firestore.v1beta1.CommitRequestOrBuilder>( + com.google.firestore.v1.CommitRequest, + com.google.firestore.v1.CommitRequest.Builder, + com.google.firestore.v1.CommitRequestOrBuilder>( getRequest(), getParentForChildren(), isClean()); request_ = null; } @@ -8343,7 +8338,7 @@ public interface UpdatePathsTestOrBuilder * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ boolean hasPrecondition(); /** @@ -8353,9 +8348,9 @@ public interface UpdatePathsTestOrBuilder * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ - com.google.firestore.v1beta1.Precondition getPrecondition(); + com.google.firestore.v1.Precondition getPrecondition(); /** * * @@ -8363,9 +8358,9 @@ public interface UpdatePathsTestOrBuilder * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ - com.google.firestore.v1beta1.PreconditionOrBuilder getPreconditionOrBuilder(); + com.google.firestore.v1.PreconditionOrBuilder getPreconditionOrBuilder(); /** * @@ -8470,7 +8465,7 @@ com.google.cloud.firestore.conformance.TestDefinition.FieldPathOrBuilder getFiel * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 5; + * .google.firestore.v1.CommitRequest request = 5; */ boolean hasRequest(); /** @@ -8480,9 +8475,9 @@ com.google.cloud.firestore.conformance.TestDefinition.FieldPathOrBuilder getFiel * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 5; + * .google.firestore.v1.CommitRequest request = 5; */ - com.google.firestore.v1beta1.CommitRequest getRequest(); + com.google.firestore.v1.CommitRequest getRequest(); /** * * @@ -8490,9 +8485,9 @@ com.google.cloud.firestore.conformance.TestDefinition.FieldPathOrBuilder getFiel * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 5; + * .google.firestore.v1.CommitRequest request = 5; */ - com.google.firestore.v1beta1.CommitRequestOrBuilder getRequestOrBuilder(); + com.google.firestore.v1.CommitRequestOrBuilder getRequestOrBuilder(); /** * @@ -8572,13 +8567,13 @@ private UpdatePathsTest( } case 18: { - com.google.firestore.v1beta1.Precondition.Builder subBuilder = null; + com.google.firestore.v1.Precondition.Builder subBuilder = null; if (precondition_ != null) { subBuilder = precondition_.toBuilder(); } precondition_ = input.readMessage( - com.google.firestore.v1beta1.Precondition.parser(), extensionRegistry); + com.google.firestore.v1.Precondition.parser(), extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(precondition_); precondition_ = subBuilder.buildPartial(); @@ -8612,13 +8607,13 @@ private UpdatePathsTest( } case 42: { - com.google.firestore.v1beta1.CommitRequest.Builder subBuilder = null; + com.google.firestore.v1.CommitRequest.Builder subBuilder = null; if (request_ != null) { subBuilder = request_.toBuilder(); } request_ = input.readMessage( - com.google.firestore.v1beta1.CommitRequest.parser(), extensionRegistry); + com.google.firestore.v1.CommitRequest.parser(), extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(request_); request_ = subBuilder.buildPartial(); @@ -8707,7 +8702,7 @@ public com.google.protobuf.ByteString getDocRefPathBytes() { } public static final int PRECONDITION_FIELD_NUMBER = 2; - private com.google.firestore.v1beta1.Precondition precondition_; + private com.google.firestore.v1.Precondition precondition_; /** * * @@ -8715,7 +8710,7 @@ public com.google.protobuf.ByteString getDocRefPathBytes() { * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ public boolean hasPrecondition() { return precondition_ != null; @@ -8727,11 +8722,11 @@ public boolean hasPrecondition() { * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ - public com.google.firestore.v1beta1.Precondition getPrecondition() { + public com.google.firestore.v1.Precondition getPrecondition() { return precondition_ == null - ? com.google.firestore.v1beta1.Precondition.getDefaultInstance() + ? com.google.firestore.v1.Precondition.getDefaultInstance() : precondition_; } /** @@ -8741,9 +8736,9 @@ public com.google.firestore.v1beta1.Precondition getPrecondition() { * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ - public com.google.firestore.v1beta1.PreconditionOrBuilder getPreconditionOrBuilder() { + public com.google.firestore.v1.PreconditionOrBuilder getPreconditionOrBuilder() { return getPrecondition(); } @@ -8868,7 +8863,7 @@ public com.google.protobuf.ByteString getJsonValuesBytes(int index) { } public static final int REQUEST_FIELD_NUMBER = 5; - private com.google.firestore.v1beta1.CommitRequest request_; + private com.google.firestore.v1.CommitRequest request_; /** * * @@ -8876,7 +8871,7 @@ public com.google.protobuf.ByteString getJsonValuesBytes(int index) { * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 5; + * .google.firestore.v1.CommitRequest request = 5; */ public boolean hasRequest() { return request_ != null; @@ -8888,11 +8883,11 @@ public boolean hasRequest() { * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 5; + * .google.firestore.v1.CommitRequest request = 5; */ - public com.google.firestore.v1beta1.CommitRequest getRequest() { + public com.google.firestore.v1.CommitRequest getRequest() { return request_ == null - ? com.google.firestore.v1beta1.CommitRequest.getDefaultInstance() + ? com.google.firestore.v1.CommitRequest.getDefaultInstance() : request_; } /** @@ -8902,9 +8897,9 @@ public com.google.firestore.v1beta1.CommitRequest getRequest() { * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 5; + * .google.firestore.v1.CommitRequest request = 5; */ - public com.google.firestore.v1beta1.CommitRequestOrBuilder getRequestOrBuilder() { + public com.google.firestore.v1.CommitRequestOrBuilder getRequestOrBuilder() { return getRequest(); } @@ -9497,11 +9492,11 @@ public Builder setDocRefPathBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.firestore.v1beta1.Precondition precondition_ = null; + private com.google.firestore.v1.Precondition precondition_ = null; private com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.Precondition, - com.google.firestore.v1beta1.Precondition.Builder, - com.google.firestore.v1beta1.PreconditionOrBuilder> + com.google.firestore.v1.Precondition, + com.google.firestore.v1.Precondition.Builder, + com.google.firestore.v1.PreconditionOrBuilder> preconditionBuilder_; /** * @@ -9510,7 +9505,7 @@ public Builder setDocRefPathBytes(com.google.protobuf.ByteString value) { * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ public boolean hasPrecondition() { return preconditionBuilder_ != null || precondition_ != null; @@ -9522,12 +9517,12 @@ public boolean hasPrecondition() { * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ - public com.google.firestore.v1beta1.Precondition getPrecondition() { + public com.google.firestore.v1.Precondition getPrecondition() { if (preconditionBuilder_ == null) { return precondition_ == null - ? com.google.firestore.v1beta1.Precondition.getDefaultInstance() + ? com.google.firestore.v1.Precondition.getDefaultInstance() : precondition_; } else { return preconditionBuilder_.getMessage(); @@ -9540,9 +9535,9 @@ public com.google.firestore.v1beta1.Precondition getPrecondition() { * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ - public Builder setPrecondition(com.google.firestore.v1beta1.Precondition value) { + public Builder setPrecondition(com.google.firestore.v1.Precondition value) { if (preconditionBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -9562,10 +9557,9 @@ public Builder setPrecondition(com.google.firestore.v1beta1.Precondition value) * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ - public Builder setPrecondition( - com.google.firestore.v1beta1.Precondition.Builder builderForValue) { + public Builder setPrecondition(com.google.firestore.v1.Precondition.Builder builderForValue) { if (preconditionBuilder_ == null) { precondition_ = builderForValue.build(); onChanged(); @@ -9582,13 +9576,13 @@ public Builder setPrecondition( * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ - public Builder mergePrecondition(com.google.firestore.v1beta1.Precondition value) { + public Builder mergePrecondition(com.google.firestore.v1.Precondition value) { if (preconditionBuilder_ == null) { if (precondition_ != null) { precondition_ = - com.google.firestore.v1beta1.Precondition.newBuilder(precondition_) + com.google.firestore.v1.Precondition.newBuilder(precondition_) .mergeFrom(value) .buildPartial(); } else { @@ -9608,7 +9602,7 @@ public Builder mergePrecondition(com.google.firestore.v1beta1.Precondition value * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ public Builder clearPrecondition() { if (preconditionBuilder_ == null) { @@ -9628,9 +9622,9 @@ public Builder clearPrecondition() { * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ - public com.google.firestore.v1beta1.Precondition.Builder getPreconditionBuilder() { + public com.google.firestore.v1.Precondition.Builder getPreconditionBuilder() { onChanged(); return getPreconditionFieldBuilder().getBuilder(); @@ -9642,14 +9636,14 @@ public com.google.firestore.v1beta1.Precondition.Builder getPreconditionBuilder( * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ - public com.google.firestore.v1beta1.PreconditionOrBuilder getPreconditionOrBuilder() { + public com.google.firestore.v1.PreconditionOrBuilder getPreconditionOrBuilder() { if (preconditionBuilder_ != null) { return preconditionBuilder_.getMessageOrBuilder(); } else { return precondition_ == null - ? com.google.firestore.v1beta1.Precondition.getDefaultInstance() + ? com.google.firestore.v1.Precondition.getDefaultInstance() : precondition_; } } @@ -9660,19 +9654,19 @@ public com.google.firestore.v1beta1.PreconditionOrBuilder getPreconditionOrBuild * precondition in call, if any * * - * .google.firestore.v1beta1.Precondition precondition = 2; + * .google.firestore.v1.Precondition precondition = 2; */ private com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.Precondition, - com.google.firestore.v1beta1.Precondition.Builder, - com.google.firestore.v1beta1.PreconditionOrBuilder> + com.google.firestore.v1.Precondition, + com.google.firestore.v1.Precondition.Builder, + com.google.firestore.v1.PreconditionOrBuilder> getPreconditionFieldBuilder() { if (preconditionBuilder_ == null) { preconditionBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.Precondition, - com.google.firestore.v1beta1.Precondition.Builder, - com.google.firestore.v1beta1.PreconditionOrBuilder>( + com.google.firestore.v1.Precondition, + com.google.firestore.v1.Precondition.Builder, + com.google.firestore.v1.PreconditionOrBuilder>( getPrecondition(), getParentForChildren(), isClean()); precondition_ = null; } @@ -10196,11 +10190,11 @@ public Builder addJsonValuesBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.firestore.v1beta1.CommitRequest request_ = null; + private com.google.firestore.v1.CommitRequest request_ = null; private com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.CommitRequest, - com.google.firestore.v1beta1.CommitRequest.Builder, - com.google.firestore.v1beta1.CommitRequestOrBuilder> + com.google.firestore.v1.CommitRequest, + com.google.firestore.v1.CommitRequest.Builder, + com.google.firestore.v1.CommitRequestOrBuilder> requestBuilder_; /** * @@ -10209,7 +10203,7 @@ public Builder addJsonValuesBytes(com.google.protobuf.ByteString value) { * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 5; + * .google.firestore.v1.CommitRequest request = 5; */ public boolean hasRequest() { return requestBuilder_ != null || request_ != null; @@ -10221,12 +10215,12 @@ public boolean hasRequest() { * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 5; + * .google.firestore.v1.CommitRequest request = 5; */ - public com.google.firestore.v1beta1.CommitRequest getRequest() { + public com.google.firestore.v1.CommitRequest getRequest() { if (requestBuilder_ == null) { return request_ == null - ? com.google.firestore.v1beta1.CommitRequest.getDefaultInstance() + ? com.google.firestore.v1.CommitRequest.getDefaultInstance() : request_; } else { return requestBuilder_.getMessage(); @@ -10239,9 +10233,9 @@ public com.google.firestore.v1beta1.CommitRequest getRequest() { * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 5; + * .google.firestore.v1.CommitRequest request = 5; */ - public Builder setRequest(com.google.firestore.v1beta1.CommitRequest value) { + public Builder setRequest(com.google.firestore.v1.CommitRequest value) { if (requestBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -10261,10 +10255,9 @@ public Builder setRequest(com.google.firestore.v1beta1.CommitRequest value) { * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 5; + * .google.firestore.v1.CommitRequest request = 5; */ - public Builder setRequest( - com.google.firestore.v1beta1.CommitRequest.Builder builderForValue) { + public Builder setRequest(com.google.firestore.v1.CommitRequest.Builder builderForValue) { if (requestBuilder_ == null) { request_ = builderForValue.build(); onChanged(); @@ -10281,13 +10274,13 @@ public Builder setRequest( * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 5; + * .google.firestore.v1.CommitRequest request = 5; */ - public Builder mergeRequest(com.google.firestore.v1beta1.CommitRequest value) { + public Builder mergeRequest(com.google.firestore.v1.CommitRequest value) { if (requestBuilder_ == null) { if (request_ != null) { request_ = - com.google.firestore.v1beta1.CommitRequest.newBuilder(request_) + com.google.firestore.v1.CommitRequest.newBuilder(request_) .mergeFrom(value) .buildPartial(); } else { @@ -10307,7 +10300,7 @@ public Builder mergeRequest(com.google.firestore.v1beta1.CommitRequest value) { * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 5; + * .google.firestore.v1.CommitRequest request = 5; */ public Builder clearRequest() { if (requestBuilder_ == null) { @@ -10327,9 +10320,9 @@ public Builder clearRequest() { * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 5; + * .google.firestore.v1.CommitRequest request = 5; */ - public com.google.firestore.v1beta1.CommitRequest.Builder getRequestBuilder() { + public com.google.firestore.v1.CommitRequest.Builder getRequestBuilder() { onChanged(); return getRequestFieldBuilder().getBuilder(); @@ -10341,14 +10334,14 @@ public com.google.firestore.v1beta1.CommitRequest.Builder getRequestBuilder() { * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 5; + * .google.firestore.v1.CommitRequest request = 5; */ - public com.google.firestore.v1beta1.CommitRequestOrBuilder getRequestOrBuilder() { + public com.google.firestore.v1.CommitRequestOrBuilder getRequestOrBuilder() { if (requestBuilder_ != null) { return requestBuilder_.getMessageOrBuilder(); } else { return request_ == null - ? com.google.firestore.v1beta1.CommitRequest.getDefaultInstance() + ? com.google.firestore.v1.CommitRequest.getDefaultInstance() : request_; } } @@ -10359,19 +10352,19 @@ public com.google.firestore.v1beta1.CommitRequestOrBuilder getRequestOrBuilder() * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 5; + * .google.firestore.v1.CommitRequest request = 5; */ private com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.CommitRequest, - com.google.firestore.v1beta1.CommitRequest.Builder, - com.google.firestore.v1beta1.CommitRequestOrBuilder> + com.google.firestore.v1.CommitRequest, + com.google.firestore.v1.CommitRequest.Builder, + com.google.firestore.v1.CommitRequestOrBuilder> getRequestFieldBuilder() { if (requestBuilder_ == null) { requestBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.CommitRequest, - com.google.firestore.v1beta1.CommitRequest.Builder, - com.google.firestore.v1beta1.CommitRequestOrBuilder>( + com.google.firestore.v1.CommitRequest, + com.google.firestore.v1.CommitRequest.Builder, + com.google.firestore.v1.CommitRequestOrBuilder>( getRequest(), getParentForChildren(), isClean()); request_ = null; } @@ -10500,12 +10493,12 @@ public interface DeleteTestOrBuilder */ com.google.protobuf.ByteString getDocRefPathBytes(); - /** .google.firestore.v1beta1.Precondition precondition = 2; */ + /** .google.firestore.v1.Precondition precondition = 2; */ boolean hasPrecondition(); - /** .google.firestore.v1beta1.Precondition precondition = 2; */ - com.google.firestore.v1beta1.Precondition getPrecondition(); - /** .google.firestore.v1beta1.Precondition precondition = 2; */ - com.google.firestore.v1beta1.PreconditionOrBuilder getPreconditionOrBuilder(); + /** .google.firestore.v1.Precondition precondition = 2; */ + com.google.firestore.v1.Precondition getPrecondition(); + /** .google.firestore.v1.Precondition precondition = 2; */ + com.google.firestore.v1.PreconditionOrBuilder getPreconditionOrBuilder(); /** * @@ -10514,7 +10507,7 @@ public interface DeleteTestOrBuilder * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ boolean hasRequest(); /** @@ -10524,9 +10517,9 @@ public interface DeleteTestOrBuilder * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ - com.google.firestore.v1beta1.CommitRequest getRequest(); + com.google.firestore.v1.CommitRequest getRequest(); /** * * @@ -10534,9 +10527,9 @@ public interface DeleteTestOrBuilder * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ - com.google.firestore.v1beta1.CommitRequestOrBuilder getRequestOrBuilder(); + com.google.firestore.v1.CommitRequestOrBuilder getRequestOrBuilder(); /** * @@ -10613,13 +10606,13 @@ private DeleteTest( } case 18: { - com.google.firestore.v1beta1.Precondition.Builder subBuilder = null; + com.google.firestore.v1.Precondition.Builder subBuilder = null; if (precondition_ != null) { subBuilder = precondition_.toBuilder(); } precondition_ = input.readMessage( - com.google.firestore.v1beta1.Precondition.parser(), extensionRegistry); + com.google.firestore.v1.Precondition.parser(), extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(precondition_); precondition_ = subBuilder.buildPartial(); @@ -10629,13 +10622,13 @@ private DeleteTest( } case 26: { - com.google.firestore.v1beta1.CommitRequest.Builder subBuilder = null; + com.google.firestore.v1.CommitRequest.Builder subBuilder = null; if (request_ != null) { subBuilder = request_.toBuilder(); } request_ = input.readMessage( - com.google.firestore.v1beta1.CommitRequest.parser(), extensionRegistry); + com.google.firestore.v1.CommitRequest.parser(), extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(request_); request_ = subBuilder.buildPartial(); @@ -10717,24 +10710,24 @@ public com.google.protobuf.ByteString getDocRefPathBytes() { } public static final int PRECONDITION_FIELD_NUMBER = 2; - private com.google.firestore.v1beta1.Precondition precondition_; - /** .google.firestore.v1beta1.Precondition precondition = 2; */ + private com.google.firestore.v1.Precondition precondition_; + /** .google.firestore.v1.Precondition precondition = 2; */ public boolean hasPrecondition() { return precondition_ != null; } - /** .google.firestore.v1beta1.Precondition precondition = 2; */ - public com.google.firestore.v1beta1.Precondition getPrecondition() { + /** .google.firestore.v1.Precondition precondition = 2; */ + public com.google.firestore.v1.Precondition getPrecondition() { return precondition_ == null - ? com.google.firestore.v1beta1.Precondition.getDefaultInstance() + ? com.google.firestore.v1.Precondition.getDefaultInstance() : precondition_; } - /** .google.firestore.v1beta1.Precondition precondition = 2; */ - public com.google.firestore.v1beta1.PreconditionOrBuilder getPreconditionOrBuilder() { + /** .google.firestore.v1.Precondition precondition = 2; */ + public com.google.firestore.v1.PreconditionOrBuilder getPreconditionOrBuilder() { return getPrecondition(); } public static final int REQUEST_FIELD_NUMBER = 3; - private com.google.firestore.v1beta1.CommitRequest request_; + private com.google.firestore.v1.CommitRequest request_; /** * * @@ -10742,7 +10735,7 @@ public com.google.firestore.v1beta1.PreconditionOrBuilder getPreconditionOrBuild * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ public boolean hasRequest() { return request_ != null; @@ -10754,11 +10747,11 @@ public boolean hasRequest() { * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ - public com.google.firestore.v1beta1.CommitRequest getRequest() { + public com.google.firestore.v1.CommitRequest getRequest() { return request_ == null - ? com.google.firestore.v1beta1.CommitRequest.getDefaultInstance() + ? com.google.firestore.v1.CommitRequest.getDefaultInstance() : request_; } /** @@ -10768,9 +10761,9 @@ public com.google.firestore.v1beta1.CommitRequest getRequest() { * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ - public com.google.firestore.v1beta1.CommitRequestOrBuilder getRequestOrBuilder() { + public com.google.firestore.v1.CommitRequestOrBuilder getRequestOrBuilder() { return getRequest(); } @@ -11265,28 +11258,28 @@ public Builder setDocRefPathBytes(com.google.protobuf.ByteString value) { return this; } - private com.google.firestore.v1beta1.Precondition precondition_ = null; + private com.google.firestore.v1.Precondition precondition_ = null; private com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.Precondition, - com.google.firestore.v1beta1.Precondition.Builder, - com.google.firestore.v1beta1.PreconditionOrBuilder> + com.google.firestore.v1.Precondition, + com.google.firestore.v1.Precondition.Builder, + com.google.firestore.v1.PreconditionOrBuilder> preconditionBuilder_; - /** .google.firestore.v1beta1.Precondition precondition = 2; */ + /** .google.firestore.v1.Precondition precondition = 2; */ public boolean hasPrecondition() { return preconditionBuilder_ != null || precondition_ != null; } - /** .google.firestore.v1beta1.Precondition precondition = 2; */ - public com.google.firestore.v1beta1.Precondition getPrecondition() { + /** .google.firestore.v1.Precondition precondition = 2; */ + public com.google.firestore.v1.Precondition getPrecondition() { if (preconditionBuilder_ == null) { return precondition_ == null - ? com.google.firestore.v1beta1.Precondition.getDefaultInstance() + ? com.google.firestore.v1.Precondition.getDefaultInstance() : precondition_; } else { return preconditionBuilder_.getMessage(); } } - /** .google.firestore.v1beta1.Precondition precondition = 2; */ - public Builder setPrecondition(com.google.firestore.v1beta1.Precondition value) { + /** .google.firestore.v1.Precondition precondition = 2; */ + public Builder setPrecondition(com.google.firestore.v1.Precondition value) { if (preconditionBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -11299,9 +11292,8 @@ public Builder setPrecondition(com.google.firestore.v1beta1.Precondition value) return this; } - /** .google.firestore.v1beta1.Precondition precondition = 2; */ - public Builder setPrecondition( - com.google.firestore.v1beta1.Precondition.Builder builderForValue) { + /** .google.firestore.v1.Precondition precondition = 2; */ + public Builder setPrecondition(com.google.firestore.v1.Precondition.Builder builderForValue) { if (preconditionBuilder_ == null) { precondition_ = builderForValue.build(); onChanged(); @@ -11311,12 +11303,12 @@ public Builder setPrecondition( return this; } - /** .google.firestore.v1beta1.Precondition precondition = 2; */ - public Builder mergePrecondition(com.google.firestore.v1beta1.Precondition value) { + /** .google.firestore.v1.Precondition precondition = 2; */ + public Builder mergePrecondition(com.google.firestore.v1.Precondition value) { if (preconditionBuilder_ == null) { if (precondition_ != null) { precondition_ = - com.google.firestore.v1beta1.Precondition.newBuilder(precondition_) + com.google.firestore.v1.Precondition.newBuilder(precondition_) .mergeFrom(value) .buildPartial(); } else { @@ -11329,7 +11321,7 @@ public Builder mergePrecondition(com.google.firestore.v1beta1.Precondition value return this; } - /** .google.firestore.v1beta1.Precondition precondition = 2; */ + /** .google.firestore.v1.Precondition precondition = 2; */ public Builder clearPrecondition() { if (preconditionBuilder_ == null) { precondition_ = null; @@ -11341,45 +11333,45 @@ public Builder clearPrecondition() { return this; } - /** .google.firestore.v1beta1.Precondition precondition = 2; */ - public com.google.firestore.v1beta1.Precondition.Builder getPreconditionBuilder() { + /** .google.firestore.v1.Precondition precondition = 2; */ + public com.google.firestore.v1.Precondition.Builder getPreconditionBuilder() { onChanged(); return getPreconditionFieldBuilder().getBuilder(); } - /** .google.firestore.v1beta1.Precondition precondition = 2; */ - public com.google.firestore.v1beta1.PreconditionOrBuilder getPreconditionOrBuilder() { + /** .google.firestore.v1.Precondition precondition = 2; */ + public com.google.firestore.v1.PreconditionOrBuilder getPreconditionOrBuilder() { if (preconditionBuilder_ != null) { return preconditionBuilder_.getMessageOrBuilder(); } else { return precondition_ == null - ? com.google.firestore.v1beta1.Precondition.getDefaultInstance() + ? com.google.firestore.v1.Precondition.getDefaultInstance() : precondition_; } } - /** .google.firestore.v1beta1.Precondition precondition = 2; */ + /** .google.firestore.v1.Precondition precondition = 2; */ private com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.Precondition, - com.google.firestore.v1beta1.Precondition.Builder, - com.google.firestore.v1beta1.PreconditionOrBuilder> + com.google.firestore.v1.Precondition, + com.google.firestore.v1.Precondition.Builder, + com.google.firestore.v1.PreconditionOrBuilder> getPreconditionFieldBuilder() { if (preconditionBuilder_ == null) { preconditionBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.Precondition, - com.google.firestore.v1beta1.Precondition.Builder, - com.google.firestore.v1beta1.PreconditionOrBuilder>( + com.google.firestore.v1.Precondition, + com.google.firestore.v1.Precondition.Builder, + com.google.firestore.v1.PreconditionOrBuilder>( getPrecondition(), getParentForChildren(), isClean()); precondition_ = null; } return preconditionBuilder_; } - private com.google.firestore.v1beta1.CommitRequest request_ = null; + private com.google.firestore.v1.CommitRequest request_ = null; private com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.CommitRequest, - com.google.firestore.v1beta1.CommitRequest.Builder, - com.google.firestore.v1beta1.CommitRequestOrBuilder> + com.google.firestore.v1.CommitRequest, + com.google.firestore.v1.CommitRequest.Builder, + com.google.firestore.v1.CommitRequestOrBuilder> requestBuilder_; /** * @@ -11388,7 +11380,7 @@ public com.google.firestore.v1beta1.PreconditionOrBuilder getPreconditionOrBuild * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ public boolean hasRequest() { return requestBuilder_ != null || request_ != null; @@ -11400,12 +11392,12 @@ public boolean hasRequest() { * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ - public com.google.firestore.v1beta1.CommitRequest getRequest() { + public com.google.firestore.v1.CommitRequest getRequest() { if (requestBuilder_ == null) { return request_ == null - ? com.google.firestore.v1beta1.CommitRequest.getDefaultInstance() + ? com.google.firestore.v1.CommitRequest.getDefaultInstance() : request_; } else { return requestBuilder_.getMessage(); @@ -11418,9 +11410,9 @@ public com.google.firestore.v1beta1.CommitRequest getRequest() { * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ - public Builder setRequest(com.google.firestore.v1beta1.CommitRequest value) { + public Builder setRequest(com.google.firestore.v1.CommitRequest value) { if (requestBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -11440,10 +11432,9 @@ public Builder setRequest(com.google.firestore.v1beta1.CommitRequest value) { * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ - public Builder setRequest( - com.google.firestore.v1beta1.CommitRequest.Builder builderForValue) { + public Builder setRequest(com.google.firestore.v1.CommitRequest.Builder builderForValue) { if (requestBuilder_ == null) { request_ = builderForValue.build(); onChanged(); @@ -11460,13 +11451,13 @@ public Builder setRequest( * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ - public Builder mergeRequest(com.google.firestore.v1beta1.CommitRequest value) { + public Builder mergeRequest(com.google.firestore.v1.CommitRequest value) { if (requestBuilder_ == null) { if (request_ != null) { request_ = - com.google.firestore.v1beta1.CommitRequest.newBuilder(request_) + com.google.firestore.v1.CommitRequest.newBuilder(request_) .mergeFrom(value) .buildPartial(); } else { @@ -11486,7 +11477,7 @@ public Builder mergeRequest(com.google.firestore.v1beta1.CommitRequest value) { * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ public Builder clearRequest() { if (requestBuilder_ == null) { @@ -11506,9 +11497,9 @@ public Builder clearRequest() { * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ - public com.google.firestore.v1beta1.CommitRequest.Builder getRequestBuilder() { + public com.google.firestore.v1.CommitRequest.Builder getRequestBuilder() { onChanged(); return getRequestFieldBuilder().getBuilder(); @@ -11520,14 +11511,14 @@ public com.google.firestore.v1beta1.CommitRequest.Builder getRequestBuilder() { * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ - public com.google.firestore.v1beta1.CommitRequestOrBuilder getRequestOrBuilder() { + public com.google.firestore.v1.CommitRequestOrBuilder getRequestOrBuilder() { if (requestBuilder_ != null) { return requestBuilder_.getMessageOrBuilder(); } else { return request_ == null - ? com.google.firestore.v1beta1.CommitRequest.getDefaultInstance() + ? com.google.firestore.v1.CommitRequest.getDefaultInstance() : request_; } } @@ -11538,19 +11529,19 @@ public com.google.firestore.v1beta1.CommitRequestOrBuilder getRequestOrBuilder() * expected rquest * * - * .google.firestore.v1beta1.CommitRequest request = 3; + * .google.firestore.v1.CommitRequest request = 3; */ private com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.CommitRequest, - com.google.firestore.v1beta1.CommitRequest.Builder, - com.google.firestore.v1beta1.CommitRequestOrBuilder> + com.google.firestore.v1.CommitRequest, + com.google.firestore.v1.CommitRequest.Builder, + com.google.firestore.v1.CommitRequestOrBuilder> getRequestFieldBuilder() { if (requestBuilder_ == null) { requestBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.CommitRequest, - com.google.firestore.v1beta1.CommitRequest.Builder, - com.google.firestore.v1beta1.CommitRequestOrBuilder>( + com.google.firestore.v1.CommitRequest, + com.google.firestore.v1.CommitRequest.Builder, + com.google.firestore.v1.CommitRequestOrBuilder>( getRequest(), getParentForChildren(), isClean()); request_ = null; } @@ -12782,12 +12773,12 @@ public interface QueryTestOrBuilder com.google.cloud.firestore.conformance.TestDefinition.ClauseOrBuilder getClausesOrBuilder( int index); - /** .google.firestore.v1beta1.StructuredQuery query = 3; */ + /** .google.firestore.v1.StructuredQuery query = 3; */ boolean hasQuery(); - /** .google.firestore.v1beta1.StructuredQuery query = 3; */ - com.google.firestore.v1beta1.StructuredQuery getQuery(); - /** .google.firestore.v1beta1.StructuredQuery query = 3; */ - com.google.firestore.v1beta1.StructuredQueryOrBuilder getQueryOrBuilder(); + /** .google.firestore.v1.StructuredQuery query = 3; */ + com.google.firestore.v1.StructuredQuery getQuery(); + /** .google.firestore.v1.StructuredQuery query = 3; */ + com.google.firestore.v1.StructuredQueryOrBuilder getQueryOrBuilder(); /** bool is_error = 4; */ boolean getIsError(); @@ -12863,13 +12854,13 @@ private QueryTest( } case 26: { - com.google.firestore.v1beta1.StructuredQuery.Builder subBuilder = null; + com.google.firestore.v1.StructuredQuery.Builder subBuilder = null; if (query_ != null) { subBuilder = query_.toBuilder(); } query_ = input.readMessage( - com.google.firestore.v1beta1.StructuredQuery.parser(), extensionRegistry); + com.google.firestore.v1.StructuredQuery.parser(), extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(query_); query_ = subBuilder.buildPartial(); @@ -12982,19 +12973,17 @@ public com.google.cloud.firestore.conformance.TestDefinition.Clause getClauses(i } public static final int QUERY_FIELD_NUMBER = 3; - private com.google.firestore.v1beta1.StructuredQuery query_; - /** .google.firestore.v1beta1.StructuredQuery query = 3; */ + private com.google.firestore.v1.StructuredQuery query_; + /** .google.firestore.v1.StructuredQuery query = 3; */ public boolean hasQuery() { return query_ != null; } - /** .google.firestore.v1beta1.StructuredQuery query = 3; */ - public com.google.firestore.v1beta1.StructuredQuery getQuery() { - return query_ == null - ? com.google.firestore.v1beta1.StructuredQuery.getDefaultInstance() - : query_; + /** .google.firestore.v1.StructuredQuery query = 3; */ + public com.google.firestore.v1.StructuredQuery getQuery() { + return query_ == null ? com.google.firestore.v1.StructuredQuery.getDefaultInstance() : query_; } - /** .google.firestore.v1beta1.StructuredQuery query = 3; */ - public com.google.firestore.v1beta1.StructuredQueryOrBuilder getQueryOrBuilder() { + /** .google.firestore.v1.StructuredQuery query = 3; */ + public com.google.firestore.v1.StructuredQueryOrBuilder getQueryOrBuilder() { return getQuery(); } @@ -13729,28 +13718,28 @@ public com.google.cloud.firestore.conformance.TestDefinition.Clause.Builder addC return clausesBuilder_; } - private com.google.firestore.v1beta1.StructuredQuery query_ = null; + private com.google.firestore.v1.StructuredQuery query_ = null; private com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.StructuredQuery, - com.google.firestore.v1beta1.StructuredQuery.Builder, - com.google.firestore.v1beta1.StructuredQueryOrBuilder> + com.google.firestore.v1.StructuredQuery, + com.google.firestore.v1.StructuredQuery.Builder, + com.google.firestore.v1.StructuredQueryOrBuilder> queryBuilder_; - /** .google.firestore.v1beta1.StructuredQuery query = 3; */ + /** .google.firestore.v1.StructuredQuery query = 3; */ public boolean hasQuery() { return queryBuilder_ != null || query_ != null; } - /** .google.firestore.v1beta1.StructuredQuery query = 3; */ - public com.google.firestore.v1beta1.StructuredQuery getQuery() { + /** .google.firestore.v1.StructuredQuery query = 3; */ + public com.google.firestore.v1.StructuredQuery getQuery() { if (queryBuilder_ == null) { return query_ == null - ? com.google.firestore.v1beta1.StructuredQuery.getDefaultInstance() + ? com.google.firestore.v1.StructuredQuery.getDefaultInstance() : query_; } else { return queryBuilder_.getMessage(); } } - /** .google.firestore.v1beta1.StructuredQuery query = 3; */ - public Builder setQuery(com.google.firestore.v1beta1.StructuredQuery value) { + /** .google.firestore.v1.StructuredQuery query = 3; */ + public Builder setQuery(com.google.firestore.v1.StructuredQuery value) { if (queryBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -13763,9 +13752,8 @@ public Builder setQuery(com.google.firestore.v1beta1.StructuredQuery value) { return this; } - /** .google.firestore.v1beta1.StructuredQuery query = 3; */ - public Builder setQuery( - com.google.firestore.v1beta1.StructuredQuery.Builder builderForValue) { + /** .google.firestore.v1.StructuredQuery query = 3; */ + public Builder setQuery(com.google.firestore.v1.StructuredQuery.Builder builderForValue) { if (queryBuilder_ == null) { query_ = builderForValue.build(); onChanged(); @@ -13775,12 +13763,12 @@ public Builder setQuery( return this; } - /** .google.firestore.v1beta1.StructuredQuery query = 3; */ - public Builder mergeQuery(com.google.firestore.v1beta1.StructuredQuery value) { + /** .google.firestore.v1.StructuredQuery query = 3; */ + public Builder mergeQuery(com.google.firestore.v1.StructuredQuery value) { if (queryBuilder_ == null) { if (query_ != null) { query_ = - com.google.firestore.v1beta1.StructuredQuery.newBuilder(query_) + com.google.firestore.v1.StructuredQuery.newBuilder(query_) .mergeFrom(value) .buildPartial(); } else { @@ -13793,7 +13781,7 @@ public Builder mergeQuery(com.google.firestore.v1beta1.StructuredQuery value) { return this; } - /** .google.firestore.v1beta1.StructuredQuery query = 3; */ + /** .google.firestore.v1.StructuredQuery query = 3; */ public Builder clearQuery() { if (queryBuilder_ == null) { query_ = null; @@ -13805,34 +13793,34 @@ public Builder clearQuery() { return this; } - /** .google.firestore.v1beta1.StructuredQuery query = 3; */ - public com.google.firestore.v1beta1.StructuredQuery.Builder getQueryBuilder() { + /** .google.firestore.v1.StructuredQuery query = 3; */ + public com.google.firestore.v1.StructuredQuery.Builder getQueryBuilder() { onChanged(); return getQueryFieldBuilder().getBuilder(); } - /** .google.firestore.v1beta1.StructuredQuery query = 3; */ - public com.google.firestore.v1beta1.StructuredQueryOrBuilder getQueryOrBuilder() { + /** .google.firestore.v1.StructuredQuery query = 3; */ + public com.google.firestore.v1.StructuredQueryOrBuilder getQueryOrBuilder() { if (queryBuilder_ != null) { return queryBuilder_.getMessageOrBuilder(); } else { return query_ == null - ? com.google.firestore.v1beta1.StructuredQuery.getDefaultInstance() + ? com.google.firestore.v1.StructuredQuery.getDefaultInstance() : query_; } } - /** .google.firestore.v1beta1.StructuredQuery query = 3; */ + /** .google.firestore.v1.StructuredQuery query = 3; */ private com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.StructuredQuery, - com.google.firestore.v1beta1.StructuredQuery.Builder, - com.google.firestore.v1beta1.StructuredQueryOrBuilder> + com.google.firestore.v1.StructuredQuery, + com.google.firestore.v1.StructuredQuery.Builder, + com.google.firestore.v1.StructuredQueryOrBuilder> getQueryFieldBuilder() { if (queryBuilder_ == null) { queryBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.StructuredQuery, - com.google.firestore.v1beta1.StructuredQuery.Builder, - com.google.firestore.v1beta1.StructuredQueryOrBuilder>( + com.google.firestore.v1.StructuredQuery, + com.google.firestore.v1.StructuredQuery.Builder, + com.google.firestore.v1.StructuredQueryOrBuilder>( getQuery(), getParentForChildren(), isClean()); query_ = null; } @@ -20445,17 +20433,17 @@ public interface ListenTestOrBuilder // @@protoc_insertion_point(interface_extends:tests.ListenTest) com.google.protobuf.MessageOrBuilder { - /** repeated .google.firestore.v1beta1.ListenResponse responses = 1; */ - java.util.List getResponsesList(); - /** repeated .google.firestore.v1beta1.ListenResponse responses = 1; */ - com.google.firestore.v1beta1.ListenResponse getResponses(int index); - /** repeated .google.firestore.v1beta1.ListenResponse responses = 1; */ + /** repeated .google.firestore.v1.ListenResponse responses = 1; */ + java.util.List getResponsesList(); + /** repeated .google.firestore.v1.ListenResponse responses = 1; */ + com.google.firestore.v1.ListenResponse getResponses(int index); + /** repeated .google.firestore.v1.ListenResponse responses = 1; */ int getResponsesCount(); - /** repeated .google.firestore.v1beta1.ListenResponse responses = 1; */ - java.util.List + /** repeated .google.firestore.v1.ListenResponse responses = 1; */ + java.util.List getResponsesOrBuilderList(); - /** repeated .google.firestore.v1beta1.ListenResponse responses = 1; */ - com.google.firestore.v1beta1.ListenResponseOrBuilder getResponsesOrBuilder(int index); + /** repeated .google.firestore.v1.ListenResponse responses = 1; */ + com.google.firestore.v1.ListenResponseOrBuilder getResponsesOrBuilder(int index); /** repeated .tests.Snapshot snapshots = 2; */ java.util.List @@ -20542,13 +20530,12 @@ private ListenTest( case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - responses_ = - new java.util.ArrayList(); + responses_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } responses_.add( input.readMessage( - com.google.firestore.v1beta1.ListenResponse.parser(), extensionRegistry)); + com.google.firestore.v1.ListenResponse.parser(), extensionRegistry)); break; } case 18: @@ -20603,26 +20590,26 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { private int bitField0_; public static final int RESPONSES_FIELD_NUMBER = 1; - private java.util.List responses_; - /** repeated .google.firestore.v1beta1.ListenResponse responses = 1; */ - public java.util.List getResponsesList() { + private java.util.List responses_; + /** repeated .google.firestore.v1.ListenResponse responses = 1; */ + public java.util.List getResponsesList() { return responses_; } - /** repeated .google.firestore.v1beta1.ListenResponse responses = 1; */ - public java.util.List + /** repeated .google.firestore.v1.ListenResponse responses = 1; */ + public java.util.List getResponsesOrBuilderList() { return responses_; } - /** repeated .google.firestore.v1beta1.ListenResponse responses = 1; */ + /** repeated .google.firestore.v1.ListenResponse responses = 1; */ public int getResponsesCount() { return responses_.size(); } - /** repeated .google.firestore.v1beta1.ListenResponse responses = 1; */ - public com.google.firestore.v1beta1.ListenResponse getResponses(int index) { + /** repeated .google.firestore.v1.ListenResponse responses = 1; */ + public com.google.firestore.v1.ListenResponse getResponses(int index) { return responses_.get(index); } - /** repeated .google.firestore.v1beta1.ListenResponse responses = 1; */ - public com.google.firestore.v1beta1.ListenResponseOrBuilder getResponsesOrBuilder(int index) { + /** repeated .google.firestore.v1.ListenResponse responses = 1; */ + public com.google.firestore.v1.ListenResponseOrBuilder getResponsesOrBuilder(int index) { return responses_.get(index); } @@ -21093,32 +21080,31 @@ public Builder mergeFrom( private int bitField0_; - private java.util.List responses_ = + private java.util.List responses_ = java.util.Collections.emptyList(); private void ensureResponsesIsMutable() { if (!((bitField0_ & 0x00000001) == 0x00000001)) { - responses_ = - new java.util.ArrayList(responses_); + responses_ = new java.util.ArrayList(responses_); bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilderV3< - com.google.firestore.v1beta1.ListenResponse, - com.google.firestore.v1beta1.ListenResponse.Builder, - com.google.firestore.v1beta1.ListenResponseOrBuilder> + com.google.firestore.v1.ListenResponse, + com.google.firestore.v1.ListenResponse.Builder, + com.google.firestore.v1.ListenResponseOrBuilder> responsesBuilder_; - /** repeated .google.firestore.v1beta1.ListenResponse responses = 1; */ - public java.util.List getResponsesList() { + /** repeated .google.firestore.v1.ListenResponse responses = 1; */ + public java.util.List getResponsesList() { if (responsesBuilder_ == null) { return java.util.Collections.unmodifiableList(responses_); } else { return responsesBuilder_.getMessageList(); } } - /** repeated .google.firestore.v1beta1.ListenResponse responses = 1; */ + /** repeated .google.firestore.v1.ListenResponse responses = 1; */ public int getResponsesCount() { if (responsesBuilder_ == null) { return responses_.size(); @@ -21126,16 +21112,16 @@ public int getResponsesCount() { return responsesBuilder_.getCount(); } } - /** repeated .google.firestore.v1beta1.ListenResponse responses = 1; */ - public com.google.firestore.v1beta1.ListenResponse getResponses(int index) { + /** repeated .google.firestore.v1.ListenResponse responses = 1; */ + public com.google.firestore.v1.ListenResponse getResponses(int index) { if (responsesBuilder_ == null) { return responses_.get(index); } else { return responsesBuilder_.getMessage(index); } } - /** repeated .google.firestore.v1beta1.ListenResponse responses = 1; */ - public Builder setResponses(int index, com.google.firestore.v1beta1.ListenResponse value) { + /** repeated .google.firestore.v1.ListenResponse responses = 1; */ + public Builder setResponses(int index, com.google.firestore.v1.ListenResponse value) { if (responsesBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -21148,9 +21134,9 @@ public Builder setResponses(int index, com.google.firestore.v1beta1.ListenRespon } return this; } - /** repeated .google.firestore.v1beta1.ListenResponse responses = 1; */ + /** repeated .google.firestore.v1.ListenResponse responses = 1; */ public Builder setResponses( - int index, com.google.firestore.v1beta1.ListenResponse.Builder builderForValue) { + int index, com.google.firestore.v1.ListenResponse.Builder builderForValue) { if (responsesBuilder_ == null) { ensureResponsesIsMutable(); responses_.set(index, builderForValue.build()); @@ -21160,8 +21146,8 @@ public Builder setResponses( } return this; } - /** repeated .google.firestore.v1beta1.ListenResponse responses = 1; */ - public Builder addResponses(com.google.firestore.v1beta1.ListenResponse value) { + /** repeated .google.firestore.v1.ListenResponse responses = 1; */ + public Builder addResponses(com.google.firestore.v1.ListenResponse value) { if (responsesBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -21174,8 +21160,8 @@ public Builder addResponses(com.google.firestore.v1beta1.ListenResponse value) { } return this; } - /** repeated .google.firestore.v1beta1.ListenResponse responses = 1; */ - public Builder addResponses(int index, com.google.firestore.v1beta1.ListenResponse value) { + /** repeated .google.firestore.v1.ListenResponse responses = 1; */ + public Builder addResponses(int index, com.google.firestore.v1.ListenResponse value) { if (responsesBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -21188,9 +21174,8 @@ public Builder addResponses(int index, com.google.firestore.v1beta1.ListenRespon } return this; } - /** repeated .google.firestore.v1beta1.ListenResponse responses = 1; */ - public Builder addResponses( - com.google.firestore.v1beta1.ListenResponse.Builder builderForValue) { + /** repeated .google.firestore.v1.ListenResponse responses = 1; */ + public Builder addResponses(com.google.firestore.v1.ListenResponse.Builder builderForValue) { if (responsesBuilder_ == null) { ensureResponsesIsMutable(); responses_.add(builderForValue.build()); @@ -21200,9 +21185,9 @@ public Builder addResponses( } return this; } - /** repeated .google.firestore.v1beta1.ListenResponse responses = 1; */ + /** repeated .google.firestore.v1.ListenResponse responses = 1; */ public Builder addResponses( - int index, com.google.firestore.v1beta1.ListenResponse.Builder builderForValue) { + int index, com.google.firestore.v1.ListenResponse.Builder builderForValue) { if (responsesBuilder_ == null) { ensureResponsesIsMutable(); responses_.add(index, builderForValue.build()); @@ -21212,9 +21197,9 @@ public Builder addResponses( } return this; } - /** repeated .google.firestore.v1beta1.ListenResponse responses = 1; */ + /** repeated .google.firestore.v1.ListenResponse responses = 1; */ public Builder addAllResponses( - java.lang.Iterable values) { + java.lang.Iterable values) { if (responsesBuilder_ == null) { ensureResponsesIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll(values, responses_); @@ -21224,7 +21209,7 @@ public Builder addAllResponses( } return this; } - /** repeated .google.firestore.v1beta1.ListenResponse responses = 1; */ + /** repeated .google.firestore.v1.ListenResponse responses = 1; */ public Builder clearResponses() { if (responsesBuilder_ == null) { responses_ = java.util.Collections.emptyList(); @@ -21235,7 +21220,7 @@ public Builder clearResponses() { } return this; } - /** repeated .google.firestore.v1beta1.ListenResponse responses = 1; */ + /** repeated .google.firestore.v1.ListenResponse responses = 1; */ public Builder removeResponses(int index) { if (responsesBuilder_ == null) { ensureResponsesIsMutable(); @@ -21246,20 +21231,20 @@ public Builder removeResponses(int index) { } return this; } - /** repeated .google.firestore.v1beta1.ListenResponse responses = 1; */ - public com.google.firestore.v1beta1.ListenResponse.Builder getResponsesBuilder(int index) { + /** repeated .google.firestore.v1.ListenResponse responses = 1; */ + public com.google.firestore.v1.ListenResponse.Builder getResponsesBuilder(int index) { return getResponsesFieldBuilder().getBuilder(index); } - /** repeated .google.firestore.v1beta1.ListenResponse responses = 1; */ - public com.google.firestore.v1beta1.ListenResponseOrBuilder getResponsesOrBuilder(int index) { + /** repeated .google.firestore.v1.ListenResponse responses = 1; */ + public com.google.firestore.v1.ListenResponseOrBuilder getResponsesOrBuilder(int index) { if (responsesBuilder_ == null) { return responses_.get(index); } else { return responsesBuilder_.getMessageOrBuilder(index); } } - /** repeated .google.firestore.v1beta1.ListenResponse responses = 1; */ - public java.util.List + /** repeated .google.firestore.v1.ListenResponse responses = 1; */ + public java.util.List getResponsesOrBuilderList() { if (responsesBuilder_ != null) { return responsesBuilder_.getMessageOrBuilderList(); @@ -21267,33 +21252,33 @@ public com.google.firestore.v1beta1.ListenResponseOrBuilder getResponsesOrBuilde return java.util.Collections.unmodifiableList(responses_); } } - /** repeated .google.firestore.v1beta1.ListenResponse responses = 1; */ - public com.google.firestore.v1beta1.ListenResponse.Builder addResponsesBuilder() { + /** repeated .google.firestore.v1.ListenResponse responses = 1; */ + public com.google.firestore.v1.ListenResponse.Builder addResponsesBuilder() { return getResponsesFieldBuilder() - .addBuilder(com.google.firestore.v1beta1.ListenResponse.getDefaultInstance()); + .addBuilder(com.google.firestore.v1.ListenResponse.getDefaultInstance()); } - /** repeated .google.firestore.v1beta1.ListenResponse responses = 1; */ - public com.google.firestore.v1beta1.ListenResponse.Builder addResponsesBuilder(int index) { + /** repeated .google.firestore.v1.ListenResponse responses = 1; */ + public com.google.firestore.v1.ListenResponse.Builder addResponsesBuilder(int index) { return getResponsesFieldBuilder() - .addBuilder(index, com.google.firestore.v1beta1.ListenResponse.getDefaultInstance()); + .addBuilder(index, com.google.firestore.v1.ListenResponse.getDefaultInstance()); } - /** repeated .google.firestore.v1beta1.ListenResponse responses = 1; */ - public java.util.List + /** repeated .google.firestore.v1.ListenResponse responses = 1; */ + public java.util.List getResponsesBuilderList() { return getResponsesFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilderV3< - com.google.firestore.v1beta1.ListenResponse, - com.google.firestore.v1beta1.ListenResponse.Builder, - com.google.firestore.v1beta1.ListenResponseOrBuilder> + com.google.firestore.v1.ListenResponse, + com.google.firestore.v1.ListenResponse.Builder, + com.google.firestore.v1.ListenResponseOrBuilder> getResponsesFieldBuilder() { if (responsesBuilder_ == null) { responsesBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - com.google.firestore.v1beta1.ListenResponse, - com.google.firestore.v1beta1.ListenResponse.Builder, - com.google.firestore.v1beta1.ListenResponseOrBuilder>( + com.google.firestore.v1.ListenResponse, + com.google.firestore.v1.ListenResponse.Builder, + com.google.firestore.v1.ListenResponseOrBuilder>( responses_, ((bitField0_ & 0x00000001) == 0x00000001), getParentForChildren(), @@ -21609,16 +21594,16 @@ public interface SnapshotOrBuilder // @@protoc_insertion_point(interface_extends:tests.Snapshot) com.google.protobuf.MessageOrBuilder { - /** repeated .google.firestore.v1beta1.Document docs = 1; */ - java.util.List getDocsList(); - /** repeated .google.firestore.v1beta1.Document docs = 1; */ - com.google.firestore.v1beta1.Document getDocs(int index); - /** repeated .google.firestore.v1beta1.Document docs = 1; */ + /** repeated .google.firestore.v1.Document docs = 1; */ + java.util.List getDocsList(); + /** repeated .google.firestore.v1.Document docs = 1; */ + com.google.firestore.v1.Document getDocs(int index); + /** repeated .google.firestore.v1.Document docs = 1; */ int getDocsCount(); - /** repeated .google.firestore.v1beta1.Document docs = 1; */ - java.util.List getDocsOrBuilderList(); - /** repeated .google.firestore.v1beta1.Document docs = 1; */ - com.google.firestore.v1beta1.DocumentOrBuilder getDocsOrBuilder(int index); + /** repeated .google.firestore.v1.Document docs = 1; */ + java.util.List getDocsOrBuilderList(); + /** repeated .google.firestore.v1.Document docs = 1; */ + com.google.firestore.v1.DocumentOrBuilder getDocsOrBuilder(int index); /** repeated .tests.DocChange changes = 2; */ java.util.List @@ -21692,12 +21677,12 @@ private Snapshot( case 10: { if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { - docs_ = new java.util.ArrayList(); + docs_ = new java.util.ArrayList(); mutable_bitField0_ |= 0x00000001; } docs_.add( input.readMessage( - com.google.firestore.v1beta1.Document.parser(), extensionRegistry)); + com.google.firestore.v1.Document.parser(), extensionRegistry)); break; } case 18: @@ -21762,26 +21747,26 @@ public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { private int bitField0_; public static final int DOCS_FIELD_NUMBER = 1; - private java.util.List docs_; - /** repeated .google.firestore.v1beta1.Document docs = 1; */ - public java.util.List getDocsList() { + private java.util.List docs_; + /** repeated .google.firestore.v1.Document docs = 1; */ + public java.util.List getDocsList() { return docs_; } - /** repeated .google.firestore.v1beta1.Document docs = 1; */ - public java.util.List + /** repeated .google.firestore.v1.Document docs = 1; */ + public java.util.List getDocsOrBuilderList() { return docs_; } - /** repeated .google.firestore.v1beta1.Document docs = 1; */ + /** repeated .google.firestore.v1.Document docs = 1; */ public int getDocsCount() { return docs_.size(); } - /** repeated .google.firestore.v1beta1.Document docs = 1; */ - public com.google.firestore.v1beta1.Document getDocs(int index) { + /** repeated .google.firestore.v1.Document docs = 1; */ + public com.google.firestore.v1.Document getDocs(int index) { return docs_.get(index); } - /** repeated .google.firestore.v1beta1.Document docs = 1; */ - public com.google.firestore.v1beta1.DocumentOrBuilder getDocsOrBuilder(int index) { + /** repeated .google.firestore.v1.Document docs = 1; */ + public com.google.firestore.v1.DocumentOrBuilder getDocsOrBuilder(int index) { return docs_.get(index); } @@ -22253,31 +22238,31 @@ public Builder mergeFrom( private int bitField0_; - private java.util.List docs_ = + private java.util.List docs_ = java.util.Collections.emptyList(); private void ensureDocsIsMutable() { if (!((bitField0_ & 0x00000001) == 0x00000001)) { - docs_ = new java.util.ArrayList(docs_); + docs_ = new java.util.ArrayList(docs_); bitField0_ |= 0x00000001; } } private com.google.protobuf.RepeatedFieldBuilderV3< - com.google.firestore.v1beta1.Document, - com.google.firestore.v1beta1.Document.Builder, - com.google.firestore.v1beta1.DocumentOrBuilder> + com.google.firestore.v1.Document, + com.google.firestore.v1.Document.Builder, + com.google.firestore.v1.DocumentOrBuilder> docsBuilder_; - /** repeated .google.firestore.v1beta1.Document docs = 1; */ - public java.util.List getDocsList() { + /** repeated .google.firestore.v1.Document docs = 1; */ + public java.util.List getDocsList() { if (docsBuilder_ == null) { return java.util.Collections.unmodifiableList(docs_); } else { return docsBuilder_.getMessageList(); } } - /** repeated .google.firestore.v1beta1.Document docs = 1; */ + /** repeated .google.firestore.v1.Document docs = 1; */ public int getDocsCount() { if (docsBuilder_ == null) { return docs_.size(); @@ -22285,16 +22270,16 @@ public int getDocsCount() { return docsBuilder_.getCount(); } } - /** repeated .google.firestore.v1beta1.Document docs = 1; */ - public com.google.firestore.v1beta1.Document getDocs(int index) { + /** repeated .google.firestore.v1.Document docs = 1; */ + public com.google.firestore.v1.Document getDocs(int index) { if (docsBuilder_ == null) { return docs_.get(index); } else { return docsBuilder_.getMessage(index); } } - /** repeated .google.firestore.v1beta1.Document docs = 1; */ - public Builder setDocs(int index, com.google.firestore.v1beta1.Document value) { + /** repeated .google.firestore.v1.Document docs = 1; */ + public Builder setDocs(int index, com.google.firestore.v1.Document value) { if (docsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -22307,9 +22292,8 @@ public Builder setDocs(int index, com.google.firestore.v1beta1.Document value) { } return this; } - /** repeated .google.firestore.v1beta1.Document docs = 1; */ - public Builder setDocs( - int index, com.google.firestore.v1beta1.Document.Builder builderForValue) { + /** repeated .google.firestore.v1.Document docs = 1; */ + public Builder setDocs(int index, com.google.firestore.v1.Document.Builder builderForValue) { if (docsBuilder_ == null) { ensureDocsIsMutable(); docs_.set(index, builderForValue.build()); @@ -22319,8 +22303,8 @@ public Builder setDocs( } return this; } - /** repeated .google.firestore.v1beta1.Document docs = 1; */ - public Builder addDocs(com.google.firestore.v1beta1.Document value) { + /** repeated .google.firestore.v1.Document docs = 1; */ + public Builder addDocs(com.google.firestore.v1.Document value) { if (docsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -22333,8 +22317,8 @@ public Builder addDocs(com.google.firestore.v1beta1.Document value) { } return this; } - /** repeated .google.firestore.v1beta1.Document docs = 1; */ - public Builder addDocs(int index, com.google.firestore.v1beta1.Document value) { + /** repeated .google.firestore.v1.Document docs = 1; */ + public Builder addDocs(int index, com.google.firestore.v1.Document value) { if (docsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -22347,8 +22331,8 @@ public Builder addDocs(int index, com.google.firestore.v1beta1.Document value) { } return this; } - /** repeated .google.firestore.v1beta1.Document docs = 1; */ - public Builder addDocs(com.google.firestore.v1beta1.Document.Builder builderForValue) { + /** repeated .google.firestore.v1.Document docs = 1; */ + public Builder addDocs(com.google.firestore.v1.Document.Builder builderForValue) { if (docsBuilder_ == null) { ensureDocsIsMutable(); docs_.add(builderForValue.build()); @@ -22358,9 +22342,8 @@ public Builder addDocs(com.google.firestore.v1beta1.Document.Builder builderForV } return this; } - /** repeated .google.firestore.v1beta1.Document docs = 1; */ - public Builder addDocs( - int index, com.google.firestore.v1beta1.Document.Builder builderForValue) { + /** repeated .google.firestore.v1.Document docs = 1; */ + public Builder addDocs(int index, com.google.firestore.v1.Document.Builder builderForValue) { if (docsBuilder_ == null) { ensureDocsIsMutable(); docs_.add(index, builderForValue.build()); @@ -22370,9 +22353,9 @@ public Builder addDocs( } return this; } - /** repeated .google.firestore.v1beta1.Document docs = 1; */ + /** repeated .google.firestore.v1.Document docs = 1; */ public Builder addAllDocs( - java.lang.Iterable values) { + java.lang.Iterable values) { if (docsBuilder_ == null) { ensureDocsIsMutable(); com.google.protobuf.AbstractMessageLite.Builder.addAll(values, docs_); @@ -22382,7 +22365,7 @@ public Builder addAllDocs( } return this; } - /** repeated .google.firestore.v1beta1.Document docs = 1; */ + /** repeated .google.firestore.v1.Document docs = 1; */ public Builder clearDocs() { if (docsBuilder_ == null) { docs_ = java.util.Collections.emptyList(); @@ -22393,7 +22376,7 @@ public Builder clearDocs() { } return this; } - /** repeated .google.firestore.v1beta1.Document docs = 1; */ + /** repeated .google.firestore.v1.Document docs = 1; */ public Builder removeDocs(int index) { if (docsBuilder_ == null) { ensureDocsIsMutable(); @@ -22404,20 +22387,20 @@ public Builder removeDocs(int index) { } return this; } - /** repeated .google.firestore.v1beta1.Document docs = 1; */ - public com.google.firestore.v1beta1.Document.Builder getDocsBuilder(int index) { + /** repeated .google.firestore.v1.Document docs = 1; */ + public com.google.firestore.v1.Document.Builder getDocsBuilder(int index) { return getDocsFieldBuilder().getBuilder(index); } - /** repeated .google.firestore.v1beta1.Document docs = 1; */ - public com.google.firestore.v1beta1.DocumentOrBuilder getDocsOrBuilder(int index) { + /** repeated .google.firestore.v1.Document docs = 1; */ + public com.google.firestore.v1.DocumentOrBuilder getDocsOrBuilder(int index) { if (docsBuilder_ == null) { return docs_.get(index); } else { return docsBuilder_.getMessageOrBuilder(index); } } - /** repeated .google.firestore.v1beta1.Document docs = 1; */ - public java.util.List + /** repeated .google.firestore.v1.Document docs = 1; */ + public java.util.List getDocsOrBuilderList() { if (docsBuilder_ != null) { return docsBuilder_.getMessageOrBuilderList(); @@ -22425,32 +22408,32 @@ public com.google.firestore.v1beta1.DocumentOrBuilder getDocsOrBuilder(int index return java.util.Collections.unmodifiableList(docs_); } } - /** repeated .google.firestore.v1beta1.Document docs = 1; */ - public com.google.firestore.v1beta1.Document.Builder addDocsBuilder() { + /** repeated .google.firestore.v1.Document docs = 1; */ + public com.google.firestore.v1.Document.Builder addDocsBuilder() { return getDocsFieldBuilder() - .addBuilder(com.google.firestore.v1beta1.Document.getDefaultInstance()); + .addBuilder(com.google.firestore.v1.Document.getDefaultInstance()); } - /** repeated .google.firestore.v1beta1.Document docs = 1; */ - public com.google.firestore.v1beta1.Document.Builder addDocsBuilder(int index) { + /** repeated .google.firestore.v1.Document docs = 1; */ + public com.google.firestore.v1.Document.Builder addDocsBuilder(int index) { return getDocsFieldBuilder() - .addBuilder(index, com.google.firestore.v1beta1.Document.getDefaultInstance()); + .addBuilder(index, com.google.firestore.v1.Document.getDefaultInstance()); } - /** repeated .google.firestore.v1beta1.Document docs = 1; */ - public java.util.List getDocsBuilderList() { + /** repeated .google.firestore.v1.Document docs = 1; */ + public java.util.List getDocsBuilderList() { return getDocsFieldBuilder().getBuilderList(); } private com.google.protobuf.RepeatedFieldBuilderV3< - com.google.firestore.v1beta1.Document, - com.google.firestore.v1beta1.Document.Builder, - com.google.firestore.v1beta1.DocumentOrBuilder> + com.google.firestore.v1.Document, + com.google.firestore.v1.Document.Builder, + com.google.firestore.v1.DocumentOrBuilder> getDocsFieldBuilder() { if (docsBuilder_ == null) { docsBuilder_ = new com.google.protobuf.RepeatedFieldBuilderV3< - com.google.firestore.v1beta1.Document, - com.google.firestore.v1beta1.Document.Builder, - com.google.firestore.v1beta1.DocumentOrBuilder>( + com.google.firestore.v1.Document, + com.google.firestore.v1.Document.Builder, + com.google.firestore.v1.DocumentOrBuilder>( docs_, ((bitField0_ & 0x00000001) == 0x00000001), getParentForChildren(), @@ -22853,12 +22836,12 @@ public interface DocChangeOrBuilder /** .tests.DocChange.Kind kind = 1; */ com.google.cloud.firestore.conformance.TestDefinition.DocChange.Kind getKind(); - /** .google.firestore.v1beta1.Document doc = 2; */ + /** .google.firestore.v1.Document doc = 2; */ boolean hasDoc(); - /** .google.firestore.v1beta1.Document doc = 2; */ - com.google.firestore.v1beta1.Document getDoc(); - /** .google.firestore.v1beta1.Document doc = 2; */ - com.google.firestore.v1beta1.DocumentOrBuilder getDocOrBuilder(); + /** .google.firestore.v1.Document doc = 2; */ + com.google.firestore.v1.Document getDoc(); + /** .google.firestore.v1.Document doc = 2; */ + com.google.firestore.v1.DocumentOrBuilder getDocOrBuilder(); /** int32 old_index = 3; */ int getOldIndex(); @@ -22923,13 +22906,12 @@ private DocChange( } case 18: { - com.google.firestore.v1beta1.Document.Builder subBuilder = null; + com.google.firestore.v1.Document.Builder subBuilder = null; if (doc_ != null) { subBuilder = doc_.toBuilder(); } doc_ = - input.readMessage( - com.google.firestore.v1beta1.Document.parser(), extensionRegistry); + input.readMessage(com.google.firestore.v1.Document.parser(), extensionRegistry); if (subBuilder != null) { subBuilder.mergeFrom(doc_); doc_ = subBuilder.buildPartial(); @@ -23085,17 +23067,17 @@ public com.google.cloud.firestore.conformance.TestDefinition.DocChange.Kind getK } public static final int DOC_FIELD_NUMBER = 2; - private com.google.firestore.v1beta1.Document doc_; - /** .google.firestore.v1beta1.Document doc = 2; */ + private com.google.firestore.v1.Document doc_; + /** .google.firestore.v1.Document doc = 2; */ public boolean hasDoc() { return doc_ != null; } - /** .google.firestore.v1beta1.Document doc = 2; */ - public com.google.firestore.v1beta1.Document getDoc() { - return doc_ == null ? com.google.firestore.v1beta1.Document.getDefaultInstance() : doc_; + /** .google.firestore.v1.Document doc = 2; */ + public com.google.firestore.v1.Document getDoc() { + return doc_ == null ? com.google.firestore.v1.Document.getDefaultInstance() : doc_; } - /** .google.firestore.v1beta1.Document doc = 2; */ - public com.google.firestore.v1beta1.DocumentOrBuilder getDocOrBuilder() { + /** .google.firestore.v1.Document doc = 2; */ + public com.google.firestore.v1.DocumentOrBuilder getDocOrBuilder() { return getDoc(); } @@ -23513,26 +23495,26 @@ public Builder clearKind() { return this; } - private com.google.firestore.v1beta1.Document doc_ = null; + private com.google.firestore.v1.Document doc_ = null; private com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.Document, - com.google.firestore.v1beta1.Document.Builder, - com.google.firestore.v1beta1.DocumentOrBuilder> + com.google.firestore.v1.Document, + com.google.firestore.v1.Document.Builder, + com.google.firestore.v1.DocumentOrBuilder> docBuilder_; - /** .google.firestore.v1beta1.Document doc = 2; */ + /** .google.firestore.v1.Document doc = 2; */ public boolean hasDoc() { return docBuilder_ != null || doc_ != null; } - /** .google.firestore.v1beta1.Document doc = 2; */ - public com.google.firestore.v1beta1.Document getDoc() { + /** .google.firestore.v1.Document doc = 2; */ + public com.google.firestore.v1.Document getDoc() { if (docBuilder_ == null) { - return doc_ == null ? com.google.firestore.v1beta1.Document.getDefaultInstance() : doc_; + return doc_ == null ? com.google.firestore.v1.Document.getDefaultInstance() : doc_; } else { return docBuilder_.getMessage(); } } - /** .google.firestore.v1beta1.Document doc = 2; */ - public Builder setDoc(com.google.firestore.v1beta1.Document value) { + /** .google.firestore.v1.Document doc = 2; */ + public Builder setDoc(com.google.firestore.v1.Document value) { if (docBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -23545,8 +23527,8 @@ public Builder setDoc(com.google.firestore.v1beta1.Document value) { return this; } - /** .google.firestore.v1beta1.Document doc = 2; */ - public Builder setDoc(com.google.firestore.v1beta1.Document.Builder builderForValue) { + /** .google.firestore.v1.Document doc = 2; */ + public Builder setDoc(com.google.firestore.v1.Document.Builder builderForValue) { if (docBuilder_ == null) { doc_ = builderForValue.build(); onChanged(); @@ -23556,14 +23538,12 @@ public Builder setDoc(com.google.firestore.v1beta1.Document.Builder builderForVa return this; } - /** .google.firestore.v1beta1.Document doc = 2; */ - public Builder mergeDoc(com.google.firestore.v1beta1.Document value) { + /** .google.firestore.v1.Document doc = 2; */ + public Builder mergeDoc(com.google.firestore.v1.Document value) { if (docBuilder_ == null) { if (doc_ != null) { doc_ = - com.google.firestore.v1beta1.Document.newBuilder(doc_) - .mergeFrom(value) - .buildPartial(); + com.google.firestore.v1.Document.newBuilder(doc_).mergeFrom(value).buildPartial(); } else { doc_ = value; } @@ -23574,7 +23554,7 @@ public Builder mergeDoc(com.google.firestore.v1beta1.Document value) { return this; } - /** .google.firestore.v1beta1.Document doc = 2; */ + /** .google.firestore.v1.Document doc = 2; */ public Builder clearDoc() { if (docBuilder_ == null) { doc_ = null; @@ -23586,32 +23566,32 @@ public Builder clearDoc() { return this; } - /** .google.firestore.v1beta1.Document doc = 2; */ - public com.google.firestore.v1beta1.Document.Builder getDocBuilder() { + /** .google.firestore.v1.Document doc = 2; */ + public com.google.firestore.v1.Document.Builder getDocBuilder() { onChanged(); return getDocFieldBuilder().getBuilder(); } - /** .google.firestore.v1beta1.Document doc = 2; */ - public com.google.firestore.v1beta1.DocumentOrBuilder getDocOrBuilder() { + /** .google.firestore.v1.Document doc = 2; */ + public com.google.firestore.v1.DocumentOrBuilder getDocOrBuilder() { if (docBuilder_ != null) { return docBuilder_.getMessageOrBuilder(); } else { - return doc_ == null ? com.google.firestore.v1beta1.Document.getDefaultInstance() : doc_; + return doc_ == null ? com.google.firestore.v1.Document.getDefaultInstance() : doc_; } } - /** .google.firestore.v1beta1.Document doc = 2; */ + /** .google.firestore.v1.Document doc = 2; */ private com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.Document, - com.google.firestore.v1beta1.Document.Builder, - com.google.firestore.v1beta1.DocumentOrBuilder> + com.google.firestore.v1.Document, + com.google.firestore.v1.Document.Builder, + com.google.firestore.v1.DocumentOrBuilder> getDocFieldBuilder() { if (docBuilder_ == null) { docBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< - com.google.firestore.v1beta1.Document, - com.google.firestore.v1beta1.Document.Builder, - com.google.firestore.v1beta1.DocumentOrBuilder>( + com.google.firestore.v1.Document, + com.google.firestore.v1.Document.Builder, + com.google.firestore.v1.DocumentOrBuilder>( getDoc(), getParentForChildren(), isClean()); doc_ = null; } @@ -23799,10 +23779,10 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { static { java.lang.String[] descriptorData = { "\n\025test-definition.proto\022\005tests\032%google/f" - + "irestore/v1beta1/common.proto\032\'google/fi" - + "restore/v1beta1/document.proto\032(google/f" - + "irestore/v1beta1/firestore.proto\032$google" - + "/firestore/v1beta1/query.proto\032\037google/p" + + "irestore/v1/common.proto\032\'google/fi" + + "restore/v1/document.proto\032(google/f" + + "irestore/v1/firestore.proto\032$google" + + "/firestore/v1/query.proto\032\037google/p" + "rotobuf/timestamp.proto\"\'\n\tTestSuite\022\032\n\005" + "tests\030\001 \003(\0132\013.tests.Test\"\310\002\n\004Test\022\023\n\013des" + "cription\030\001 \001(\t\022\035\n\003get\030\002 \001(\0132\016.tests.GetT" @@ -23814,28 +23794,28 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + "uery\030\010 \001(\0132\020.tests.QueryTestH\000\022#\n\006listen" + "\030\t \001(\0132\021.tests.ListenTestH\000B\006\n\004test\"^\n\007G" + "etTest\022\024\n\014doc_ref_path\030\001 \001(\t\022=\n\007request\030" - + "\002 \001(\0132,.google.firestore.v1beta1.GetDocu" + + "\002 \001(\0132,.google.firestore.v1.GetDocu" + "mentRequest\"\201\001\n\nCreateTest\022\024\n\014doc_ref_pa" + "th\030\001 \001(\t\022\021\n\tjson_data\030\002 \001(\t\0228\n\007request\030\003" - + " \001(\0132\'.google.firestore.v1beta1.CommitRe" + + " \001(\0132\'.google.firestore.v1.CommitRe" + "quest\022\020\n\010is_error\030\004 \001(\010\"\240\001\n\007SetTest\022\024\n\014d" + "oc_ref_path\030\001 \001(\t\022 \n\006option\030\002 \001(\0132\020.test" + "s.SetOption\022\021\n\tjson_data\030\003 \001(\t\0228\n\007reques" - + "t\030\004 \001(\0132\'.google.firestore.v1beta1.Commi" + + "t\030\004 \001(\0132\'.google.firestore.v1.Commi" + "tRequest\022\020\n\010is_error\030\005 \001(\010\"\277\001\n\nUpdateTes" + "t\022\024\n\014doc_ref_path\030\001 \001(\t\022<\n\014precondition\030" - + "\002 \001(\0132&.google.firestore.v1beta1.Precond" + + "\002 \001(\0132&.google.firestore.v1.Precond" + "ition\022\021\n\tjson_data\030\003 \001(\t\0228\n\007request\030\004 \001(" - + "\0132\'.google.firestore.v1beta1.CommitReque" + + "\0132\'.google.firestore.v1.CommitReque" + "st\022\020\n\010is_error\030\005 \001(\010\"\355\001\n\017UpdatePathsTest" + "\022\024\n\014doc_ref_path\030\001 \001(\t\022<\n\014precondition\030\002" - + " \001(\0132&.google.firestore.v1beta1.Precondi" + + " \001(\0132&.google.firestore.v1.Precondi" + "tion\022%\n\013field_paths\030\003 \003(\0132\020.tests.FieldP" + "ath\022\023\n\013json_values\030\004 \003(\t\0228\n\007request\030\005 \001(" - + "\0132\'.google.firestore.v1beta1.CommitReque" + + "\0132\'.google.firestore.v1.CommitReque" + "st\022\020\n\010is_error\030\006 \001(\010\"\254\001\n\nDeleteTest\022\024\n\014d" + "oc_ref_path\030\001 \001(\t\022<\n\014precondition\030\002 \001(\0132" - + "&.google.firestore.v1beta1.Precondition\022" + + "&.google.firestore.v1.Precondition\022" + "8\n\007request\030\003 \001(\0132\'.google.firestore.v1be" + "ta1.CommitRequest\022\020\n\010is_error\030\004 \001(\010\":\n\tS" + "etOption\022\013\n\003all\030\001 \001(\010\022 \n\006fields\030\002 \003(\0132\020." @@ -23867,7 +23847,7 @@ public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { + ".DocChange\022-\n\tread_time\030\003 \001(\0132\032.google.p" + "rotobuf.Timestamp\"\313\001\n\tDocChange\022#\n\004kind\030" + "\001 \001(\0162\025.tests.DocChange.Kind\022/\n\003doc\030\002 \001(" - + "\0132\".google.firestore.v1beta1.Document\022\021\n" + + "\0132\".google.firestore.v1.Document\022\021\n" + "\told_index\030\003 \001(\005\022\021\n\tnew_index\030\004 \001(\005\"B\n\004K" + "ind\022\024\n\020KIND_UNSPECIFIED\020\000\022\t\n\005ADDED\020\001\022\013\n\007" + "REMOVED\020\002\022\014\n\010MODIFIED\020\003Bx\n&com.google.cl" @@ -23886,10 +23866,10 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.protobuf.Descriptors.FileDescriptor.internalBuildGeneratedFileFrom( descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - com.google.firestore.v1beta1.CommonProto.getDescriptor(), - com.google.firestore.v1beta1.DocumentProto.getDescriptor(), - com.google.firestore.v1beta1.FirestoreProto.getDescriptor(), - com.google.firestore.v1beta1.QueryProto.getDescriptor(), + com.google.firestore.v1.CommonProto.getDescriptor(), + com.google.firestore.v1.DocumentProto.getDescriptor(), + com.google.firestore.v1.FirestoreProto.getDescriptor(), + com.google.firestore.v1.QueryProto.getDescriptor(), com.google.protobuf.TimestampProto.getDescriptor(), }, assigner); @@ -24051,10 +24031,10 @@ public com.google.protobuf.ExtensionRegistry assignDescriptors( new java.lang.String[] { "Kind", "Doc", "OldIndex", "NewIndex", }); - com.google.firestore.v1beta1.CommonProto.getDescriptor(); - com.google.firestore.v1beta1.DocumentProto.getDescriptor(); - com.google.firestore.v1beta1.FirestoreProto.getDescriptor(); - com.google.firestore.v1beta1.QueryProto.getDescriptor(); + com.google.firestore.v1.CommonProto.getDescriptor(); + com.google.firestore.v1.DocumentProto.getDescriptor(); + com.google.firestore.v1.FirestoreProto.getDescriptor(); + com.google.firestore.v1.QueryProto.getDescriptor(); com.google.protobuf.TimestampProto.getDescriptor(); }