chore(engx): Add class object to TypeNode (#654)

googleapis · Feb 16, 2021 · d686c96 · d686c96
1 parent 851cf1e
commit d686c96
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git a/src/main/java/com/google/api/generator/engine/ast/TypeNode.java b/src/main/java/com/google/api/generator/engine/ast/TypeNode.java
@@ -65,6 +65,9 @@ public enum TypeKind {
   public static final TypeNode SHORT_OBJECT =
       withReference(ConcreteReference.withClazz(Short.class));
 
+  public static final TypeNode CLASS_OBJECT =
+      withReference(ConcreteReference.withClazz(Class.class));
+
   public static final TypeNode BYTESTRING =
       TypeNode.withReference(ConcreteReference.withClazz(ByteString.class));
 

diff --git a/src/main/java/com/google/api/generator/gapic/composer/RetrySettingsComposer.java b/src/main/java/com/google/api/generator/gapic/composer/RetrySettingsComposer.java
@@ -316,10 +316,7 @@ public static Expr createLroSettingsBuilderExpr(
         t ->
             VariableExpr.builder()
                 .setVariable(
-                    Variable.builder()
-                        .setType(TypeNode.withReference(ConcreteReference.withClazz(Class.class)))
-                        .setName("class")
-                        .build())
+                    Variable.builder().setType(TypeNode.CLASS_OBJECT).setName("class").build())
                 .setStaticReferenceType(t)
                 .build();
     builderSettingsExpr =

diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposer.java
@@ -1561,11 +1561,7 @@ private static List<Statement> createRpcLroExceptionTestCatchBody(
 
     Expr testExpectedValueExpr =
         VariableExpr.builder()
-            .setVariable(
-                Variable.builder()
-                    .setType(TypeNode.withReference(ConcreteReference.withClazz(Class.class)))
-                    .setName("class")
-                    .build())
+            .setVariable(Variable.builder().setType(TypeNode.CLASS_OBJECT).setName("class").build())
             .setStaticReferenceType(FIXED_TYPESTORE.get("InvalidArgumentException"))
             .build();
     Expr getCauseExpr =

diff --git a/src/main/java/com/google/api/generator/gapic/composer/ServiceStubSettingsClassComposer.java b/src/main/java/com/google/api/generator/gapic/composer/ServiceStubSettingsClassComposer.java
@@ -999,11 +999,7 @@ private static List<MethodDefinition> createDefaultHelperAndGetterMethods(
             .setArguments(
                 VariableExpr.builder()
                     .setVariable(
-                        Variable.builder()
-                            .setType(
-                                TypeNode.withReference(ConcreteReference.withClazz(Class.class)))
-                            .setName("class")
-                            .build())
+                        Variable.builder().setType(TypeNode.CLASS_OBJECT).setName("class").build())
                     .setStaticReferenceType(
                         typeStore.get(ClassNames.getServiceStubSettingsClassName(service)))
                     .build())