From a27dd9cb0e2681a15eae754c97255d0d8c86bcae Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 5 Aug 2021 09:21:31 -0700 Subject: [PATCH] feat: gapic-generator-java v1.0.13, mtls support (#712) * chore: release gapic-generator-java v1.0.12 Committer: @miraleung PiperOrigin-RevId: 378718217 Source-Author: Google APIs Source-Date: Thu Jun 10 13:08:49 2021 -0700 Source-Repo: googleapis/googleapis Source-Sha: 08c4eeb531c01ad031134dca94b18e3f7dd35902 Source-Link: https://github.com/googleapis/googleapis/commit/08c4eeb531c01ad031134dca94b18e3f7dd35902 * chore: release gapic-generator-java v1.0.13 Committer: @miraleung PiperOrigin-RevId: 379784268 Source-Author: Google APIs Source-Date: Wed Jun 16 12:29:58 2021 -0700 Source-Repo: googleapis/googleapis Source-Sha: 551681f25e36b11829e87e580281350461f4f3f5 Source-Link: https://github.com/googleapis/googleapis/commit/551681f25e36b11829e87e580281350461f4f3f5 Co-authored-by: Neenu Shaji --- .../firestore/v1/stub/FirestoreAdminStubSettings.java | 7 +++++++ .../cloud/firestore/v1/stub/FirestoreStubSettings.java | 7 +++++++ .../google/firestore/admin/v1/CollectionGroupName.java | 6 +++--- .../java/com/google/firestore/admin/v1/DatabaseName.java | 4 ++-- .../java/com/google/firestore/admin/v1/FieldName.java | 8 ++++---- .../java/com/google/firestore/admin/v1/IndexName.java | 8 ++++---- synth.metadata | 4 ++-- 7 files changed, 29 insertions(+), 15 deletions(-) diff --git a/google-cloud-firestore-admin/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 index ae1dbe22f..c2bbfcb97 100644 --- a/google-cloud-firestore-admin/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 @@ -336,6 +336,11 @@ public static String getDefaultEndpoint() { return "firestore.googleapis.com:443"; } + /** Returns the default mTLS service endpoint. */ + public static String getDefaultMtlsEndpoint() { + return "firestore.mtls.googleapis.com:443"; + } + /** Returns the default service scopes. */ public static List getDefaultServiceScopes() { return DEFAULT_SERVICE_SCOPES; @@ -543,6 +548,8 @@ private static Builder createDefault() { builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build()); builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build()); builder.setEndpoint(getDefaultEndpoint()); + builder.setMtlsEndpoint(getDefaultMtlsEndpoint()); + builder.setSwitchToMtlsEndpointAllowed(true); return initDefaults(builder); } diff --git a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreStubSettings.java b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreStubSettings.java index 9b3560334..d1fc98256 100644 --- a/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreStubSettings.java +++ b/google-cloud-firestore/src/main/java/com/google/cloud/firestore/v1/stub/FirestoreStubSettings.java @@ -414,6 +414,11 @@ public static String getDefaultEndpoint() { return "firestore.googleapis.com:443"; } + /** Returns the default mTLS service endpoint. */ + public static String getDefaultMtlsEndpoint() { + return "firestore.mtls.googleapis.com:443"; + } + /** Returns the default service scopes. */ public static List getDefaultServiceScopes() { return DEFAULT_SERVICE_SCOPES; @@ -704,6 +709,8 @@ private static Builder createDefault() { builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build()); builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build()); builder.setEndpoint(getDefaultEndpoint()); + builder.setMtlsEndpoint(getDefaultMtlsEndpoint()); + builder.setSwitchToMtlsEndpointAllowed(true); return initDefaults(builder); } diff --git a/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/CollectionGroupName.java b/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/CollectionGroupName.java index 220aa164a..5accac5ab 100644 --- a/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/CollectionGroupName.java +++ b/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/CollectionGroupName.java @@ -211,9 +211,9 @@ public Builder setCollection(String collection) { } private Builder(CollectionGroupName collectionGroupName) { - project = collectionGroupName.project; - database = collectionGroupName.database; - collection = collectionGroupName.collection; + this.project = collectionGroupName.project; + this.database = collectionGroupName.database; + this.collection = collectionGroupName.collection; } public CollectionGroupName build() { diff --git a/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/DatabaseName.java b/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/DatabaseName.java index b86af52e8..fe882d8ce 100644 --- a/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/DatabaseName.java +++ b/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/DatabaseName.java @@ -181,8 +181,8 @@ public Builder setDatabase(String database) { } private Builder(DatabaseName databaseName) { - project = databaseName.project; - database = databaseName.database; + this.project = databaseName.project; + this.database = databaseName.database; } public DatabaseName build() { diff --git a/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/FieldName.java b/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/FieldName.java index 1032bc5a3..2129adb9f 100644 --- a/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/FieldName.java +++ b/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/FieldName.java @@ -247,10 +247,10 @@ public Builder setField(String field) { } private Builder(FieldName fieldName) { - project = fieldName.project; - database = fieldName.database; - collection = fieldName.collection; - field = fieldName.field; + this.project = fieldName.project; + this.database = fieldName.database; + this.collection = fieldName.collection; + this.field = fieldName.field; } public FieldName build() { diff --git a/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/IndexName.java b/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/IndexName.java index b21ffaecf..85b7eaa17 100644 --- a/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/IndexName.java +++ b/proto-google-cloud-firestore-admin-v1/src/main/java/com/google/firestore/admin/v1/IndexName.java @@ -247,10 +247,10 @@ public Builder setIndex(String index) { } private Builder(IndexName indexName) { - project = indexName.project; - database = indexName.database; - collection = indexName.collection; - index = indexName.index; + this.project = indexName.project; + this.database = indexName.database; + this.collection = indexName.collection; + this.index = indexName.index; } public IndexName build() { diff --git a/synth.metadata b/synth.metadata index f3695d769..78fbe692d 100644 --- a/synth.metadata +++ b/synth.metadata @@ -11,8 +11,8 @@ "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "9e3105549a35520f215359065c11e8dce15e18af", - "internalRef": "378266372" + "sha": "551681f25e36b11829e87e580281350461f4f3f5", + "internalRef": "379784268" } }, {