chore: refactor sample composers - breakup class + renaming (googleap…

…is#969) * chore: refactor sample composers - breakup class + renaming Not updating any of the code - just moving things around * include license headers
vam-google · Mar 17, 2022 · 44d2a5e · 44d2a5e
1 parent b7cf105
commit 44d2a5e
Show file tree

Hide file tree

Showing 14 changed files with 2,797 additions and 3,229 deletions.
diff --git a/src/main/java/com/google/api/generator/gapic/composer/ClientLibraryPackageInfoComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ClientLibraryPackageInfoComposer.java
@@ -21,7 +21,7 @@
 import com.google.api.generator.engine.ast.PackageInfoDefinition;
 import com.google.api.generator.engine.ast.TypeNode;
 import com.google.api.generator.engine.ast.VaporReference;
-import com.google.api.generator.gapic.composer.samplecode.ServiceClientSampleCodeComposer;
+import com.google.api.generator.gapic.composer.samplecode.ServiceClientHeaderSampleComposer;
 import com.google.api.generator.gapic.composer.utils.ClassNames;
 import com.google.api.generator.gapic.model.GapicContext;
 import com.google.api.generator.gapic.model.GapicPackageInfo;
@@ -120,7 +120,7 @@ private static CommentStatement createPackageInfoJavadoc(GapicContext context) {
                   .setName(ClassNames.getServiceClientClassName(service))
                   .build());
       String packageInfoSampleCode =
-          ServiceClientSampleCodeComposer.composeClassHeaderMethodSampleCode(
+          ServiceClientHeaderSampleComposer.composeClassHeaderMethodSampleCode(
               service, clientType, context.resourceNames(), context.messages());
       javaDocCommentBuilder.addSampleCode(packageInfoSampleCode);
     }

diff --git a/...va/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java b/...va/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java
@@ -55,7 +55,9 @@
 import com.google.api.generator.engine.ast.Variable;
 import com.google.api.generator.engine.ast.VariableExpr;
 import com.google.api.generator.gapic.composer.comment.ServiceClientCommentComposer;
-import com.google.api.generator.gapic.composer.samplecode.ServiceClientSampleCodeComposer;
+import com.google.api.generator.gapic.composer.samplecode.ServiceClientCallableSampleComposer;
+import com.google.api.generator.gapic.composer.samplecode.ServiceClientHeaderSampleComposer;
+import com.google.api.generator.gapic.composer.samplecode.ServiceClientMethodSampleComposer;
 import com.google.api.generator.gapic.composer.store.TypeStore;
 import com.google.api.generator.gapic.composer.utils.ClassNames;
 import com.google.api.generator.gapic.composer.utils.PackageChecker;
@@ -189,13 +191,13 @@ private static List<CommentStatement> createClassHeaderComments(
     TypeNode clientType = typeStore.get(ClassNames.getServiceClientClassName(service));
     TypeNode settingsType = typeStore.get(ClassNames.getServiceSettingsClassName(service));
     String classMethodSampleCode =
-        ServiceClientSampleCodeComposer.composeClassHeaderMethodSampleCode(
+        ServiceClientHeaderSampleComposer.composeClassHeaderMethodSampleCode(
             service, clientType, resourceNames, messageTypes);
     String credentialsSampleCode =
-        ServiceClientSampleCodeComposer.composeClassHeaderCredentialsSampleCode(
+        ServiceClientHeaderSampleComposer.composeClassHeaderCredentialsSampleCode(
             clientType, settingsType);
     String endpointSampleCode =
-        ServiceClientSampleCodeComposer.composeClassHeaderEndpointSampleCode(
+        ServiceClientHeaderSampleComposer.composeClassHeaderEndpointSampleCode(
             clientType, settingsType);
     return ServiceClientCommentComposer.createClassHeaderComments(
         service, classMethodSampleCode, credentialsSampleCode, endpointSampleCode);
@@ -697,7 +699,7 @@ private static List<MethodDefinition> createMethodVariants(
 
       Optional<String> methodSampleCode =
           Optional.of(
-              ServiceClientSampleCodeComposer.composeRpcMethodHeaderSampleCode(
+              ServiceClientMethodSampleComposer.composeRpcMethodHeaderSampleCode(
                   method, typeStore.get(clientName), signature, resourceNames, messageTypes));
       MethodDefinition.Builder methodVariantBuilder =
           MethodDefinition.builder()
@@ -777,7 +779,7 @@ private static MethodDefinition createMethodDefaultMethod(
 
     Optional<String> defaultMethodSampleCode =
         Optional.of(
-            ServiceClientSampleCodeComposer.composeRpcDefaultMethodHeaderSampleCode(
+            ServiceClientMethodSampleComposer.composeRpcDefaultMethodHeaderSampleCode(
                 method, typeStore.get(clientName), resourceNames, messageTypes));
 
     MethodInvocationExpr callableMethodExpr =
@@ -900,15 +902,15 @@ private static MethodDefinition createCallableMethod(
     if (callableMethodKind.equals(CallableMethodKind.LRO)) {
       sampleCodeOpt =
           Optional.of(
-              ServiceClientSampleCodeComposer.composeLroCallableMethodHeaderSampleCode(
+              ServiceClientCallableSampleComposer.composeLroCallableMethodHeaderSampleCode(
                   method,
                   typeStore.get(ClassNames.getServiceClientClassName(service)),
                   resourceNames,
                   messageTypes));
     } else if (callableMethodKind.equals(CallableMethodKind.PAGED)) {
       sampleCodeOpt =
           Optional.of(
-              ServiceClientSampleCodeComposer.composePagedCallableMethodHeaderSampleCode(
+              ServiceClientCallableSampleComposer.composePagedCallableMethodHeaderSampleCode(
                   method,
                   typeStore.get(ClassNames.getServiceClientClassName(service)),
                   resourceNames,
@@ -917,15 +919,15 @@ private static MethodDefinition createCallableMethod(
       if (method.stream().equals(Stream.NONE)) {
         sampleCodeOpt =
             Optional.of(
-                ServiceClientSampleCodeComposer.composeRegularCallableMethodHeaderSampleCode(
+                ServiceClientCallableSampleComposer.composeRegularCallableMethodHeaderSampleCode(
                     method,
                     typeStore.get(ClassNames.getServiceClientClassName(service)),
                     resourceNames,
                     messageTypes));
       } else {
         sampleCodeOpt =
             Optional.of(
-                ServiceClientSampleCodeComposer.composeStreamCallableMethodHeaderSampleCode(
+                ServiceClientCallableSampleComposer.composeStreamCallableMethodHeaderSampleCode(
                     method,
                     typeStore.get(ClassNames.getServiceClientClassName(service)),
                     resourceNames,

diff --git a/...mplecode/SampleCodeBodyJavaFormatter.java → ...r/samplecode/SampleBodyJavaFormatter.java b/...mplecode/SampleCodeBodyJavaFormatter.java → ...r/samplecode/SampleBodyJavaFormatter.java
@@ -20,9 +20,9 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-public final class SampleCodeBodyJavaFormatter {
+public final class SampleBodyJavaFormatter {
 
-  private SampleCodeBodyJavaFormatter() {}
+  private SampleBodyJavaFormatter() {}
 
   private static final Formatter FORMATTER = new Formatter();
 

diff --git a/src/main/java/com/google/api/generator/gapic/composer/samplecode/SampleCodeWriter.java b/src/main/java/com/google/api/generator/gapic/composer/samplecode/SampleCodeWriter.java
@@ -38,7 +38,7 @@ public static String write(List<Statement> statements) {
     for (Statement statement : statements) {
       statement.accept(visitor);
     }
-    String formattedSampleCode = SampleCodeBodyJavaFormatter.format(visitor.write());
+    String formattedSampleCode = SampleBodyJavaFormatter.format(visitor.write());
     // Escape character "@" in the markdown code block <pre>{@code...} tags.
     return formattedSampleCode.replaceAll("@", "{@literal @}");
   }