Skip to content

Commit e3c0cd7

Browse files
mikelehensduskis
authored andcommitted
Firestore: Migrate client to use v1 gapic client / protos. (#4419)
1 parent b6b61af commit e3c0cd7

31 files changed

+807
-828
lines changed

google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/CollectionReference.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@
2121
import com.google.api.core.ApiFutures;
2222
import com.google.api.gax.rpc.ApiException;
2323
import com.google.api.gax.rpc.ApiExceptions;
24-
import com.google.cloud.firestore.v1beta1.FirestoreClient.ListDocumentsPagedResponse;
24+
import com.google.cloud.firestore.v1.FirestoreClient.ListDocumentsPagedResponse;
2525
import com.google.common.base.Preconditions;
26-
import com.google.firestore.v1beta1.Document;
27-
import com.google.firestore.v1beta1.DocumentMask;
28-
import com.google.firestore.v1beta1.ListDocumentsRequest;
26+
import com.google.firestore.v1.Document;
27+
import com.google.firestore.v1.DocumentMask;
28+
import com.google.firestore.v1.ListDocumentsRequest;
2929
import java.util.Iterator;
3030
import java.util.Map;
3131
import javax.annotation.Nonnull;

google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentReference.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import com.google.api.core.ApiFutures;
2222
import com.google.api.gax.rpc.ApiException;
2323
import com.google.api.gax.rpc.ApiExceptions;
24-
import com.google.cloud.firestore.v1beta1.FirestoreClient.ListCollectionIdsPagedResponse;
25-
import com.google.firestore.v1beta1.ListCollectionIdsRequest;
24+
import com.google.cloud.firestore.v1.FirestoreClient.ListCollectionIdsPagedResponse;
25+
import com.google.firestore.v1.ListCollectionIdsRequest;
2626
import java.util.Iterator;
2727
import java.util.List;
2828
import java.util.Map;

google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentSnapshot.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@
1919
import com.google.cloud.Timestamp;
2020
import com.google.cloud.firestore.UserDataConverter.EncodingOptions;
2121
import com.google.common.base.Preconditions;
22-
import com.google.firestore.v1beta1.Document;
23-
import com.google.firestore.v1beta1.Value;
24-
import com.google.firestore.v1beta1.Write;
22+
import com.google.firestore.v1.Document;
23+
import com.google.firestore.v1.Value;
24+
import com.google.firestore.v1.Write;
2525
import java.util.ArrayList;
2626
import java.util.Date;
2727
import java.util.HashMap;

google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/DocumentTransform.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package com.google.cloud.firestore;
1818

19-
import com.google.firestore.v1beta1.DocumentTransform.FieldTransform;
20-
import com.google.firestore.v1beta1.Write;
19+
import com.google.firestore.v1.DocumentTransform.FieldTransform;
20+
import com.google.firestore.v1.Write;
2121
import java.util.Collections;
2222
import java.util.List;
2323
import java.util.Map;
@@ -118,7 +118,7 @@ Set<FieldPath> getFields() {
118118

119119
Write.Builder toPb() {
120120
Write.Builder write = Write.newBuilder();
121-
com.google.firestore.v1beta1.DocumentTransform.Builder transform = write.getTransformBuilder();
121+
com.google.firestore.v1.DocumentTransform.Builder transform = write.getTransformBuilder();
122122
transform.addAllFieldTransforms(transforms.values());
123123
transform.setDocument(documentReference.getName());
124124
return write;

google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FieldMask.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ private static List<FieldPath> extractFromMap(Map<String, Object> values, FieldP
9191
return fieldPaths;
9292
}
9393

94-
com.google.firestore.v1beta1.DocumentMask toPb() {
95-
com.google.firestore.v1beta1.DocumentMask.Builder updateMask =
96-
com.google.firestore.v1beta1.DocumentMask.newBuilder();
94+
com.google.firestore.v1.DocumentMask toPb() {
95+
com.google.firestore.v1.DocumentMask.Builder updateMask =
96+
com.google.firestore.v1.DocumentMask.newBuilder();
9797
for (FieldPath fieldPath : fieldPaths) {
9898
updateMask.addFieldPaths(fieldPath.getEncodedPath());
9999
}

google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FieldValue.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package com.google.cloud.firestore;
1818

1919
import com.google.common.base.Preconditions;
20-
import com.google.firestore.v1beta1.ArrayValue;
21-
import com.google.firestore.v1beta1.DocumentTransform.FieldTransform;
20+
import com.google.firestore.v1.ArrayValue;
21+
import com.google.firestore.v1.DocumentTransform.FieldTransform;
2222
import java.util.Arrays;
2323
import java.util.List;
2424
import java.util.Objects;

google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreImpl.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
import com.google.api.gax.rpc.ServerStreamingCallable;
2727
import com.google.api.gax.rpc.UnaryCallable;
2828
import com.google.cloud.Timestamp;
29-
import com.google.cloud.firestore.spi.v1beta1.FirestoreRpc;
29+
import com.google.cloud.firestore.spi.v1.FirestoreRpc;
3030
import com.google.common.base.Preconditions;
3131
import com.google.common.collect.ImmutableMap;
32-
import com.google.firestore.v1beta1.BatchGetDocumentsRequest;
33-
import com.google.firestore.v1beta1.BatchGetDocumentsResponse;
34-
import com.google.firestore.v1beta1.DatabaseRootName;
32+
import com.google.firestore.v1.BatchGetDocumentsRequest;
33+
import com.google.firestore.v1.BatchGetDocumentsResponse;
34+
import com.google.firestore.v1.DatabaseRootName;
3535
import com.google.protobuf.ByteString;
3636
import io.grpc.Context;
3737
import io.grpc.Status;

google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/FirestoreOptions.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@
2424
import com.google.cloud.ServiceDefaults;
2525
import com.google.cloud.ServiceOptions;
2626
import com.google.cloud.TransportOptions;
27-
import com.google.cloud.firestore.spi.v1beta1.FirestoreRpc;
28-
import com.google.cloud.firestore.spi.v1beta1.GrpcFirestoreRpc;
29-
import com.google.cloud.firestore.v1beta1.FirestoreSettings;
27+
import com.google.cloud.firestore.spi.v1.FirestoreRpc;
28+
import com.google.cloud.firestore.spi.v1.GrpcFirestoreRpc;
29+
import com.google.cloud.firestore.v1.FirestoreSettings;
3030
import com.google.cloud.grpc.GrpcTransportOptions;
3131
import com.google.common.collect.ImmutableSet;
3232
import java.io.IOException;

google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Order.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
package com.google.cloud.firestore;
1818

19-
import com.google.firestore.v1beta1.Value;
20-
import com.google.firestore.v1beta1.Value.ValueTypeCase;
19+
import com.google.firestore.v1.Value;
20+
import com.google.firestore.v1.Value.ValueTypeCase;
2121
import com.google.protobuf.ByteString;
2222
import java.util.Comparator;
2323
import java.util.Iterator;

google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Precondition.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ boolean hasExists() {
6666
return exists != null;
6767
}
6868

69-
com.google.firestore.v1beta1.Precondition toPb() {
70-
com.google.firestore.v1beta1.Precondition.Builder precondition =
71-
com.google.firestore.v1beta1.Precondition.newBuilder();
69+
com.google.firestore.v1.Precondition toPb() {
70+
com.google.firestore.v1.Precondition.Builder precondition =
71+
com.google.firestore.v1.Precondition.newBuilder();
7272

7373
if (exists != null) {
7474
precondition.setExists(exists);

0 commit comments

Comments
 (0)