chore(samples): Refactor gapic samples to not have try with resources

sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/ClientLibraryPackageInfoComposer.java

@@ -105,7 +105,7 @@ private static CommentStatement createPackageInfoJavadoc(GapicContext context) {
           ServiceClientHeaderSampleComposer.composeClassHeaderSample(
               service, clientType, context.resourceNames(), context.messages());
       javaDocCommentBuilder.addSampleCode(
-          SampleCodeWriter.writeInlineSample(packageInfoSampleCode.body()));
+          SampleCodeWriter.writeInlineSample(packageInfoSampleCode));
     }
 
     return CommentStatement.withComment(javaDocCommentBuilder.build());

sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/comment/CommentComposer.java

@@ -19,6 +19,7 @@
 import com.google.api.generator.engine.ast.LineComment;
 import com.google.api.generator.engine.ast.Statement;
 import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableList;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.List;
@@ -63,7 +64,7 @@ public class CommentComposer {
       CommentStatement.withComment(
           LineComment.withComment(AUTO_GENERATED_METHOD_DISCLAIMER_STRING));
 
-  public static final List<Statement> AUTO_GENERATED_SAMPLE_COMMENT =
+  public static final List<Statement> AUTO_GENERATED_SAMPLE_COMMENT_BASE =
       Arrays.asList(
           CommentStatement.withComment(
               LineComment.withComment(
@@ -80,6 +81,22 @@ public class CommentComposer {
               LineComment.withComment(
                   "https://cloud.google.com/java/docs/setup#configure_endpoints_for_the_client_library")));
 
+  public static final List<Statement> CLIENT_LIFECYCLE_COMMENT =
+      Arrays.asList(
+          CommentStatement.withComment(
+              LineComment.withComment(
+                  "- The samples create a client that can be re-used for multiple requests\n"
+                      + " and are expected to be long-lived.\n"
+                      + " The clients should be resource managed properly and eventually closed.\n"
+                      + "For more information on client lifecycle, see\n"
+                      + "https://docs.cloud.google.com/java/docs/client-lifecycle")));
+
+  public static final List<Statement> AUTO_GENERATED_SAMPLE_COMMENT =
+      ImmutableList.<Statement>builder()
+          .addAll(AUTO_GENERATED_SAMPLE_COMMENT_BASE)
+          .addAll(CLIENT_LIFECYCLE_COMMENT)
+          .build();
+
   // This environment variable is mainly used to override the current year to a fixed year in tests
   // so we don't have to update golden tests every year.
   // This does not work for golden integration tests that are generated from Bazel rules. Because

sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java

@@ -233,9 +233,9 @@ protected List<CommentStatement> createClassHeaderComments(
     return ServiceClientCommentComposer.createClassHeaderComments(
         methodVariantsForClientHeader,
         service,
-        SampleCodeWriter.writeInlineSample(classMethodSampleCode.body()),
-        SampleCodeWriter.writeInlineSample(credentialsSampleCode.body()),
-        SampleCodeWriter.writeInlineSample(endpointSampleCode.body()),
+        SampleCodeWriter.writeInlineSample(classMethodSampleCode),
+        SampleCodeWriter.writeInlineSample(credentialsSampleCode),
+        SampleCodeWriter.writeInlineSample(endpointSampleCode),
         null,
         null,
         null);
@@ -797,7 +797,7 @@ private static List<MethodDefinition> createMethodVariants(
       if (methodSample.isPresent()) {
         samples.add(methodSample.get());
         methodDocSample =
-            Optional.of(SampleCodeWriter.writeInlineSample(methodSample.get().body()));
+            Optional.of(SampleCodeWriter.writeInlineSample(methodSample.get()));
       }
 
       MethodDefinition.Builder methodVariantBuilder =
@@ -876,7 +876,7 @@ private static MethodDefinition createMethodDefaultMethod(
     if (defaultMethodSample.isPresent()) {
       samples.add(defaultMethodSample.get());
       defaultMethodDocSample =
-          Optional.of(SampleCodeWriter.writeInlineSample(defaultMethodSample.get().body()));
+          Optional.of(SampleCodeWriter.writeInlineSample(defaultMethodSample.get()));
     }
 
     MethodInvocationExpr callableMethodExpr =
@@ -1043,7 +1043,7 @@ private static MethodDefinition createCallableMethod(
     Optional<String> sampleDocCode = Optional.empty();
     if (sampleCode.isPresent()) {
       samples.add(sampleCode.get());
-      sampleDocCode = Optional.of(SampleCodeWriter.writeInlineSample(sampleCode.get().body()));
+      sampleDocCode = Optional.of(SampleCodeWriter.writeInlineSample(sampleCode.get()));
     }
 
     MethodDefinition.Builder methodDefBuilder = MethodDefinition.builder();

sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceSettingsClassComposer.java

@@ -30,6 +30,7 @@
 import com.google.api.gax.rpc.StubSettings;
 import com.google.api.gax.rpc.TransportChannelProvider;
 import com.google.api.gax.rpc.UnaryCallSettings;
+import com.google.api.generator.gapic.composer.comment.CommentComposer;
 import com.google.api.generator.engine.ast.AnnotationNode;
 import com.google.api.generator.engine.ast.CastExpr;
 import com.google.api.generator.engine.ast.ClassDefinition;
@@ -169,7 +170,7 @@ private static List<CommentStatement> createClassHeaderComments(
     Optional<String> docSampleCode = Optional.empty();
     if (sampleCode.isPresent()) {
       samples.add(sampleCode.get());
-      docSampleCode = Optional.of(SampleCodeWriter.writeInlineSample(sampleCode.get().body()));
+      docSampleCode = Optional.of(SampleCodeWriter.writeInlineSample(sampleCode.get(), CommentComposer.AUTO_GENERATED_SAMPLE_COMMENT_BASE));
     }
     // Create a sample for a LRO method using LRO-specific RetrySettings, if one exists in the
     // service.
@@ -188,7 +189,7 @@ private static List<CommentStatement> createClassHeaderComments(
     if (lroSampleCode.isPresent()) {
       samples.add(lroSampleCode.get());
       lroDocSampleCode =
-          Optional.of(SampleCodeWriter.writeInlineSample(lroSampleCode.get().body()));
+          Optional.of(SampleCodeWriter.writeInlineSample(lroSampleCode.get(), CommentComposer.AUTO_GENERATED_SAMPLE_COMMENT_BASE));
     }
 
     return SettingsCommentComposer.createClassHeaderComments(

sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java

@@ -14,6 +14,7 @@
 
 package com.google.api.generator.gapic.composer.common;
 
+import com.google.api.generator.gapic.composer.comment.CommentComposer;
 import com.google.api.MonitoredResourceDescriptor;
 import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
@@ -459,7 +460,7 @@ private static List<CommentStatement> createClassHeaderComments(
     Optional<String> docSampleCode = Optional.empty();
     if (sampleCode.isPresent()) {
       samples.add(sampleCode.get());
-      docSampleCode = Optional.of(SampleCodeWriter.writeInlineSample(sampleCode.get().body()));
+      docSampleCode = Optional.of(SampleCodeWriter.writeInlineSample(sampleCode.get(), CommentComposer.AUTO_GENERATED_SAMPLE_COMMENT_BASE));
     }
     // Create a sample for a LRO method using LRO-specific RetrySettings, if one exists in the
     // service.
@@ -478,7 +479,7 @@ private static List<CommentStatement> createClassHeaderComments(
     if (lroSampleCode.isPresent()) {
       samples.add(lroSampleCode.get());
       lroDocSampleCode =
-          Optional.of(SampleCodeWriter.writeInlineSample(lroSampleCode.get().body()));
+          Optional.of(SampleCodeWriter.writeInlineSample(lroSampleCode.get(), CommentComposer.AUTO_GENERATED_SAMPLE_COMMENT_BASE));
     }
 
     return SettingsCommentComposer.createClassHeaderComments(

sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceClientClassComposer.java

@@ -75,10 +75,10 @@ protected List<CommentStatement> createClassHeaderComments(
     return ServiceClientCommentComposer.createClassHeaderComments(
         grpcRpcsToJavaMethodNames,
         service,
-        SampleCodeWriter.writeInlineSample(classMethodSampleCode.body()),
-        SampleCodeWriter.writeInlineSample(credentialsSampleCode.body()),
-        SampleCodeWriter.writeInlineSample(endpointSampleCode.body()),
-        SampleCodeWriter.writeInlineSample(transportSampleCode.body()),
+        SampleCodeWriter.writeInlineSample(classMethodSampleCode),
+        SampleCodeWriter.writeInlineSample(credentialsSampleCode),
+        SampleCodeWriter.writeInlineSample(endpointSampleCode),
+        SampleCodeWriter.writeInlineSample(transportSampleCode),
         "gRPC",
         "REST (HTTP1.1/JSON)");
   }

sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/SampleCodeWriter.java

@@ -30,10 +30,22 @@ public static String writeInlineSample(List<Statement> statements) {
     return write(SampleComposer.composeInlineSample(statements));
   }
 
+  public static String writeInlineSample(Sample sample) {
+    return write(SampleComposer.composeInlineSample(sample));
+  }
+
+  public static String writeInlineSample(Sample sample, List<Statement> sampleComment) {
+    return write(SampleComposer.composeInlineSample(sample, sampleComment));
+  }
+
   public static String writeExecutableSample(Sample sample, String packkage) {
     return write(SampleComposer.composeExecutableSample(sample, packkage));
   }
 
+  public static String writeExecutableSample(Sample sample, String packkage, List<Statement> sampleComment) {
+    return write(SampleComposer.composeExecutableSample(sample, packkage, sampleComment));
+  }
+
   @VisibleForTesting
   public static String write(Statement... statement) {
     return write(Arrays.asList(statement));

sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/SampleComposer.java

@@ -41,15 +41,27 @@ static List<Statement> composeInlineSample(List<Statement> sampleBody) {
     return bodyWithComment(CommentComposer.AUTO_GENERATED_SAMPLE_COMMENT, sampleBody);
   }
 
+  static List<Statement> composeInlineSample(Sample sample) {
+    return composeInlineSample(sample, CommentComposer.AUTO_GENERATED_SAMPLE_COMMENT);
+  }
+
+  static List<Statement> composeInlineSample(Sample sample, List<Statement> sampleComment) {
+    return bodyWithComment(sampleComment, sample.body());
+  }
+
   //  "Executable" meaning it includes the necessary code to execute java code,
   //  still may require additional configuration to actually execute generated sample code
   static ClassDefinition composeExecutableSample(Sample sample, String pakkage) {
+    return composeExecutableSample(sample, pakkage, CommentComposer.AUTO_GENERATED_SAMPLE_COMMENT);
+  }
+
+  static ClassDefinition composeExecutableSample(Sample sample, String pakkage, List<Statement> sampleComment) {
     return createExecutableSample(
         sample.fileHeader(),
         pakkage,
         sample.name(),
         sample.variableAssignments(),
-        bodyWithComment(CommentComposer.AUTO_GENERATED_SAMPLE_COMMENT, sample.body()),
+        bodyWithComment(sampleComment, sample.body()),
         sample.regionTag());
   }
 

sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientCallableMethodSampleComposer.java

@@ -402,14 +402,11 @@ public static Sample composeLroCallableMethod(
             .setIsAsynchronous(true)
             .setOverloadDisambiguation("LRO")
             .build();
-    List<Statement> body =
-        Arrays.asList(
-            TryCatchStatement.builder()
-                .setTryResourceExpr(
-                    SampleComposerUtil.assignClientVariableWithCreateMethodExpr(clientVarExpr))
-                .setTryBody(bodyStatements)
-                .setIsSampleCode(true)
-                .build());
+    List<Statement> body = new ArrayList<>();
+    body.add(
+        ExprStatement.withExpr(
+            SampleComposerUtil.assignClientVariableWithCreateMethodExpr(clientVarExpr)));
+    body.addAll(bodyStatements);
     return Sample.builder().setBody(body).setRegionTag(regionTag).build();
   }
 
@@ -524,14 +521,11 @@ public static Sample composePagedCallableMethod(
             .setBody(Arrays.asList(lineCommentStatement))
             .build();
     bodyStatements.add(repeatedResponseForStatement);
-    List<Statement> body =
-        Arrays.asList(
-            TryCatchStatement.builder()
-                .setTryResourceExpr(
-                    SampleComposerUtil.assignClientVariableWithCreateMethodExpr(clientVarExpr))
-                .setTryBody(bodyStatements)
-                .setIsSampleCode(true)
-                .build());
+    List<Statement> body = new ArrayList<>();
+    body.add(
+        ExprStatement.withExpr(
+            SampleComposerUtil.assignClientVariableWithCreateMethodExpr(clientVarExpr)));
+    body.addAll(bodyStatements);
 
     RegionTag regionTag =
         RegionTag.builder()
@@ -591,14 +585,11 @@ public static Sample composeRegularCallableMethod(
       regionTag = unaryOrLroCallable.regionTag();
     }
 
-    List<Statement> body =
-        Arrays.asList(
-            TryCatchStatement.builder()
-                .setTryResourceExpr(
-                    SampleComposerUtil.assignClientVariableWithCreateMethodExpr(clientVarExpr))
-                .setTryBody(bodyStatements)
-                .setIsSampleCode(true)
-                .build());
+    List<Statement> body = new ArrayList<>();
+    body.add(
+        ExprStatement.withExpr(
+            SampleComposerUtil.assignClientVariableWithCreateMethodExpr(clientVarExpr)));
+    body.addAll(bodyStatements);
     return Sample.builder().setBody(body).setRegionTag(regionTag).build();
   }
 
@@ -653,14 +644,11 @@ public static Sample composeStreamCallableMethod(
       regionTag = streamClient.regionTag();
     }
 
-    List<Statement> body =
-        Arrays.asList(
-            TryCatchStatement.builder()
-                .setTryResourceExpr(
-                    SampleComposerUtil.assignClientVariableWithCreateMethodExpr(clientVarExpr))
-                .setTryBody(bodyStatements)
-                .setIsSampleCode(true)
-                .build());
+    List<Statement> body = new ArrayList<>();
+    body.add(
+        ExprStatement.withExpr(
+            SampleComposerUtil.assignClientVariableWithCreateMethodExpr(clientVarExpr)));
+    body.addAll(bodyStatements);
     return Sample.builder().setBody(body).setRegionTag(regionTag).build();
   }
 

sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientHeaderSampleComposer.java

@@ -135,14 +135,11 @@ public static Sample composeShowcaseMethodSample(
       regionTag = unaryRpc.regionTag();
     }
 
-    List<Statement> body =
-        Arrays.asList(
-            TryCatchStatement.builder()
-                .setTryResourceExpr(
-                    SampleComposerUtil.assignClientVariableWithCreateMethodExpr(clientVarExpr))
-                .setTryBody(bodyStatements)
-                .setIsSampleCode(true)
-                .build());
+    List<Statement> body = new ArrayList<>();
+    body.add(
+        ExprStatement.withExpr(
+            SampleComposerUtil.assignClientVariableWithCreateMethodExpr(clientVarExpr)));
+    body.addAll(bodyStatements);
     return Sample.builder().setBody(body).setRegionTag(regionTag).build();
   }
 

sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/ServiceClientMethodSampleComposer.java

@@ -59,14 +59,11 @@ public static Sample composeEmptyServiceSample(TypeNode clientType, Service serv
     RegionTag regionTag =
         RegionTag.builder().setServiceName(service.name()).setRpcName("emtpy").build();
 
-    List<Statement> body =
-        Arrays.asList(
-            TryCatchStatement.builder()
-                .setTryResourceExpr(
-                    SampleComposerUtil.assignClientVariableWithCreateMethodExpr(clientVarExpr))
-                .setTryBody(bodyStatements)
-                .setIsSampleCode(true)
-                .build());
+    List<Statement> body = new ArrayList<>();
+    body.add(
+        ExprStatement.withExpr(
+            SampleComposerUtil.assignClientVariableWithCreateMethodExpr(clientVarExpr)));
+    body.addAll(bodyStatements);
     return Sample.builder().setBody(body).setRegionTag(regionTag).setIsCanonical(true).build();
   }
 
@@ -127,14 +124,11 @@ public static Sample composeCanonicalSample(
       regionTag = unaryRpc.regionTag();
     }
 
-    List<Statement> body =
-        Arrays.asList(
-            TryCatchStatement.builder()
-                .setTryResourceExpr(
-                    SampleComposerUtil.assignClientVariableWithCreateMethodExpr(clientVarExpr))
-                .setTryBody(bodyStatements)
-                .setIsSampleCode(true)
-                .build());
+    List<Statement> body = new ArrayList<>();
+    body.add(
+        ExprStatement.withExpr(
+            SampleComposerUtil.assignClientVariableWithCreateMethodExpr(clientVarExpr)));
+    body.addAll(bodyStatements);
     return Sample.builder().setBody(body).setRegionTag(regionTag).setIsCanonical(true).build();
   }
 

sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/samplecode/SettingsSampleComposer.java

@@ -243,7 +243,12 @@ public static Optional<Sample> composeSettingsSample(
             .setServiceName(classType.reference().name())
             .setRpcName(methodNameOpt.get())
             .build();
-    return Optional.of(Sample.builder().setBody(statements).setRegionTag(regionTag).build());
+    return Optional.of(
+        Sample.builder()
+            .setBody(statements)
+            .setRegionTag(regionTag)
+
+            .build());
   }
 
   public static Optional<Sample> composeLroSettingsSample(
@@ -434,6 +439,11 @@ public static Optional<Sample> composeLroSettingsSample(
             .setServiceName(classType.reference().name())
             .setRpcName(methodNameOpt.get())
             .build();
-    return Optional.of(Sample.builder().setBody(statements).setRegionTag(regionTag).build());
+    return Optional.of(
+        Sample.builder()
+            .setBody(statements)
+            .setRegionTag(regionTag)
+
+            .build());
   }
 }

sdk-platform-java/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/Sample.java

@@ -39,6 +39,8 @@ public abstract class Sample {
 
   public abstract boolean isCanonical();
 
+
+
   public static Builder builder() {
     return new AutoValue_Sample.Builder()
         .setBody(ImmutableList.of())
@@ -88,6 +90,8 @@ public abstract static class Builder {
 
     public abstract Builder setIsCanonical(boolean isCanonical);
 
+
+
     abstract Builder setName(String name);
 
     abstract Sample autoBuild();