From 495f7f97405fcd2bff4d09e67ddbeb51615ea843 Mon Sep 17 00:00:00 2001 From: Sebastian Schmidt Date: Fri, 27 Mar 2020 11:20:16 -0700 Subject: [PATCH] fix: mark v1beta1 as deprecated (#154) --- .../firestore/v1beta1/FirestoreClient.java | 28 ++- .../firestore/v1beta1/FirestoreSettings.java | 13 +- .../cloud/firestore/v1beta1/package-info.java | 2 +- .../firestore/v1beta1/stub/FirestoreStub.java | 2 +- .../v1beta1/stub/FirestoreStubSettings.java | 10 +- .../stub/GrpcFirestoreCallableFactory.java | 2 +- .../v1beta1/stub/GrpcFirestoreStub.java | 2 +- .../v1beta1/FirestoreClientTest.java | 175 +++++++++++++++++- .../firestore/v1beta1/MockFirestore.java | 2 +- .../firestore/v1beta1/MockFirestoreImpl.java | 2 +- synth.metadata | 26 +-- synth.py | 24 ++- 12 files changed, 240 insertions(+), 48 deletions(-) diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/FirestoreClient.java b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/FirestoreClient.java index 3fe59e27e..741c06ba1 100644 --- a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/FirestoreClient.java +++ b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/FirestoreClient.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 Google LLC + * Copyright 2020 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -139,9 +139,12 @@ * FirestoreClient.create(firestoreSettings); * * + * + * @deprecated Use com.google.cloud.firestore.v1.FirestoreClient instead */ @Generated("by gapic-generator") @BetaApi +@Deprecated public class FirestoreClient implements BackgroundResource { private final FirestoreSettings settings; private final FirestoreStub stub; @@ -395,7 +398,8 @@ public final UnaryCallable createDocumentCallab * } * * - * @param document The updated document. Creates the document if it does not already exist. + * @param document Required. The updated document. Creates the document if it does not already + * exist. * @param updateMask The fields to update. None of the field paths in the mask may contain a * reserved name. *

If the document exists on the server and has fields not referenced in the mask, they are @@ -404,7 +408,6 @@ public final UnaryCallable createDocumentCallab * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final Document updateDocument(Document document, DocumentMask updateMask) { - UpdateDocumentRequest request = UpdateDocumentRequest.newBuilder().setDocument(document).setUpdateMask(updateMask).build(); return updateDocument(request); @@ -472,12 +475,11 @@ public final UnaryCallable updateDocumentCallab * } * * - * @param name The resource name of the Document to delete. In the format: + * @param name Required. The resource name of the Document to delete. In the format: * `projects/{project_id}/databases/{database_id}/documents/{document_path}`. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final void deleteDocument(AnyPathName name) { - DeleteDocumentRequest request = DeleteDocumentRequest.newBuilder().setName(name == null ? null : name.toString()).build(); deleteDocument(request); @@ -496,12 +498,11 @@ public final void deleteDocument(AnyPathName name) { * } * * - * @param name The resource name of the Document to delete. In the format: + * @param name Required. The resource name of the Document to delete. In the format: * `projects/{project_id}/databases/{database_id}/documents/{document_path}`. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final void deleteDocument(String name) { - DeleteDocumentRequest request = DeleteDocumentRequest.newBuilder().setName(name).build(); deleteDocument(request); } @@ -594,12 +595,11 @@ public final UnaryCallable deleteDocumentCallable( * } * * - * @param database The database name. In the format: + * @param database Required. The database name. In the format: * `projects/{project_id}/databases/{database_id}`. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final BeginTransactionResponse beginTransaction(String database) { - BeginTransactionRequest request = BeginTransactionRequest.newBuilder().setDatabase(database).build(); return beginTransaction(request); @@ -665,14 +665,13 @@ public final BeginTransactionResponse beginTransaction(BeginTransactionRequest r * } * * - * @param database The database name. In the format: + * @param database Required. The database name. In the format: * `projects/{project_id}/databases/{database_id}`. * @param writes The writes to apply. *

Always executed atomically and in order. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final CommitResponse commit(String database, List writes) { - CommitRequest request = CommitRequest.newBuilder().setDatabase(database).addAllWrites(writes).build(); return commit(request); @@ -741,13 +740,12 @@ public final UnaryCallable commitCallable() { * } * * - * @param database The database name. In the format: + * @param database Required. The database name. In the format: * `projects/{project_id}/databases/{database_id}`. - * @param transaction The transaction to roll back. + * @param transaction Required. The transaction to roll back. * @throws com.google.api.gax.rpc.ApiException if the remote call fails */ public final void rollback(String database, ByteString transaction) { - RollbackRequest request = RollbackRequest.newBuilder().setDatabase(database).setTransaction(transaction).build(); rollback(request); @@ -893,7 +891,7 @@ public final BidiStreamingCallable listenCallable * } * * - * @param parent The parent document. In the format: + * @param parent Required. The parent document. In the format: * `projects/{project_id}/databases/{database_id}/documents/{document_path}`. For example: * `projects/my-project/databases/my-database/documents/chatrooms/my-chatroom` * @throws com.google.api.gax.rpc.ApiException if the remote call fails diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/FirestoreSettings.java b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/FirestoreSettings.java index e43728d8b..f832e1afa 100644 --- a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/FirestoreSettings.java +++ b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/FirestoreSettings.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 Google LLC + * Copyright 2020 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -80,14 +80,21 @@ * * FirestoreSettings.Builder firestoreSettingsBuilder = * FirestoreSettings.newBuilder(); - * firestoreSettingsBuilder.updateDocumentSettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * firestoreSettingsBuilder + * .updateDocumentSettings() + * .setRetrySettings( + * firestoreSettingsBuilder.updateDocumentSettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * FirestoreSettings firestoreSettings = firestoreSettingsBuilder.build(); * * + * + * @deprecated Use com.google.cloud.firestore.v1.FirestoreSettings instead */ @Generated("by gapic-generator") @BetaApi +@Deprecated public class FirestoreSettings extends ClientSettings { /** Returns the object with the settings used for calls to getDocument. */ public UnaryCallSettings getDocumentSettings() { diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/package-info.java b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/package-info.java index 310891f29..c9ce16acf 100644 --- a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/package-info.java +++ b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 Google LLC + * Copyright 2020 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/FirestoreStub.java b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/FirestoreStub.java index 18fb6c735..5906ff98d 100644 --- a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/FirestoreStub.java +++ b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/FirestoreStub.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 Google LLC + * Copyright 2020 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/FirestoreStubSettings.java b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/FirestoreStubSettings.java index 12caf88b8..edbe88a66 100644 --- a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/FirestoreStubSettings.java +++ b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/FirestoreStubSettings.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 Google LLC + * Copyright 2020 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -95,8 +95,12 @@ * * FirestoreStubSettings.Builder firestoreSettingsBuilder = * FirestoreStubSettings.newBuilder(); - * firestoreSettingsBuilder.updateDocumentSettings().getRetrySettings().toBuilder() - * .setTotalTimeout(Duration.ofSeconds(30)); + * firestoreSettingsBuilder + * .updateDocumentSettings() + * .setRetrySettings( + * firestoreSettingsBuilder.updateDocumentSettings().getRetrySettings().toBuilder() + * .setTotalTimeout(Duration.ofSeconds(30)) + * .build()); * FirestoreStubSettings firestoreSettings = firestoreSettingsBuilder.build(); * * diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/GrpcFirestoreCallableFactory.java b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/GrpcFirestoreCallableFactory.java index 9dcce3a5c..8a321d336 100644 --- a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/GrpcFirestoreCallableFactory.java +++ b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/GrpcFirestoreCallableFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 Google LLC + * Copyright 2020 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/GrpcFirestoreStub.java b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/GrpcFirestoreStub.java index 3c3b1d900..789d7806e 100644 --- a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/GrpcFirestoreStub.java +++ b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/stub/GrpcFirestoreStub.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 Google LLC + * Copyright 2020 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/FirestoreClientTest.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/FirestoreClientTest.java index f2635c0a4..09a3cf899 100644 --- a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/FirestoreClientTest.java +++ b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/FirestoreClientTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 Google LLC + * Copyright 2020 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,6 +16,7 @@ package com.google.cloud.firestore.v1beta1; import static com.google.cloud.firestore.v1beta1.FirestoreClient.ListCollectionIdsPagedResponse; +import static com.google.cloud.firestore.v1beta1.FirestoreClient.ListDocumentsPagedResponse; import com.google.api.gax.core.NoCredentialsProvider; import com.google.api.gax.grpc.GaxGrpcProperties; @@ -37,12 +38,16 @@ import com.google.firestore.v1beta1.BeginTransactionResponse; import com.google.firestore.v1beta1.CommitRequest; import com.google.firestore.v1beta1.CommitResponse; +import com.google.firestore.v1beta1.CreateDocumentRequest; import com.google.firestore.v1beta1.DatabaseRootName; import com.google.firestore.v1beta1.DeleteDocumentRequest; import com.google.firestore.v1beta1.Document; import com.google.firestore.v1beta1.DocumentMask; +import com.google.firestore.v1beta1.GetDocumentRequest; import com.google.firestore.v1beta1.ListCollectionIdsRequest; import com.google.firestore.v1beta1.ListCollectionIdsResponse; +import com.google.firestore.v1beta1.ListDocumentsRequest; +import com.google.firestore.v1beta1.ListDocumentsResponse; import com.google.firestore.v1beta1.ListenRequest; import com.google.firestore.v1beta1.ListenResponse; import com.google.firestore.v1beta1.RollbackRequest; @@ -108,6 +113,174 @@ public void tearDown() throws Exception { client.close(); } + @Test + @SuppressWarnings("all") + public void getDocumentTest() { + String name2 = "name2-1052831874"; + Document expectedResponse = Document.newBuilder().setName(name2).build(); + mockFirestore.addResponse(expectedResponse); + + AnyPathName name = AnyPathName.of("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]"); + GetDocumentRequest request = GetDocumentRequest.newBuilder().setName(name.toString()).build(); + + Document actualResponse = client.getDocument(request); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockFirestore.getRequests(); + Assert.assertEquals(1, actualRequests.size()); + GetDocumentRequest actualRequest = (GetDocumentRequest) actualRequests.get(0); + + Assert.assertEquals(name, AnyPathName.parse(actualRequest.getName())); + Assert.assertTrue( + channelProvider.isHeaderSent( + ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), + GaxGrpcProperties.getDefaultApiClientHeaderPattern())); + } + + @Test + @SuppressWarnings("all") + public void getDocumentExceptionTest() throws Exception { + StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT); + mockFirestore.addException(exception); + + try { + AnyPathName name = AnyPathName.of("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]"); + GetDocumentRequest request = GetDocumentRequest.newBuilder().setName(name.toString()).build(); + + client.getDocument(request); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception + } + } + + @Test + @SuppressWarnings("all") + public void listDocumentsTest() { + String nextPageToken = ""; + Document documentsElement = Document.newBuilder().build(); + List documents = Arrays.asList(documentsElement); + ListDocumentsResponse expectedResponse = + ListDocumentsResponse.newBuilder() + .setNextPageToken(nextPageToken) + .addAllDocuments(documents) + .build(); + mockFirestore.addResponse(expectedResponse); + + String formattedParent = + AnyPathName.format("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]"); + String collectionId = "collectionId-821242276"; + ListDocumentsRequest request = + ListDocumentsRequest.newBuilder() + .setParent(formattedParent) + .setCollectionId(collectionId) + .build(); + + ListDocumentsPagedResponse pagedListResponse = client.listDocuments(request); + + List resources = Lists.newArrayList(pagedListResponse.iterateAll()); + Assert.assertEquals(1, resources.size()); + Assert.assertEquals(expectedResponse.getDocumentsList().get(0), resources.get(0)); + + List actualRequests = mockFirestore.getRequests(); + Assert.assertEquals(1, actualRequests.size()); + ListDocumentsRequest actualRequest = (ListDocumentsRequest) actualRequests.get(0); + + Assert.assertEquals(formattedParent, actualRequest.getParent()); + Assert.assertEquals(collectionId, actualRequest.getCollectionId()); + Assert.assertTrue( + channelProvider.isHeaderSent( + ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), + GaxGrpcProperties.getDefaultApiClientHeaderPattern())); + } + + @Test + @SuppressWarnings("all") + public void listDocumentsExceptionTest() throws Exception { + StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT); + mockFirestore.addException(exception); + + try { + String formattedParent = + AnyPathName.format("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]"); + String collectionId = "collectionId-821242276"; + ListDocumentsRequest request = + ListDocumentsRequest.newBuilder() + .setParent(formattedParent) + .setCollectionId(collectionId) + .build(); + + client.listDocuments(request); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception + } + } + + @Test + @SuppressWarnings("all") + public void createDocumentTest() { + String name = "name3373707"; + Document expectedResponse = Document.newBuilder().setName(name).build(); + mockFirestore.addResponse(expectedResponse); + + String formattedParent = + AnyPathName.format("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]"); + String collectionId = "collectionId-821242276"; + String documentId = "documentId506676927"; + Document document = Document.newBuilder().build(); + CreateDocumentRequest request = + CreateDocumentRequest.newBuilder() + .setParent(formattedParent) + .setCollectionId(collectionId) + .setDocumentId(documentId) + .setDocument(document) + .build(); + + Document actualResponse = client.createDocument(request); + Assert.assertEquals(expectedResponse, actualResponse); + + List actualRequests = mockFirestore.getRequests(); + Assert.assertEquals(1, actualRequests.size()); + CreateDocumentRequest actualRequest = (CreateDocumentRequest) actualRequests.get(0); + + Assert.assertEquals(formattedParent, actualRequest.getParent()); + Assert.assertEquals(collectionId, actualRequest.getCollectionId()); + Assert.assertEquals(documentId, actualRequest.getDocumentId()); + Assert.assertEquals(document, actualRequest.getDocument()); + Assert.assertTrue( + channelProvider.isHeaderSent( + ApiClientHeaderProvider.getDefaultApiClientHeaderKey(), + GaxGrpcProperties.getDefaultApiClientHeaderPattern())); + } + + @Test + @SuppressWarnings("all") + public void createDocumentExceptionTest() throws Exception { + StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT); + mockFirestore.addException(exception); + + try { + String formattedParent = + AnyPathName.format("[PROJECT]", "[DATABASE]", "[DOCUMENT]", "[ANY_PATH]"); + String collectionId = "collectionId-821242276"; + String documentId = "documentId506676927"; + Document document = Document.newBuilder().build(); + CreateDocumentRequest request = + CreateDocumentRequest.newBuilder() + .setParent(formattedParent) + .setCollectionId(collectionId) + .setDocumentId(documentId) + .setDocument(document) + .build(); + + client.createDocument(request); + Assert.fail("No exception raised"); + } catch (InvalidArgumentException e) { + // Expected exception + } + } + @Test @SuppressWarnings("all") public void updateDocumentTest() { diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/MockFirestore.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/MockFirestore.java index 1e478f8c4..2343b988e 100644 --- a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/MockFirestore.java +++ b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/MockFirestore.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 Google LLC + * Copyright 2020 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/MockFirestoreImpl.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/MockFirestoreImpl.java index 8edf1fc8b..c4e8e65a3 100644 --- a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/MockFirestoreImpl.java +++ b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1beta1/MockFirestoreImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2019 Google LLC + * Copyright 2020 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/synth.metadata b/synth.metadata index 94049b681..14ed5f1b2 100644 --- a/synth.metadata +++ b/synth.metadata @@ -1,28 +1,19 @@ { - "updateTime": "2020-03-25T17:37:29.133752Z", + "updateTime": "2020-03-26T03:27:35.869486Z", "sources": [ - { - "generator": { - "name": "artman", - "version": "1.1.1", - "dockerImage": "googleapis/artman@sha256:5ef340c8d9334719bc5c6981d95f4a5d2737b0a6a24f2b9a0d430e96fff85c5b" - } - }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "fd83ab212176a1042e8d45ea90766b3bf59ac679", - "internalRef": "302913609", - "log": "fd83ab212176a1042e8d45ea90766b3bf59ac679\nfix: migrate osconfig/agentendpoint/v1 go_gapic_library target to microgen impl\n\nPiperOrigin-RevId: 302913609\n\n0e07113e776bdd8fcc0783372e08bb6e76cb1b5b\ndocs: Update documentation with links to smart home developer guides and reference pages. Remove outdated authorization instructions.\n\nPiperOrigin-RevId: 302892245\n\n" + "sha": "d4aa417ed2bba89c2d216900282bddfdafef6128", + "internalRef": "303010132" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "e36822bfa0acb355502dab391b8ef9c4f30208d8", - "log": "e36822bfa0acb355502dab391b8ef9c4f30208d8\nchore(java): treat samples shared configuration dependency update as chore (#457)\n\n\n1b4cc80a7aaf164f6241937dd87f3bd1f4149e0c\nfix: do not run node 8 CI (#456)\n\n\n" + "sha": "e36822bfa0acb355502dab391b8ef9c4f30208d8" } } ], @@ -33,8 +24,7 @@ "apiName": "firestore-admin", "apiVersion": "v1", "language": "java", - "generator": "gapic", - "config": "google/firestore/admin/artman_firestore_v1.yaml" + "generator": "bazel" } }, { @@ -43,8 +33,7 @@ "apiName": "firestore", "apiVersion": "v1", "language": "java", - "generator": "gapic", - "config": "google/firestore/artman_firestore_v1.yaml" + "generator": "bazel" } }, { @@ -53,8 +42,7 @@ "apiName": "firestore", "apiVersion": "v1beta1", "language": "java", - "generator": "gapic", - "config": "google/firestore/artman_firestore.yaml" + "generator": "bazel" } } ] diff --git a/synth.py b/synth.py index 03f6f8c49..2f2a98d88 100644 --- a/synth.py +++ b/synth.py @@ -118,7 +118,7 @@ def generate_client(service, version, proto_path=None, bazel_target=None, packag firestore_v1beta1 = generate_client( service='firestore', version='v1beta1', - include_gapic=False + include_gapic=True ) java.common_templates(excludes=[ @@ -127,3 +127,25 @@ def generate_client(service, version, proto_path=None, bazel_target=None, packag # due to the default project running datastore '.kokoro/presubmit/integration.cfg' ]) + +# Mark v1beta1 as deprecated +s.replace( + "google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/FirestoreClient.java", + "public class FirestoreClient", + "@Deprecated\npublic class FirestoreClient" +) +s.replace( + "google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/FirestoreClient.java", + "\\*\\/\\n@Generated\\(\"by gapic-generator\"\\)", + "*\n * @deprecated Use com.google.cloud.firestore.v1.FirestoreClient instead\n */\n@Generated(\"by gapic-generator\")" +) +s.replace( + "google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/FirestoreSettings.java", + "public class FirestoreSettings", + "@Deprecated\npublic class FirestoreSettings" +) +s.replace( + "google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1beta1/FirestoreSettings.java", + "\\*\\/\\n@Generated\\(\"by gapic-generator\"\\)", + "*\n * @deprecated Use com.google.cloud.firestore.v1.FirestoreSettings instead\n */\n@Generated(\"by gapic-generator\")" +)