feat: Mark getDefaultEndpoint() with @ObsoleteApi (#2347)

lqiu96 · web-flow · commit e46648f112a1 · 2024-07-12T16:28:40.000-04:00
Client libraries no longer always use the default endpoint. The resolved
endpoint will be determined by the EndpointContext and used by the
client.
diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java
@@ -18,6 +18,7 @@
 import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.BetaApi;
+import com.google.api.core.ObsoleteApi;
 import com.google.api.gax.batching.BatchingSettings;
 import com.google.api.gax.batching.FlowControlSettings;
 import com.google.api.gax.batching.FlowController.LimitExceededBehavior;
@@ -1190,6 +1191,12 @@ private List<MethodDefinition> createDefaultHelperAndGetterMethods(
             .setReturnType(returnType)
             .setName("getDefaultEndpoint")
             .setReturnExpr(ValueExpr.withValue(StringObjectValue.withValue(service.defaultHost())))
+            .setAnnotations(
+                ImmutableList.of(
+                    AnnotationNode.builder()
+                        .setType(FIXED_TYPESTORE.get(ObsoleteApi.class.getSimpleName()))
+                        .setDescription("Use getEndpoint() instead")
+                        .build()))
             .build());
 
     // Create the getDefaultMtlsEndpoint method.
@@ -2068,6 +2075,7 @@ private static TypeStore createStaticTypes() {
             List.class,
             Lists.class,
             MonitoredResourceDescriptor.class,
+            ObsoleteApi.class,
             Operation.class,
             OperationCallSettings.class,
             OperationSnapshot.class,
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/ApiVersionTestingStubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/ApiVersionTestingStubSettings.golden
@@ -1,6 +1,7 @@
 package com.google.api.version.test.stub;
 
 import com.google.api.core.ApiFunction;
+import com.google.api.core.ObsoleteApi;
 import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -91,6 +92,7 @@ public class EchoWithVersionStubSettings extends StubSettings<EchoWithVersionStu
   }
 
   /** Returns the default service endpoint. */
+  @ObsoleteApi("Use getEndpoint() instead")
   public static String getDefaultEndpoint() {
     return "localhost:7469";
   }
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/DeprecatedServiceStubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/DeprecatedServiceStubSettings.golden
@@ -1,6 +1,7 @@
 package com.google.testdata.v1.stub;
 
 import com.google.api.core.ApiFunction;
+import com.google.api.core.ObsoleteApi;
 import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -107,6 +108,7 @@ public class DeprecatedServiceStubSettings extends StubSettings<DeprecatedServic
   }
 
   /** Returns the default service endpoint. */
+  @ObsoleteApi("Use getEndpoint() instead")
   public static String getDefaultEndpoint() {
     return "localhost:7469";
   }
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoStubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/EchoStubSettings.golden
@@ -6,6 +6,7 @@ import static com.google.showcase.v1beta1.EchoClient.SimplePagedExpandPagedRespo
 import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.BetaApi;
+import com.google.api.core.ObsoleteApi;
 import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -291,6 +292,7 @@ public class EchoStubSettings extends StubSettings<EchoStubSettings> {
   }
 
   /** Returns the default service endpoint. */
+  @ObsoleteApi("Use getEndpoint() instead")
   public static String getDefaultEndpoint() {
     return "localhost:7469";
   }
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/LoggingServiceV2StubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/LoggingServiceV2StubSettings.golden
@@ -7,6 +7,7 @@ import static com.google.logging.v2.LoggingServiceV2Client.ListMonitoredResource
 import com.google.api.MonitoredResourceDescriptor;
 import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
+import com.google.api.core.ObsoleteApi;
 import com.google.api.gax.batching.BatchingSettings;
 import com.google.api.gax.batching.FlowControlSettings;
 import com.google.api.gax.batching.FlowController;
@@ -433,6 +434,7 @@ public class LoggingServiceV2StubSettings extends StubSettings<LoggingServiceV2S
   }
 
   /** Returns the default service endpoint. */
+  @ObsoleteApi("Use getEndpoint() instead")
   public static String getDefaultEndpoint() {
     return "logging.googleapis.com:443";
   }
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/PublisherStubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/PublisherStubSettings.golden
@@ -6,6 +6,7 @@ import static com.google.pubsub.v1.PublisherClient.ListTopicsPagedResponse;
 
 import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
+import com.google.api.core.ObsoleteApi;
 import com.google.api.gax.batching.BatchingSettings;
 import com.google.api.gax.batching.FlowControlSettings;
 import com.google.api.gax.batching.FlowController;
@@ -442,6 +443,7 @@ public class PublisherStubSettings extends StubSettings<PublisherStubSettings> {
   }
 
   /** Returns the default service endpoint. */
+  @ObsoleteApi("Use getEndpoint() instead")
   public static String getDefaultEndpoint() {
     return "pubsub.googleapis.com:443";
   }
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoStubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoStubSettings.golden
@@ -6,6 +6,7 @@ import static com.google.showcase.grpcrest.v1beta1.EchoClient.SimplePagedExpandP
 import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.BetaApi;
+import com.google.api.core.ObsoleteApi;
 import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -307,6 +308,7 @@ public class EchoStubSettings extends StubSettings<EchoStubSettings> {
   }
 
   /** Returns the default service endpoint. */
+  @ObsoleteApi("Use getEndpoint() instead")
   public static String getDefaultEndpoint() {
     return "localhost:7469";
   }
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/WickedStubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/WickedStubSettings.golden
@@ -2,6 +2,7 @@ package com.google.showcase.v1beta1.stub;
 
 import com.google.api.core.ApiFunction;
 import com.google.api.core.BetaApi;
+import com.google.api.core.ObsoleteApi;
 import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -105,6 +106,7 @@ public class WickedStubSettings extends StubSettings<WickedStubSettings> {
   }
 
   /** Returns the default service endpoint. */
+  @ObsoleteApi("Use getEndpoint() instead")
   public static String getDefaultEndpoint() {
     return "localhost:7469";
   }
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceStubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceStubSettings.golden
@@ -2,6 +2,7 @@ package com.google.showcase.v1beta1.stub;
 
 import com.google.api.core.ApiFunction;
 import com.google.api.core.BetaApi;
+import com.google.api.core.ObsoleteApi;
 import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -137,6 +138,7 @@ public class ComplianceStubSettings extends StubSettings<ComplianceStubSettings>
   }
 
   /** Returns the default service endpoint. */
+  @ObsoleteApi("Use getEndpoint() instead")
   public static String getDefaultEndpoint() {
     return "localhost:7469";
   }
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonApiVersionTestingStubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonApiVersionTestingStubSettings.golden
@@ -1,6 +1,7 @@
 package com.google.api.version.test.stub;
 
 import com.google.api.core.ApiFunction;
+import com.google.api.core.ObsoleteApi;
 import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -91,6 +92,7 @@ public class EchoWithVersionStubSettings extends StubSettings<EchoWithVersionStu
   }
 
   /** Returns the default service endpoint. */
+  @ObsoleteApi("Use getEndpoint() instead")
   public static String getDefaultEndpoint() {
     return "localhost:7469";
   }
diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/ComplianceStubSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/ComplianceStubSettings.java
@@ -21,6 +21,7 @@
 import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.BetaApi;
+import com.google.api.core.ObsoleteApi;
 import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -279,6 +280,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
   }
 
   /** Returns the default service endpoint. */
+  @ObsoleteApi("Use getEndpoint() instead")
   public static String getDefaultEndpoint() {
     return "localhost:7469";
   }
diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/EchoStubSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/EchoStubSettings.java
@@ -23,6 +23,7 @@
 import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.BetaApi;
+import com.google.api.core.ObsoleteApi;
 import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -438,6 +439,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
   }
 
   /** Returns the default service endpoint. */
+  @ObsoleteApi("Use getEndpoint() instead")
   public static String getDefaultEndpoint() {
     return "localhost:7469";
   }
diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/IdentityStubSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/IdentityStubSettings.java
@@ -22,6 +22,7 @@
 import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.BetaApi;
+import com.google.api.core.ObsoleteApi;
 import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -309,6 +310,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
   }
 
   /** Returns the default service endpoint. */
+  @ObsoleteApi("Use getEndpoint() instead")
   public static String getDefaultEndpoint() {
     return "localhost:7469";
   }
diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/MessagingStubSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/MessagingStubSettings.java
@@ -23,6 +23,7 @@
 import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.BetaApi;
+import com.google.api.core.ObsoleteApi;
 import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -451,6 +452,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
   }
 
   /** Returns the default service endpoint. */
+  @ObsoleteApi("Use getEndpoint() instead")
   public static String getDefaultEndpoint() {
     return "localhost:7469";
   }
diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/SequenceServiceStubSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/SequenceServiceStubSettings.java
@@ -21,6 +21,7 @@
 import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.BetaApi;
+import com.google.api.core.ObsoleteApi;
 import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -274,6 +275,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
   }
 
   /** Returns the default service endpoint. */
+  @ObsoleteApi("Use getEndpoint() instead")
   public static String getDefaultEndpoint() {
     return "localhost:7469";
   }
diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/TestingStubSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/stub/TestingStubSettings.java
@@ -23,6 +23,7 @@
 import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.BetaApi;
+import com.google.api.core.ObsoleteApi;
 import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -391,6 +392,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
   }
 
   /** Returns the default service endpoint. */
+  @ObsoleteApi("Use getEndpoint() instead")
   public static String getDefaultEndpoint() {
     return "localhost:7469";
   }
diff --git a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/ConnectionServiceStubSettings.java b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/ConnectionServiceStubSettings.java
@@ -21,6 +21,7 @@
 import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.BetaApi;
+import com.google.api.core.ObsoleteApi;
 import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -194,6 +195,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
   }
 
   /** Returns the default service endpoint. */
+  @ObsoleteApi("Use getEndpoint() instead")
   public static String getDefaultEndpoint() {
     return "apigeeconnect.googleapis.com:443";
   }
diff --git a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/TetherStubSettings.java b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/TetherStubSettings.java
@@ -17,6 +17,7 @@
 package com.google.cloud.apigeeconnect.v1.stub;
 
 import com.google.api.core.ApiFunction;
+import com.google.api.core.ObsoleteApi;
 import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -113,6 +114,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
   }
 
   /** Returns the default service endpoint. */
+  @ObsoleteApi("Use getEndpoint() instead")
   public static String getDefaultEndpoint() {
     return "apigeeconnect.googleapis.com:443";
   }
diff --git a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/AssetServiceStubSettings.java b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/AssetServiceStubSettings.java
@@ -24,6 +24,7 @@
 import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.BetaApi;
+import com.google.api.core.ObsoleteApi;
 import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -583,6 +584,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
   }
 
   /** Returns the default service endpoint. */
+  @ObsoleteApi("Use getEndpoint() instead")
   public static String getDefaultEndpoint() {
     return "cloudasset.googleapis.com:443";
   }
diff --git a/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/stub/BigtableStubSettings.java b/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/stub/BigtableStubSettings.java
@@ -17,6 +17,7 @@
 package com.google.cloud.bigtable.data.v2.stub;
 
 import com.google.api.core.ApiFunction;
+import com.google.api.core.ObsoleteApi;
 import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -177,6 +178,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
   }
 
   /** Returns the default service endpoint. */
+  @ObsoleteApi("Use getEndpoint() instead")
   public static String getDefaultEndpoint() {
     return "bigtable.googleapis.com:443";
   }
diff --git a/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/AddressesStubSettings.java b/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/AddressesStubSettings.java
@@ -21,6 +21,7 @@
 
 import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
+import com.google.api.core.ObsoleteApi;
 import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -300,6 +301,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
   }
 
   /** Returns the default service endpoint. */
+  @ObsoleteApi("Use getEndpoint() instead")
   public static String getDefaultEndpoint() {
     return "compute.googleapis.com:443";
   }
diff --git a/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/RegionOperationsStubSettings.java b/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/RegionOperationsStubSettings.java
@@ -17,6 +17,7 @@
 package com.google.cloud.compute.v1small.stub;
 
 import com.google.api.core.ApiFunction;
+import com.google.api.core.ObsoleteApi;
 import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -125,6 +126,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
   }
 
   /** Returns the default service endpoint. */
+  @ObsoleteApi("Use getEndpoint() instead")
   public static String getDefaultEndpoint() {
     return "compute.googleapis.com:443";
   }
diff --git a/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/stub/IamCredentialsStubSettings.java b/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/stub/IamCredentialsStubSettings.java
@@ -18,6 +18,7 @@
 
 import com.google.api.core.ApiFunction;
 import com.google.api.core.BetaApi;
+import com.google.api.core.ObsoleteApi;
 import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -152,6 +153,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
   }
 
   /** Returns the default service endpoint. */
+  @ObsoleteApi("Use getEndpoint() instead")
   public static String getDefaultEndpoint() {
     return "iamcredentials.googleapis.com:443";
   }
diff --git a/test/integration/goldens/iam/src/com/google/iam/v1/stub/IAMPolicyStubSettings.java b/test/integration/goldens/iam/src/com/google/iam/v1/stub/IAMPolicyStubSettings.java
@@ -17,6 +17,7 @@
 package com.google.iam.v1.stub;
 
 import com.google.api.core.ApiFunction;
+import com.google.api.core.ObsoleteApi;
 import com.google.api.gax.core.GaxProperties;
 import com.google.api.gax.core.GoogleCredentialsProvider;
 import com.google.api.gax.core.InstantiatingExecutorProvider;
@@ -130,6 +131,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild
   }
 
   /** Returns the default service endpoint. */
+  @ObsoleteApi("Use getEndpoint() instead")
   public static String getDefaultEndpoint() {
     return "iam-meta-api.googleapis.com:443";
   }
diff --git a/test/integration/goldens/kms/src/com/google/cloud/kms/v1/stub/KeyManagementServiceStubSettings.java b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/stub/KeyManagementServiceStubSettings.java
diff --git a/test/integration/goldens/library/src/com/google/cloud/example/library/v1/stub/LibraryServiceStubSettings.java b/test/integration/goldens/library/src/com/google/cloud/example/library/v1/stub/LibraryServiceStubSettings.java
diff --git a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java
diff --git a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java
diff --git a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java
diff --git a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java
diff --git a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/SchemaServiceStubSettings.java b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/SchemaServiceStubSettings.java
diff --git a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java
diff --git a/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java b/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java
diff --git a/test/integration/goldens/storage/src/com/google/storage/v2/stub/StorageStubSettings.java b/test/integration/goldens/storage/src/com/google/storage/v2/stub/StorageStubSettings.java

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package com.google.api.version.test.stub;`
`2`	`2`
`3`	`3`	`import com.google.api.core.ApiFunction;`
	`4`	`+import com.google.api.core.ObsoleteApi;`
`4`	`5`	`import com.google.api.gax.core.GaxProperties;`
`5`	`6`	`import com.google.api.gax.core.GoogleCredentialsProvider;`
`6`	`7`	`import com.google.api.gax.core.InstantiatingExecutorProvider;`
`@@ -91,6 +92,7 @@ public class EchoWithVersionStubSettings extends StubSettings<EchoWithVersionStu`
`91`	`92`	`}`
`92`	`93`
`93`	`94`	`/** Returns the default service endpoint. */`
	`95`	`+ @ObsoleteApi("Use getEndpoint() instead")`
`94`	`96`	`public static String getDefaultEndpoint() {`
`95`	`97`	`return "localhost:7469";`
`96`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package com.google.testdata.v1.stub;`
`2`	`2`
`3`	`3`	`import com.google.api.core.ApiFunction;`
	`4`	`+import com.google.api.core.ObsoleteApi;`
`4`	`5`	`import com.google.api.gax.core.GaxProperties;`
`5`	`6`	`import com.google.api.gax.core.GoogleCredentialsProvider;`
`6`	`7`	`import com.google.api.gax.core.InstantiatingExecutorProvider;`
`@@ -107,6 +108,7 @@ public class DeprecatedServiceStubSettings extends StubSettings<DeprecatedServic`
`107`	`108`	`}`
`108`	`109`
`109`	`110`	`/** Returns the default service endpoint. */`
	`111`	`+ @ObsoleteApi("Use getEndpoint() instead")`
`110`	`112`	`public static String getDefaultEndpoint() {`
`111`	`113`	`return "localhost:7469";`
`112`	`114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ import static com.google.showcase.v1beta1.EchoClient.SimplePagedExpandPagedRespo`
`6`	`6`	`import com.google.api.core.ApiFunction;`
`7`	`7`	`import com.google.api.core.ApiFuture;`
`8`	`8`	`import com.google.api.core.BetaApi;`
	`9`	`+import com.google.api.core.ObsoleteApi;`
`9`	`10`	`import com.google.api.gax.core.GaxProperties;`
`10`	`11`	`import com.google.api.gax.core.GoogleCredentialsProvider;`
`11`	`12`	`import com.google.api.gax.core.InstantiatingExecutorProvider;`
`@@ -291,6 +292,7 @@ public class EchoStubSettings extends StubSettings<EchoStubSettings> {`
`291`	`292`	`}`
`292`	`293`
`293`	`294`	`/** Returns the default service endpoint. */`
	`295`	`+ @ObsoleteApi("Use getEndpoint() instead")`
`294`	`296`	`public static String getDefaultEndpoint() {`
`295`	`297`	`return "localhost:7469";`
`296`	`298`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import static com.google.logging.v2.LoggingServiceV2Client.ListMonitoredResource`
`7`	`7`	`import com.google.api.MonitoredResourceDescriptor;`
`8`	`8`	`import com.google.api.core.ApiFunction;`
`9`	`9`	`import com.google.api.core.ApiFuture;`
	`10`	`+import com.google.api.core.ObsoleteApi;`
`10`	`11`	`import com.google.api.gax.batching.BatchingSettings;`
`11`	`12`	`import com.google.api.gax.batching.FlowControlSettings;`
`12`	`13`	`import com.google.api.gax.batching.FlowController;`
`@@ -433,6 +434,7 @@ public class LoggingServiceV2StubSettings extends StubSettings<LoggingServiceV2S`
`433`	`434`	`}`
`434`	`435`
`435`	`436`	`/** Returns the default service endpoint. */`
	`437`	`+ @ObsoleteApi("Use getEndpoint() instead")`
`436`	`438`	`public static String getDefaultEndpoint() {`
`437`	`439`	`return "logging.googleapis.com:443";`
`438`	`440`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ package com.google.showcase.v1beta1.stub;`
`2`	`2`
`3`	`3`	`import com.google.api.core.ApiFunction;`
`4`	`4`	`import com.google.api.core.BetaApi;`
	`5`	`+import com.google.api.core.ObsoleteApi;`
`5`	`6`	`import com.google.api.gax.core.GaxProperties;`
`6`	`7`	`import com.google.api.gax.core.GoogleCredentialsProvider;`
`7`	`8`	`import com.google.api.gax.core.InstantiatingExecutorProvider;`
`@@ -105,6 +106,7 @@ public class WickedStubSettings extends StubSettings<WickedStubSettings> {`
`105`	`106`	`}`
`106`	`107`
`107`	`108`	`/** Returns the default service endpoint. */`
	`109`	`+ @ObsoleteApi("Use getEndpoint() instead")`
`108`	`110`	`public static String getDefaultEndpoint() {`
`109`	`111`	`return "localhost:7469";`
`110`	`112`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@`
`21`	`21`	`import com.google.api.core.ApiFunction;`
`22`	`22`	`import com.google.api.core.ApiFuture;`
`23`	`23`	`import com.google.api.core.BetaApi;`
	`24`	`+import com.google.api.core.ObsoleteApi;`
`24`	`25`	`import com.google.api.gax.core.GaxProperties;`
`25`	`26`	`import com.google.api.gax.core.GoogleCredentialsProvider;`
`26`	`27`	`import com.google.api.gax.core.InstantiatingExecutorProvider;`
`@@ -279,6 +280,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild`
`279`	`280`	`}`
`280`	`281`
`281`	`282`	`/** Returns the default service endpoint. */`
	`283`	`+ @ObsoleteApi("Use getEndpoint() instead")`
`282`	`284`	`public static String getDefaultEndpoint() {`
`283`	`285`	`return "localhost:7469";`
`284`	`286`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`import com.google.api.core.ApiFunction;`
`24`	`24`	`import com.google.api.core.ApiFuture;`
`25`	`25`	`import com.google.api.core.BetaApi;`
	`26`	`+import com.google.api.core.ObsoleteApi;`
`26`	`27`	`import com.google.api.gax.core.GaxProperties;`
`27`	`28`	`import com.google.api.gax.core.GoogleCredentialsProvider;`
`28`	`29`	`import com.google.api.gax.core.InstantiatingExecutorProvider;`
`@@ -438,6 +439,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild`
`438`	`439`	`}`
`439`	`440`
`440`	`441`	`/** Returns the default service endpoint. */`
	`442`	`+ @ObsoleteApi("Use getEndpoint() instead")`
`441`	`443`	`public static String getDefaultEndpoint() {`
`442`	`444`	`return "localhost:7469";`
`443`	`445`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`import com.google.api.core.ApiFunction;`
`23`	`23`	`import com.google.api.core.ApiFuture;`
`24`	`24`	`import com.google.api.core.BetaApi;`
	`25`	`+import com.google.api.core.ObsoleteApi;`
`25`	`26`	`import com.google.api.gax.core.GaxProperties;`
`26`	`27`	`import com.google.api.gax.core.GoogleCredentialsProvider;`
`27`	`28`	`import com.google.api.gax.core.InstantiatingExecutorProvider;`
`@@ -309,6 +310,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild`
`309`	`310`	`}`
`310`	`311`
`311`	`312`	`/** Returns the default service endpoint. */`
	`313`	`+ @ObsoleteApi("Use getEndpoint() instead")`
`312`	`314`	`public static String getDefaultEndpoint() {`
`313`	`315`	`return "localhost:7469";`
`314`	`316`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`package com.google.cloud.apigeeconnect.v1.stub;`
`18`	`18`
`19`	`19`	`import com.google.api.core.ApiFunction;`
	`20`	`+import com.google.api.core.ObsoleteApi;`
`20`	`21`	`import com.google.api.gax.core.GaxProperties;`
`21`	`22`	`import com.google.api.gax.core.GoogleCredentialsProvider;`
`22`	`23`	`import com.google.api.gax.core.InstantiatingExecutorProvider;`
`@@ -113,6 +114,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild`
`113`	`114`	`}`
`114`	`115`
`115`	`116`	`/** Returns the default service endpoint. */`
	`117`	`+ @ObsoleteApi("Use getEndpoint() instead")`
`116`	`118`	`public static String getDefaultEndpoint() {`
`117`	`119`	`return "apigeeconnect.googleapis.com:443";`
`118`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`	`import com.google.api.core.ApiFunction;`
`25`	`25`	`import com.google.api.core.ApiFuture;`
`26`	`26`	`import com.google.api.core.BetaApi;`
	`27`	`+import com.google.api.core.ObsoleteApi;`
`27`	`28`	`import com.google.api.gax.core.GaxProperties;`
`28`	`29`	`import com.google.api.gax.core.GoogleCredentialsProvider;`
`29`	`30`	`import com.google.api.gax.core.InstantiatingExecutorProvider;`
`@@ -583,6 +584,7 @@ public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuild`
`583`	`584`	`}`
`584`	`585`
`585`	`586`	`/** Returns the default service endpoint. */`
	`587`	`+ @ObsoleteApi("Use getEndpoint() instead")`
`586`	`588`	`public static String getDefaultEndpoint() {`
`587`	`589`	`return "cloudasset.googleapis.com:443";`
`588`	`590`	`}`