continue: rename apiVersion used in sample regiontags to apiMajorVers…

…ion.
googleapis · Apr 8, 2024 · 9ec3531 · 9ec3531
1 parent 8772c51
commit 9ec3531
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 15 deletions.
diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/Composer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/Composer.java
@@ -207,7 +207,7 @@ static List<GapicClass> prepareExecutableSamples(List<GapicClass> clazzes) {
                   sample ->
                       samples.add(
                           addRegionTagAndHeaderToSample(
-                              sample, gapicClass.apiShortName(), gapicClass.apiVersion())));
+                              sample, gapicClass.apiShortName(), gapicClass.apiMajorVersion())));
           clazzesWithSamples.add(gapicClass.withSamples(samples));
         });
     return clazzesWithSamples;

diff --git a/...va/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java b/...va/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java
@@ -173,7 +173,7 @@ public GapicClass generate(GapicContext context, Service service) {
     updateGapicMetadata(context, service, className, grpcRpcsToJavaMethodNames);
     return GapicClass.create(kind, classDef, SampleComposerUtil.handleDuplicateSamples(samples))
         .withApiShortName(service.apiShortName())
-        .withApiVersion(service.apiMajorVersion());
+        .withApiMajorVersion(service.apiMajorVersion());
   }
 
   private static List<AnnotationNode> createClassAnnotations(Service service, TypeStore typeStore) {

diff --git a/.../com/google/api/generator/gapic/composer/common/AbstractServiceSettingsClassComposer.java b/.../com/google/api/generator/gapic/composer/common/AbstractServiceSettingsClassComposer.java
@@ -128,7 +128,7 @@ public GapicClass generate(GapicContext context, Service service) {
             .build();
     return GapicClass.create(kind, classDef, SampleComposerUtil.handleDuplicateSamples(samples))
         .withApiShortName(service.apiShortName())
-        .withApiVersion(service.apiMajorVersion());
+        .withApiMajorVersion(service.apiMajorVersion());
   }
 
   private static List<CommentStatement> createClassHeaderComments(

diff --git a/.../google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java b/.../google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java
@@ -204,7 +204,7 @@ public GapicClass generate(GapicContext context, Service service) {
     return GapicClass.create(
             GapicClass.Kind.STUB, classDef, SampleComposerUtil.handleDuplicateSamples(samples))
         .withApiShortName(service.apiShortName())
-        .withApiVersion(service.apiMajorVersion());
+        .withApiMajorVersion(service.apiMajorVersion());
   }
 
   protected MethodDefinition createDefaultCredentialsProviderBuilderMethod() {

diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicClass.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/model/GapicClass.java
@@ -43,7 +43,7 @@ public enum Kind {
   public abstract String apiShortName();
 
   // Only used for generating the region tag for samples; therefore only used in select Composers.
-  public abstract String apiVersion();
+  public abstract String apiMajorVersion();
 
   /**
    * Create a GapicClass with minimal information. This is intended to be used for GapicClasses that
@@ -76,7 +76,7 @@ static Builder builder() {
     return new AutoValue_GapicClass.Builder()
         .setSamples(Collections.emptyList())
         .setApiShortName("")
-        .setApiVersion("");
+        .setApiMajorVersion("");
   }
 
   abstract Builder toBuilder();
@@ -89,8 +89,8 @@ public final GapicClass withApiShortName(String apiShortName) {
     return toBuilder().setApiShortName(apiShortName).build();
   }
 
-  public final GapicClass withApiVersion(String apiVersion) {
-    return toBuilder().setApiVersion(apiVersion).build();
+  public final GapicClass withApiMajorVersion(String apiMajorVersion) {
+    return toBuilder().setApiMajorVersion(apiMajorVersion).build();
   }
 
   @AutoValue.Builder
@@ -103,7 +103,7 @@ abstract static class Builder {
 
     abstract Builder setApiShortName(String apiShortName);
 
-    abstract Builder setApiVersion(String apiVersion);
+    abstract Builder setApiMajorVersion(String apiMajorVersion);
 
     abstract GapicClass build();
   }

diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/ComposerTest.java b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/ComposerTest.java
@@ -45,7 +45,7 @@ public class ComposerTest {
           GrpcServiceCallableFactoryClassComposer.instance()
               .generate(context, echoProtoService)
               .withApiShortName(echoProtoService.apiShortName())
-              .withApiVersion(echoProtoService.apiMajorVersion()));
+              .withApiMajorVersion(echoProtoService.apiMajorVersion()));
   private final Sample sample =
       Sample.builder()
           .setRegionTag(
@@ -160,7 +160,7 @@ private List<GapicClass> getTestClassListFromService(Service testService) {
             .generate(context, testService)
             .withSamples(ListofSamples)
             .withApiShortName(testService.apiShortName())
-            .withApiVersion(testService.apiMajorVersion());
+            .withApiMajorVersion(testService.apiMajorVersion());
     List<GapicClass> testClassList = Arrays.asList(new GapicClass[] {testClass});
     return testClassList;
   }

diff --git a/...est/java/com/google/api/generator/gapic/composer/grpc/ServiceClientClassComposerTest.java b/...est/java/com/google/api/generator/gapic/composer/grpc/ServiceClientClassComposerTest.java
@@ -83,6 +83,6 @@ public void generateServiceClientClasses() {
     Assert.assertGoldenSamples(
         this.getClass(), name, clazz.classDefinition().packageString(), clazz.samples());
     Assert.assertCodeEquals(clazz.apiShortName(), apiShortNameExpected);
-    Assert.assertCodeEquals(clazz.apiVersion(), apiVersionExpected);
+    Assert.assertCodeEquals(clazz.apiMajorVersion(), apiVersionExpected);
   }
 }
diff --git a/...t/java/com/google/api/generator/gapic/composer/grpc/ServiceSettingsClassComposerTest.java b/...t/java/com/google/api/generator/gapic/composer/grpc/ServiceSettingsClassComposerTest.java
@@ -69,6 +69,6 @@ public void generateServiceSettingsClasses() {
         clazz.classDefinition().packageString(),
         clazz.samples());
     Assert.assertCodeEquals(clazz.apiShortName(), apiShortNameExpected);
-    Assert.assertCodeEquals(clazz.apiVersion(), apiVersionExpected);
+    Assert.assertCodeEquals(clazz.apiMajorVersion(), apiVersionExpected);
   }
 }
diff --git a/.../test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubClassComposerTest.java b/.../test/java/com/google/api/generator/gapic/composer/grpc/ServiceStubClassComposerTest.java
@@ -55,6 +55,6 @@ public void generateServiceStubClasses() {
     Assert.assertGoldenClass(this.getClass(), clazz, name + ".golden");
     Assert.assertEmptySamples(clazz.samples());
     Assert.assertCodeEquals(clazz.apiShortName(), apiShortNameExpected);
-    Assert.assertCodeEquals(clazz.apiVersion(), apiVersionExpected);
+    Assert.assertCodeEquals(clazz.apiMajorVersion(), apiVersionExpected);
   }
 }
diff --git a/...va/com/google/api/generator/gapic/composer/grpc/ServiceStubSettingsClassComposerTest.java b/...va/com/google/api/generator/gapic/composer/grpc/ServiceStubSettingsClassComposerTest.java
@@ -81,6 +81,6 @@ public void generateServiceStubSettingsClasses() {
         clazz.classDefinition().packageString(),
         clazz.samples());
     Assert.assertCodeEquals(clazz.apiShortName(), apiShortNameExpected);
-    Assert.assertCodeEquals(clazz.apiVersion(), apiVersionExpected);
+    Assert.assertCodeEquals(clazz.apiMajorVersion(), apiVersionExpected);
   }
 }