From 03ef755dd164e6f1ec749f3f985b913b5ae23d14 Mon Sep 17 00:00:00 2001 From: BenWhitehead Date: Tue, 28 Jul 2020 13:26:33 -0400 Subject: [PATCH] chore!: move FirestoreAdminClient and associated classes to new artifact google-cloud-firestore-admin (#311) * All classes are retained in the new artifact * New version defined in versions.txt for new artifact * For now, version number is set to be the same as google-cloud-firestore --- google-cloud-firestore-admin/pom.xml | 144 ++++++++++ .../firestore/v1/FirestoreAdminClient.java | 0 .../firestore/v1/FirestoreAdminSettings.java | 0 .../cloud/firestore/v1/package-info.java | 41 +++ .../firestore/v1/stub/FirestoreAdminStub.java | 0 .../v1/stub/FirestoreAdminStubSettings.java | 0 .../GrpcFirestoreAdminCallableFactory.java | 0 .../v1/stub/GrpcFirestoreAdminStub.java | 0 .../v1/FirestoreAdminClientTest.java | 0 .../firestore/v1/MockFirestoreAdmin.java | 0 .../firestore/v1/MockFirestoreAdminImpl.java | 0 google-cloud-firestore-bom/pom.xml | 5 + .../clirr-ignored-differences.xml | 9 + google-cloud-firestore/pom.xml | 9 - pom.xml | 1 + synth.metadata | 251 +----------------- synth.py | 5 +- versions.txt | 1 + 18 files changed, 208 insertions(+), 258 deletions(-) create mode 100644 google-cloud-firestore-admin/pom.xml rename {google-cloud-firestore => google-cloud-firestore-admin}/src/main/java/com/google/cloud/firestore/v1/FirestoreAdminClient.java (100%) rename {google-cloud-firestore => google-cloud-firestore-admin}/src/main/java/com/google/cloud/firestore/v1/FirestoreAdminSettings.java (100%) create mode 100644 google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/package-info.java rename {google-cloud-firestore => google-cloud-firestore-admin}/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreAdminStub.java (100%) rename {google-cloud-firestore => google-cloud-firestore-admin}/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreAdminStubSettings.java (100%) rename {google-cloud-firestore => google-cloud-firestore-admin}/src/main/java/com/google/cloud/firestore/v1/stub/GrpcFirestoreAdminCallableFactory.java (100%) rename {google-cloud-firestore => google-cloud-firestore-admin}/src/main/java/com/google/cloud/firestore/v1/stub/GrpcFirestoreAdminStub.java (100%) rename {google-cloud-firestore => google-cloud-firestore-admin}/src/test/java/com/google/cloud/firestore/v1/FirestoreAdminClientTest.java (100%) rename {google-cloud-firestore => google-cloud-firestore-admin}/src/test/java/com/google/cloud/firestore/v1/MockFirestoreAdmin.java (100%) rename {google-cloud-firestore => google-cloud-firestore-admin}/src/test/java/com/google/cloud/firestore/v1/MockFirestoreAdminImpl.java (100%) diff --git a/google-cloud-firestore-admin/pom.xml b/google-cloud-firestore-admin/pom.xml new file mode 100644 index 000000000..88546332b --- /dev/null +++ b/google-cloud-firestore-admin/pom.xml @@ -0,0 +1,144 @@ + + + 4.0.0 + google-cloud-firestore-admin + 1.35.3-SNAPSHOT + jar + Google Cloud Firestore Admin Client + https://github.com/googleapis/java-firestore/tree/master + + + Java idiomatic client for Google Cloud Firestore Admin API. + + + com.google.cloud + google-cloud-firestore-parent + 1.35.3-SNAPSHOT + + + + com.google.api.grpc + proto-google-cloud-firestore-admin-v1 + + + com.google.api.grpc + grpc-google-cloud-firestore-admin-v1 + test + + + com.google.api + api-common + + + io.grpc + grpc-protobuf + + + com.google.protobuf + protobuf-java + + + com.google.api.grpc + proto-google-common-protos + + + com.google.api + gax + + + io.grpc + grpc-api + + + com.google.api + gax-grpc + + + com.google.guava + guava + + + org.threeten + threetenbp + + + io.grpc + grpc-stub + + + + + + junit + junit + test + + + + com.google.api + gax-grpc + testlib + test + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.2.0 + + protected + true + none + true + + + ${project.javadoc.protobufBaseURL} + ../../../../../google-api-grpc/proto-google-cloud-firestore-admin-v1/target/site/apidocs/ + + + ${project.javadoc.protobufBaseURL} + ../../../../../google-api-grpc/grpc-google-cloud-firestore-admin-v1/target/site/apidocs/ + + + ${project.javadoc.protobufBaseURL} + ../../../../../google-api-grpc/proto-google-cloud-firestore-v1/target/site/apidocs/ + + + ${project.javadoc.protobufBaseURL} + ../../../../../google-api-grpc/grpc-google-cloud-firestore-v1/target/site/apidocs/ + + + + + + + + + + + org.codehaus.mojo + flatten-maven-plugin + + + + + + + java9 + + [9,) + + + + javax.annotation + javax.annotation-api + + + + + diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/FirestoreAdminClient.java b/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/FirestoreAdminClient.java similarity index 100% rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/FirestoreAdminClient.java rename to google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/FirestoreAdminClient.java diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/FirestoreAdminSettings.java b/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/FirestoreAdminSettings.java similarity index 100% rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/FirestoreAdminSettings.java rename to google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/FirestoreAdminSettings.java diff --git a/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/package-info.java b/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/package-info.java new file mode 100644 index 000000000..3b9c59cb7 --- /dev/null +++ b/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/package-info.java @@ -0,0 +1,41 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * A client to Google Cloud Firestore Admin API. + * + *

The interfaces provided are listed below, along with usage samples. + * + *

==================== FirestoreAdminClient ==================== + * + *

Service Description: Operations are created by service `FirestoreAdmin`, but are accessed via + * service `google.longrunning.Operations`. + * + *

Sample for FirestoreAdminClient: + * + * 

+ * 
+ * try (FirestoreAdminClient firestoreAdminClient = FirestoreAdminClient.create()) {
+ *   IndexName name = IndexName.of("[PROJECT]", "[DATABASE]", "[COLLECTION]", "[INDEX]");
+ *   firestoreAdminClient.deleteIndex(name);
+ * }
+ * 
+ *
+ */ +@Generated("by gapic-generator") +package com.google.cloud.firestore.v1; + +import javax.annotation.Generated; diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreAdminStub.java b/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreAdminStub.java similarity index 100% rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreAdminStub.java rename to google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreAdminStub.java diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreAdminStubSettings.java b/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreAdminStubSettings.java similarity index 100% rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreAdminStubSettings.java rename to google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreAdminStubSettings.java diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/GrpcFirestoreAdminCallableFactory.java b/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/GrpcFirestoreAdminCallableFactory.java similarity index 100% rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/GrpcFirestoreAdminCallableFactory.java rename to google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/GrpcFirestoreAdminCallableFactory.java diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/GrpcFirestoreAdminStub.java b/google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/GrpcFirestoreAdminStub.java similarity index 100% rename from google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/GrpcFirestoreAdminStub.java rename to google-cloud-firestore-admin/src/main/java/com/google/cloud/firestore/v1/stub/GrpcFirestoreAdminStub.java diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/FirestoreAdminClientTest.java b/google-cloud-firestore-admin/src/test/java/com/google/cloud/firestore/v1/FirestoreAdminClientTest.java similarity index 100% rename from google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/FirestoreAdminClientTest.java rename to google-cloud-firestore-admin/src/test/java/com/google/cloud/firestore/v1/FirestoreAdminClientTest.java diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/MockFirestoreAdmin.java b/google-cloud-firestore-admin/src/test/java/com/google/cloud/firestore/v1/MockFirestoreAdmin.java similarity index 100% rename from google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/MockFirestoreAdmin.java rename to google-cloud-firestore-admin/src/test/java/com/google/cloud/firestore/v1/MockFirestoreAdmin.java diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/MockFirestoreAdminImpl.java b/google-cloud-firestore-admin/src/test/java/com/google/cloud/firestore/v1/MockFirestoreAdminImpl.java similarity index 100% rename from google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/MockFirestoreAdminImpl.java rename to google-cloud-firestore-admin/src/test/java/com/google/cloud/firestore/v1/MockFirestoreAdminImpl.java diff --git a/google-cloud-firestore-bom/pom.xml b/google-cloud-firestore-bom/pom.xml index 96e65bfea..1cb885d09 100644 --- a/google-cloud-firestore-bom/pom.xml +++ b/google-cloud-firestore-bom/pom.xml @@ -85,6 +85,11 @@ grpc-google-cloud-firestore-v1 1.35.3-SNAPSHOT + + com.google.cloud + google-cloud-firestore-admin + 1.35.3-SNAPSHOT + diff --git a/google-cloud-firestore/clirr-ignored-differences.xml b/google-cloud-firestore/clirr-ignored-differences.xml index 41b433013..53b346d09 100644 --- a/google-cloud-firestore/clirr-ignored-differences.xml +++ b/google-cloud-firestore/clirr-ignored-differences.xml @@ -133,4 +133,13 @@ com.google.cloud.firestore.v1.FirestoreAdminClient$List*PagedResponse list*(com.google.firestore.admin.v1.CollectionGroupName) + + + 8001 + com/google/cloud/firestore/v1/**/*FirestoreAdmin* + * + + diff --git a/google-cloud-firestore/pom.xml b/google-cloud-firestore/pom.xml index ed798763d..c31d5ffd4 100644 --- a/google-cloud-firestore/pom.xml +++ b/google-cloud-firestore/pom.xml @@ -25,10 +25,6 @@ ${project.groupId} google-cloud-core-grpc - - com.google.api.grpc - proto-google-cloud-firestore-admin-v1 - com.google.api.grpc proto-google-cloud-firestore-v1 @@ -37,11 +33,6 @@ com.google.auto.value auto-value-annotations - - com.google.api.grpc - grpc-google-cloud-firestore-admin-v1 - test - com.google.api.grpc grpc-google-cloud-firestore-v1 diff --git a/pom.xml b/pom.xml index 0f5e7c08e..20174cf0d 100644 --- a/pom.xml +++ b/pom.xml @@ -211,6 +211,7 @@ proto-google-cloud-firestore-v1 grpc-google-cloud-firestore-admin-v1 grpc-google-cloud-firestore-v1 + google-cloud-firestore-admin google-cloud-firestore google-cloud-firestore-bom diff --git a/synth.metadata b/synth.metadata index c20b7e6ff..3a1615596 100644 --- a/synth.metadata +++ b/synth.metadata @@ -3,8 +3,8 @@ { "git": { "name": ".", - "remote": "https://github.com/googleapis/java-firestore.git", - "sha": "8448c31047e7db0416dffbd17c2f17e2a70df39e" + "remote": "git@github.com:BenWhitehead/java-firestore.git", + "sha": "96adacbf52ace27e54b7a210d7c73b46922fbcbd" } }, { @@ -42,250 +42,5 @@ "generator": "bazel" } } - ], - "generatedFiles": [ - ".github/CODEOWNERS", - ".github/ISSUE_TEMPLATE/bug_report.md", - ".github/ISSUE_TEMPLATE/feature_request.md", - ".github/ISSUE_TEMPLATE/support_request.md", - ".github/PULL_REQUEST_TEMPLATE.md", - ".github/release-please.yml", - ".github/trusted-contribution.yml", - ".github/workflows/ci.yaml", - ".kokoro/build.bat", - ".kokoro/build.sh", - ".kokoro/coerce_logs.sh", - ".kokoro/common.cfg", - ".kokoro/common.sh", - ".kokoro/continuous/common.cfg", - ".kokoro/continuous/dependencies.cfg", - ".kokoro/continuous/integration.cfg", - ".kokoro/continuous/java11.cfg", - ".kokoro/continuous/java7.cfg", - ".kokoro/continuous/java8-osx.cfg", - ".kokoro/continuous/java8-win.cfg", - ".kokoro/continuous/java8.cfg", - ".kokoro/continuous/lint.cfg", - ".kokoro/continuous/propose_release.cfg", - ".kokoro/continuous/samples.cfg", - ".kokoro/dependencies.sh", - ".kokoro/linkage-monitor.sh", - ".kokoro/nightly/common.cfg", - ".kokoro/nightly/dependencies.cfg", - ".kokoro/nightly/java11.cfg", - ".kokoro/nightly/java7.cfg", - ".kokoro/nightly/java8-osx.cfg", - ".kokoro/nightly/java8-win.cfg", - ".kokoro/nightly/java8.cfg", - ".kokoro/nightly/lint.cfg", - ".kokoro/populate-secrets.sh", - ".kokoro/presubmit/clirr.cfg", - ".kokoro/presubmit/common.cfg", - ".kokoro/presubmit/dependencies.cfg", - ".kokoro/presubmit/java11.cfg", - ".kokoro/presubmit/java7.cfg", - ".kokoro/presubmit/java8-osx.cfg", - ".kokoro/presubmit/java8-win.cfg", - ".kokoro/presubmit/java8.cfg", - ".kokoro/presubmit/linkage-monitor.cfg", - ".kokoro/presubmit/lint.cfg", - ".kokoro/release/bump_snapshot.cfg", - ".kokoro/release/common.cfg", - ".kokoro/release/common.sh", - ".kokoro/release/drop.cfg", - ".kokoro/release/drop.sh", - ".kokoro/release/promote.cfg", - ".kokoro/release/promote.sh", - ".kokoro/release/publish_javadoc.cfg", - ".kokoro/release/publish_javadoc.sh", - ".kokoro/release/snapshot.cfg", - ".kokoro/release/snapshot.sh", - ".kokoro/release/stage.cfg", - ".kokoro/release/stage.sh", - ".kokoro/trampoline.sh", - "CODE_OF_CONDUCT.md", - "CONTRIBUTING.md", - "LICENSE", - "README.md", - "codecov.yaml", - "google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/FirestoreAdminClient.java", - "google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/FirestoreAdminSettings.java", - "google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/FirestoreClient.java", - "google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/FirestoreSettings.java", - "google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/package-info.java", - "google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreAdminStub.java", - "google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreAdminStubSettings.java", - "google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreStub.java", - "google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreStubSettings.java", - "google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/GrpcFirestoreAdminCallableFactory.java", - "google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/GrpcFirestoreAdminStub.java", - "google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/GrpcFirestoreCallableFactory.java", - "google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/GrpcFirestoreStub.java", - "google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/FirestoreAdminClientTest.java", - "google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/FirestoreClientTest.java", - "google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/MockFirestore.java", - "google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/MockFirestoreAdmin.java", - "google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/MockFirestoreAdminImpl.java", - "google-cloud-firestore/src/test/java/com/google/cloud/firestore/v1/MockFirestoreImpl.java", - "grpc-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/FirestoreAdminGrpc.java", - "grpc-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/FirestoreGrpc.java", - "java.header", - "license-checks.xml", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/CollectionGroupName.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/CreateIndexRequest.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/CreateIndexRequestOrBuilder.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/DatabaseName.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/DeleteIndexRequest.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/DeleteIndexRequestOrBuilder.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ExportDocumentsMetadata.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ExportDocumentsMetadataOrBuilder.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ExportDocumentsRequest.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ExportDocumentsRequestOrBuilder.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ExportDocumentsResponse.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ExportDocumentsResponseOrBuilder.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/Field.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/FieldName.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/FieldOperationMetadata.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/FieldOperationMetadataOrBuilder.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/FieldOrBuilder.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/FieldProto.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/FirestoreAdminProto.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/GetFieldRequest.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/GetFieldRequestOrBuilder.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/GetIndexRequest.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/GetIndexRequestOrBuilder.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ImportDocumentsMetadata.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ImportDocumentsMetadataOrBuilder.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ImportDocumentsRequest.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ImportDocumentsRequestOrBuilder.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/Index.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/IndexName.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/IndexOperationMetadata.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/IndexOperationMetadataOrBuilder.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/IndexOrBuilder.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/IndexProto.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ListFieldsRequest.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ListFieldsRequestOrBuilder.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ListFieldsResponse.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ListFieldsResponseOrBuilder.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ListIndexesRequest.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ListIndexesRequestOrBuilder.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ListIndexesResponse.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ListIndexesResponseOrBuilder.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/LocationMetadata.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/LocationMetadataOrBuilder.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/LocationProto.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/OperationProto.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/OperationState.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/Progress.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/ProgressOrBuilder.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/UpdateFieldRequest.java", - "proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/UpdateFieldRequestOrBuilder.java", - "proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/field.proto", - "proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/firestore_admin.proto", - "proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/index.proto", - "proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/location.proto", - "proto-google-cloud-firestore-admin-v1/src/main/proto/google/firestore/admin/v1/operation.proto", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ArrayValue.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ArrayValueOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/BatchGetDocumentsRequest.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/BatchGetDocumentsRequestOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/BatchGetDocumentsResponse.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/BatchGetDocumentsResponseOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/BatchWriteRequest.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/BatchWriteRequestOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/BatchWriteResponse.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/BatchWriteResponseOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/BeginTransactionRequest.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/BeginTransactionRequestOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/BeginTransactionResponse.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/BeginTransactionResponseOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/CommitRequest.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/CommitRequestOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/CommitResponse.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/CommitResponseOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/CommonProto.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/CreateDocumentRequest.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/CreateDocumentRequestOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/Cursor.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/CursorOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DeleteDocumentRequest.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DeleteDocumentRequestOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/Document.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentChange.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentChangeOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentDelete.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentDeleteOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentMask.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentMaskOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentProto.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentRemove.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentRemoveOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentTransform.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/DocumentTransformOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ExistenceFilter.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ExistenceFilterOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/FirestoreProto.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/GetDocumentRequest.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/GetDocumentRequestOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListCollectionIdsRequest.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListCollectionIdsRequestOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListCollectionIdsResponse.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListCollectionIdsResponseOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListDocumentsRequest.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListDocumentsRequestOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListDocumentsResponse.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListDocumentsResponseOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListenRequest.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListenRequestOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListenResponse.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ListenResponseOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/MapValue.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/MapValueOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/PartitionQueryRequest.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/PartitionQueryRequestOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/PartitionQueryResponse.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/PartitionQueryResponseOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/Precondition.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/PreconditionOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/QueryProto.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/RollbackRequest.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/RollbackRequestOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/RunQueryRequest.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/RunQueryRequestOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/RunQueryResponse.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/RunQueryResponseOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/StructuredQuery.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/StructuredQueryOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/Target.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/TargetChange.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/TargetChangeOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/TargetOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/TransactionOptions.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/TransactionOptionsOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/UpdateDocumentRequest.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/UpdateDocumentRequestOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/Value.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/ValueOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/Write.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/WriteOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/WriteProto.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/WriteRequest.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/WriteRequestOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/WriteResponse.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/WriteResponseOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/WriteResult.java", - "proto-google-cloud-firestore-v1/src/main/java/com/google/firestore/v1/WriteResultOrBuilder.java", - "proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/common.proto", - "proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/document.proto", - "proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/firestore.proto", - "proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/query.proto", - "proto-google-cloud-firestore-v1/src/main/proto/google/firestore/v1/write.proto", - "renovate.json", - "samples/install-without-bom/pom.xml", - "samples/pom.xml", - "samples/snapshot/pom.xml", - "samples/snippets/pom.xml" ] -} +} \ No newline at end of file diff --git a/synth.py b/synth.py index 55c26b092..edce13e5c 100644 --- a/synth.py +++ b/synth.py @@ -96,7 +96,10 @@ def generate_client(service, version, proto_path=None, bazel_target=None, packag java.format_code(f'grpc-google-cloud-{service}-{version}/src') java.format_code(f'proto-google-cloud-{service}-{version}/src') - if include_gapic: + if include_gapic and service == "firestore-admin": + s.copy(library / f'gapic-google-cloud-{service}-{version}-java/src', 'google-cloud-firestore-admin/src') + java.format_code(f'google-cloud-firestore-admin/src') + else: s.copy(library / f'gapic-google-cloud-{service}-{version}-java/src', 'google-cloud-firestore/src') java.format_code(f'google-cloud-firestore/src') diff --git a/versions.txt b/versions.txt index 0247fed7d..aaa0fbeed 100644 --- a/versions.txt +++ b/versions.txt @@ -2,6 +2,7 @@ # module:released-version:current-version google-cloud-firestore:1.35.2:1.35.3-SNAPSHOT +google-cloud-firestore-admin:1.35.2:1.35.3-SNAPSHOT google-cloud-firestore-bom:1.35.2:1.35.3-SNAPSHOT google-cloud-firestore-parent:1.35.2:1.35.3-SNAPSHOT grpc-google-cloud-firestore-admin-v1:1.35.2:1.35.3-SNAPSHOT