Revert "fix: fix REST transport client creation generated javadoc sam…

…ple (#1077)" This reverts commit 5346eef.
googleapis · Nov 3, 2022 · 8a647ff · 8a647ff
1 parent 4fb49ec
commit 8a647ff
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 6 deletions.
diff --git a/...ain/java/com/google/api/generator/gapic/composer/grpcrest/ServiceClientClassComposer.java b/...ain/java/com/google/api/generator/gapic/composer/grpcrest/ServiceClientClassComposer.java
@@ -59,7 +59,7 @@ protected List<CommentStatement> createClassHeaderComments(
         ServiceClientHeaderSampleComposer.composeSetEndpointSample(clientType, settingsType);
     Sample transportSampleCode =
         ServiceClientHeaderSampleComposer.composeTransportSample(
-            clientType, settingsType, "newHttpJsonBuilder");
+            clientType, settingsType, "defaultHttpJsonTransportProviderBuilder");
     samples.addAll(
         Arrays.asList(
             classMethodSampleCode, credentialsSampleCode, endpointSampleCode, transportSampleCode));

diff --git a/...com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java b/...com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java
@@ -285,7 +285,7 @@ public static Sample composeSetEndpointSample(TypeNode clientType, TypeNode sett
   }
 
   public static Sample composeTransportSample(
-      TypeNode clientType, TypeNode settingsType, String transportBuilderMethod) {
+      TypeNode clientType, TypeNode settingsType, String transportProviderMethod) {
     String settingsName = JavaStyle.toLowerCamelCase(settingsType.reference().name());
     String clientName = JavaStyle.toLowerCamelCase(clientType.reference().name());
     VariableExpr settingsVarExpr =
@@ -294,11 +294,26 @@ public static Sample composeTransportSample(
     MethodInvocationExpr newBuilderMethodExpr =
         MethodInvocationExpr.builder()
             .setStaticReferenceType(settingsType)
-            .setMethodName(transportBuilderMethod)
+            .setMethodName("newBuilder")
             .build();
-    MethodInvocationExpr buildMethodExpr =
+    MethodInvocationExpr transportChannelProviderArg =
+        MethodInvocationExpr.builder()
+            .setExprReferenceExpr(
+                MethodInvocationExpr.builder()
+                    .setStaticReferenceType(settingsType)
+                    .setMethodName(transportProviderMethod)
+                    .build())
+            .setMethodName("build")
+            .build();
+    MethodInvocationExpr credentialsMethodExpr =
         MethodInvocationExpr.builder()
             .setExprReferenceExpr(newBuilderMethodExpr)
+            .setArguments(transportChannelProviderArg)
+            .setMethodName("setTransportChannelProvider")
+            .build();
+    MethodInvocationExpr buildMethodExpr =
+        MethodInvocationExpr.builder()
+            .setExprReferenceExpr(credentialsMethodExpr)
             .setReturnType(settingsType)
             .setMethodName("build")
             .build();

diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoClient.golden b/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoClient.golden
@@ -105,7 +105,11 @@ import javax.annotation.Generated;
  * // - It may require correct/in-range values for request initialization.
  * // - It may require specifying regional endpoints when creating the service client as shown in
  * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
- * EchoSettings echoSettings = EchoSettings.newHttpJsonBuilder().build();
+ * EchoSettings echoSettings =
+ *     EchoSettings.newBuilder()
+ *         .setTransportChannelProvider(
+ *             EchoSettings.defaultHttpJsonTransportProviderBuilder().build())
+ *         .build();
  * EchoClient echoClient = EchoClient.create(echoSettings);
  * }</pre>
  *

diff --git a/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoEmpty.golden b/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoEmpty.golden
@@ -85,7 +85,11 @@ import javax.annotation.Generated;
  * // - It may require correct/in-range values for request initialization.
  * // - It may require specifying regional endpoints when creating the service client as shown in
  * // https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library
- * EchoEmpySettings echoEmpySettings = EchoEmpySettings.newHttpJsonBuilder().build();
+ * EchoEmpySettings echoEmpySettings =
+ *     EchoEmpySettings.newBuilder()
+ *         .setTransportChannelProvider(
+ *             EchoEmpySettings.defaultHttpJsonTransportProviderBuilder().build())
+ *         .build();
  * EchoEmpyClient echoEmpyClient = EchoEmpyClient.create(echoEmpySettings);
  * }</pre>
  *