Firestore: Migrate client to use v1 gapic client / protos. (#4419)

googleapis · Feb 5, 2019 · e3c0cd7 · e3c0cd7
1 parent b6b61af
commit e3c0cd7
Show file tree

Hide file tree

Showing 31 changed files with 807 additions and 828 deletions.
diff --git a/.../google-cloud-firestore/src/main/java/com/google/cloud/firestore/CollectionReference.java b/.../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/...ts/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentReference.java b/...ts/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/...nts/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentSnapshot.java b/...nts/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/...ts/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentTransform.java b/...ts/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<FieldPath> 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/...ud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FieldMask.java b/...ud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FieldMask.java
@@ -91,9 +91,9 @@ private static List<FieldPath> extractFromMap(Map<String, Object> 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/...d-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FieldValue.java b/...d-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/...lients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreImpl.java b/...lients/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/...nts/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreOptions.java b/...nts/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/...-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Order.java b/...-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/...clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Precondition.java b/...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/...-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Query.java b/...-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Query.java
@@ -16,29 +16,29 @@
 
 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;
 import com.google.api.gax.rpc.ApiStreamObserver;
 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/...oogle-cloud-firestore/src/main/java/com/google/cloud/firestore/QueryDocumentSnapshot.java b/...oogle-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/...clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/ResourcePath.java b/...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/...-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Transaction.java b/...-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/...lients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/UpdateBuilder.java b/...lients/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<T extends 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<List<WriteResult>> commit(@Nullable ByteString transactionId) {
         new ApiFunction<CommitResponse, List<WriteResult>>() {
           @Override
           public List<WriteResult> apply(CommitResponse commitResponse) {
-            List<com.google.firestore.v1beta1.WriteResult> writeResults =
+            List<com.google.firestore.v1.WriteResult> writeResults =
                 commitResponse.getWriteResultsList();
 
             List<WriteResult> result = new ArrayList<>();
@@ -637,7 +637,7 @@ public List<WriteResult> apply(CommitResponse commitResponse) {
                 request.getWritesCount());
 
             Iterator<Mutation> mutationIterator = mutations.iterator();
-            Iterator<com.google.firestore.v1beta1.WriteResult> responseIterator =
+            Iterator<com.google.firestore.v1.WriteResult> responseIterator =
                 writeResults.iterator();
 
             while (mutationIterator.hasNext()) {

diff --git a/...ts/google-cloud-firestore/src/main/java/com/google/cloud/firestore/UserDataConverter.java b/...ts/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/...-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Watch.java b/...-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/...-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/WriteResult.java b/...-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/...d/firestore/spi/v1beta1/FirestoreRpc.java → .../cloud/firestore/spi/v1/FirestoreRpc.java b/...d/firestore/spi/v1beta1/FirestoreRpc.java → .../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;