From 368f7bcbf42b763dc7a1d5a2775348ce78ed485e Mon Sep 17 00:00:00 2001 From: arithmetic1728 Date: Mon, 23 Nov 2020 18:52:39 -0800 Subject: [PATCH] [WIP] feat: add mtls feature --- dependencies.properties | 2 +- .../gapic/composer/ServiceStubSettingsClassComposer.java | 2 +- .../generator/gapic/composer/goldens/EchoStubSettings.golden | 2 +- .../gapic/composer/goldens/LoggingServiceV2StubSettings.golden | 2 +- .../gapic/composer/goldens/PublisherStubSettings.golden | 2 +- test/integration/goldens/asset/AssetServiceStubSettings.java | 2 +- .../goldens/logging/ConfigServiceV2StubSettings.java | 2 +- .../goldens/logging/LoggingServiceV2StubSettings.java | 2 +- .../goldens/logging/MetricsServiceV2StubSettings.java | 2 +- test/integration/goldens/redis/CloudRedisStubSettings.java | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dependencies.properties b/dependencies.properties index 2f19850041..0cf633bad9 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -12,7 +12,7 @@ version.com_google_protobuf=3.13.0 version.google_java_format=1.7 version.com_google_api_common_java=1.9.3 # TODO(miraleung): Update this. -version.com_google_gax_java=1.59.0 +version.com_google_gax_java=1.60.1 version.io_grpc_java=1.30.2 # Common deps. diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceStubSettingsClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceStubSettingsClassComposer.java index 46e458100b..3539132e23 100644 --- a/src/main/java/com/google/api/generator/gapic/composer/ServiceStubSettingsClassComposer.java +++ b/src/main/java/com/google/api/generator/gapic/composer/ServiceStubSettingsClassComposer.java @@ -1648,7 +1648,7 @@ private static MethodDefinition createNestedClassCreateDefaultMethod( bodyExprs.add( MethodInvocationExpr.builder() .setExprReferenceExpr(builderVarExpr) - .setMethodName("setEndpoint") + .setMethodName("setOverridableEndpoint") .setArguments( MethodInvocationExpr.builder().setMethodName("getDefaultEndpoint").build()) .build()); diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoStubSettings.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoStubSettings.golden index cd52c7c439..20a7510bf5 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoStubSettings.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/EchoStubSettings.golden @@ -384,7 +384,7 @@ public class EchoStubSettings extends StubSettings { builder.setTransportChannelProvider(defaultTransportChannelProvider()); builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build()); builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build()); - builder.setEndpoint(getDefaultEndpoint()); + builder.setOverridableEndpoint(getDefaultEndpoint()); return initDefaults(builder); } diff --git a/src/test/java/com/google/api/generator/gapic/composer/goldens/LoggingServiceV2StubSettings.golden b/src/test/java/com/google/api/generator/gapic/composer/goldens/LoggingServiceV2StubSettings.golden index ef336d4033..4df7a236de 100644 --- a/src/test/java/com/google/api/generator/gapic/composer/goldens/LoggingServiceV2StubSettings.golden +++ b/src/test/java/com/google/api/generator/gapic/composer/goldens/LoggingServiceV2StubSettings.golden @@ -577,7 +577,7 @@ public class LoggingServiceV2StubSettings extends StubSettings { builder.setTransportChannelProvider(defaultTransportChannelProvider()); builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build()); builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build()); - builder.setEndpoint(getDefaultEndpoint()); + builder.setOverridableEndpoint(getDefaultEndpoint()); return initDefaults(builder); } diff --git a/test/integration/goldens/asset/AssetServiceStubSettings.java b/test/integration/goldens/asset/AssetServiceStubSettings.java index be7aac6632..4ca4e6d81f 100644 --- a/test/integration/goldens/asset/AssetServiceStubSettings.java +++ b/test/integration/goldens/asset/AssetServiceStubSettings.java @@ -550,7 +550,7 @@ private static Builder createDefault() { builder.setTransportChannelProvider(defaultTransportChannelProvider()); builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build()); builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build()); - builder.setEndpoint(getDefaultEndpoint()); + builder.setOverridableEndpoint(getDefaultEndpoint()); return initDefaults(builder); } diff --git a/test/integration/goldens/logging/ConfigServiceV2StubSettings.java b/test/integration/goldens/logging/ConfigServiceV2StubSettings.java index 066f9e3d2c..6a027fca30 100644 --- a/test/integration/goldens/logging/ConfigServiceV2StubSettings.java +++ b/test/integration/goldens/logging/ConfigServiceV2StubSettings.java @@ -629,7 +629,7 @@ private static Builder createDefault() { builder.setTransportChannelProvider(defaultTransportChannelProvider()); builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build()); builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build()); - builder.setEndpoint(getDefaultEndpoint()); + builder.setOverridableEndpoint(getDefaultEndpoint()); return initDefaults(builder); } diff --git a/test/integration/goldens/logging/LoggingServiceV2StubSettings.java b/test/integration/goldens/logging/LoggingServiceV2StubSettings.java index ae0e186fd6..344e8b8e50 100644 --- a/test/integration/goldens/logging/LoggingServiceV2StubSettings.java +++ b/test/integration/goldens/logging/LoggingServiceV2StubSettings.java @@ -522,7 +522,7 @@ private static Builder createDefault() { builder.setTransportChannelProvider(defaultTransportChannelProvider()); builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build()); builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build()); - builder.setEndpoint(getDefaultEndpoint()); + builder.setOverridableEndpoint(getDefaultEndpoint()); return initDefaults(builder); } diff --git a/test/integration/goldens/logging/MetricsServiceV2StubSettings.java b/test/integration/goldens/logging/MetricsServiceV2StubSettings.java index 139c3218f3..2090ce7725 100644 --- a/test/integration/goldens/logging/MetricsServiceV2StubSettings.java +++ b/test/integration/goldens/logging/MetricsServiceV2StubSettings.java @@ -372,7 +372,7 @@ private static Builder createDefault() { builder.setTransportChannelProvider(defaultTransportChannelProvider()); builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build()); builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build()); - builder.setEndpoint(getDefaultEndpoint()); + builder.setOverridableEndpoint(getDefaultEndpoint()); return initDefaults(builder); } diff --git a/test/integration/goldens/redis/CloudRedisStubSettings.java b/test/integration/goldens/redis/CloudRedisStubSettings.java index c30e46e9d0..5df9b507b1 100644 --- a/test/integration/goldens/redis/CloudRedisStubSettings.java +++ b/test/integration/goldens/redis/CloudRedisStubSettings.java @@ -500,7 +500,7 @@ private static Builder createDefault() { builder.setTransportChannelProvider(defaultTransportChannelProvider()); builder.setCredentialsProvider(defaultCredentialsProviderBuilder().build()); builder.setInternalHeaderProvider(defaultApiClientHeaderProviderBuilder().build()); - builder.setEndpoint(getDefaultEndpoint()); + builder.setOverridableEndpoint(getDefaultEndpoint()); return initDefaults(builder); }