[ggj][codegen] feat: add creator methods to ServiceClient

BUILD.bazel

@@ -76,6 +76,24 @@ java_proto_library(
     ],
 )
 
+java_proto_library(
+    name = "rpc_java_proto",
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "@com_google_googleapis//google/rpc:code_proto",
+        "@com_google_googleapis//google/rpc:error_details_proto",
+        "@com_google_googleapis//google/rpc:status_proto",
+    ],
+)
+
+java_proto_library(
+    name = "service_config_java_proto",
+    visibility = ["//:__subpackages__"],
+    deps = [
+        "@io_grpc_proto//:service_config_proto",
+    ],
+)
+
 # ============= Binary targets ================
 
 java_binary(

repositories.bzl

@@ -133,6 +133,15 @@ def com_google_api_codegen_repositories():
         strip_prefix = "grpc-java-%s" % _io_grpc_version,
     )
 
+    # grpc-proto doesn't have releases, so we use hashes instead.
+    _io_grpc_proto_prefix = "0020624375a8ee4c7dd9b3e513e443b90bc28990"  # Aug. 20, 2020.
+    _maybe(
+        http_archive,
+        name = "io_grpc_proto",
+        urls = ["https://github.com/grpc/grpc-proto/archive/%s.zip" % _io_grpc_proto_prefix],
+        strip_prefix = "grpc-proto-%s" % _io_grpc_proto_prefix,
+    )
+
 def _maybe(repo_rule, name, strip_repo_prefix = "", **kwargs):
     if not name.startswith(strip_repo_prefix):
         return

run.sh

@@ -5,7 +5,7 @@
 # Usage example here:
 : << 'EXAMPLE'
   DIR=~/dev/googleapis/google/showcase/v1beta1
-  ./run.sh --g ~/dev/googleapis --p "$DIR"-s "$DIR/showcase_grpc_config.json"
+  ./run.sh --g ~/dev/googleapis --p "$DIR"-s "$DIR/showcase_grpc_service_config.json"
 EXAMPLE
 
 source gbash.sh

src/main/java/com/google/api/generator/engine/ast/ExprStatement.java

@@ -50,11 +50,12 @@ public ExprStatement build() {
       } else {
         Preconditions.checkState(
             (expr instanceof MethodInvocationExpr)
+                || (expr instanceof ReferenceConstructorExpr)
                 || (expr instanceof AssignmentExpr)
                 || (expr instanceof ThrowExpr)
                 || (expr instanceof ReturnExpr),
-            "Expression statements must be either a method invocation, assignment, throw, or"
-                + " return expression");
+            "Expression statements must be either a method invocation, assignment, throw, "
+                + "this/super constructor, or return expression");
       }
       return exprStatement;
     }

src/main/java/com/google/api/generator/engine/ast/IdentifierNode.java

@@ -59,7 +59,16 @@ public abstract static class Builder {
 
     abstract IdentifierNode autoBuild();
 
+    public IdentifierNode buildVariableIdentifier() throws InvalidIdentifierException {
+      return build(/* isField= */ true);
+    }
+
     public IdentifierNode build() throws InvalidIdentifierException {
+      return build(/* isField= */ false);
+    }
+
+    // Private.
+    IdentifierNode build(boolean isField) throws InvalidIdentifierException {
       IdentifierNode identifier = autoBuild();
       String identifierName = identifier.name();
       Preconditions.checkNotNull(identifierName);
@@ -84,9 +93,17 @@ public IdentifierNode build() throws InvalidIdentifierException {
             String.format("Name %s cannot contain non-alphanumeric characters", identifierName));
       }
 
-      if (Keyword.isKeyword(identifierName)) {
-        throw new InvalidIdentifierException(
-            String.format("Name %s cannot be a keyword.", identifierName));
+      if (isField) {
+        if (Keyword.isInvalidFieldName(identifierName)) {
+          throw new InvalidIdentifierException(
+              String.format("Name %s cannot be a keyword.", identifierName));
+        }
+
+      } else {
+        if (Keyword.isKeyword(identifierName)) {
+          throw new InvalidIdentifierException(
+              String.format("Name %s cannot be a keyword.", identifierName));
+        }
       }
 
       return identifier;

src/main/java/com/google/api/generator/engine/ast/ReferenceConstructorExpr.java

@@ -17,6 +17,7 @@
 import com.google.auto.value.AutoValue;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
@@ -54,6 +55,10 @@ public static Builder superBuilder() {
   public abstract static class Builder {
     public abstract Builder setType(TypeNode node);
 
+    public Builder setArguments(Expr... arguments) {
+      return setArguments(Arrays.asList(arguments));
+    }
+
     public abstract Builder setArguments(List<Expr> arguments);
 
     // private.
@@ -65,7 +70,7 @@ public ReferenceConstructorExpr build() {
       ReferenceConstructorExpr referenceConstructorExpr = autoBuild();
       Preconditions.checkState(
           referenceConstructorExpr.type().isReferenceType(referenceConstructorExpr.type()),
-          "ReferenceConstructExpr type must be reference type. ");
+          "A this/super constructor must have a reference type.");
       return referenceConstructorExpr;
     }
   }

src/main/java/com/google/api/generator/engine/ast/ThrowExpr.java

@@ -26,7 +26,7 @@ public abstract class ThrowExpr implements Expr {
   public abstract TypeNode type();
 
   @Nullable
-  public abstract String message();
+  public abstract Expr messageExpr();
 
   @Override
   public void accept(AstNodeVisitor visitor) {
@@ -41,19 +41,29 @@ public static Builder builder() {
   public abstract static class Builder {
     public abstract Builder setType(TypeNode type);
 
-    public abstract Builder setMessage(String message);
+    public Builder setMessageExpr(String message) {
+      return setMessageExpr(ValueExpr.withValue(StringObjectValue.withValue(message)));
+    }
+
+    public abstract Builder setMessageExpr(Expr expr);
 
     // Private.
+    abstract TypeNode type();
+
+    abstract Expr messageExpr();
+
     abstract ThrowExpr autoBuild();
 
     public ThrowExpr build() {
-      // TODO(miraleung): Escaping message() and the corresponding tests will be done when we switch
-      // to StringObjectValue.
-      ThrowExpr throwExpr = autoBuild();
       Preconditions.checkState(
-          TypeNode.isExceptionType(throwExpr.type()),
-          String.format("Type %s must be an exception type", throwExpr.type()));
-      return throwExpr;
+          TypeNode.isExceptionType(type()),
+          String.format("Type %s must be an exception type", type()));
+      if (messageExpr() != null) {
+        Preconditions.checkState(
+            messageExpr().type().equals(TypeNode.STRING),
+            String.format("Message expression type must be a string for exception %s", type()));
+      }
+      return autoBuild();
     }
   }
 }

src/main/java/com/google/api/generator/engine/ast/Variable.java

@@ -42,7 +42,8 @@ public abstract static class Builder {
     abstract Variable autoBuild();
 
     public Variable build() {
-      IdentifierNode identifier = IdentifierNode.builder().setName(name()).build();
+      IdentifierNode identifier =
+          IdentifierNode.builder().setName(name()).buildVariableIdentifier();
       setIdentifier(identifier);
 
       Variable variable = autoBuild();

src/main/java/com/google/api/generator/engine/ast/VariableExpr.java

@@ -14,6 +14,7 @@
 
 package com.google.api.generator.engine.ast;
 
+import com.google.api.generator.engine.lexicon.Keyword;
 import com.google.auto.value.AutoValue;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
@@ -28,6 +29,9 @@ public abstract class VariableExpr implements Expr {
   @Nullable
   public abstract Expr exprReferenceExpr();
 
+  @Nullable
+  public abstract TypeNode staticReferenceType();
+
   /** Variable declaration fields. */
   public abstract boolean isDecl();
 
@@ -85,6 +89,9 @@ public abstract static class Builder {
     // Optional, but cannot co-exist with a variable declaration.
     public abstract Builder setExprReferenceExpr(Expr exprReference);
 
+    // Optional, but cannot co-exist with an expression reference.
+    public abstract Builder setStaticReferenceType(TypeNode type);
+
     public abstract Builder setIsDecl(boolean isDecl);
 
     public abstract Builder setScope(ScopeNode scope);
@@ -126,11 +133,35 @@ public VariableExpr build() {
             variableExpr.isDecl() ^ (variableExpr.exprReferenceExpr() != null),
             "Variable references cannot be declared");
       }
+
+      Preconditions.checkState(
+          variableExpr.exprReferenceExpr() == null || variableExpr.staticReferenceType() == null,
+          "Only the expression reference or the static reference can be set, not both");
+
       if (variableExpr.exprReferenceExpr() != null) {
         Preconditions.checkState(
             TypeNode.isReferenceType(variableExpr.exprReferenceExpr().type()),
             "Variables can only be referenced from object types");
       }
+      if (variableExpr.staticReferenceType() != null) {
+        Preconditions.checkState(
+            TypeNode.isReferenceType(variableExpr.staticReferenceType()),
+            String.format(
+                "Static field references can only be done on static types, but instead found %s",
+                variableExpr.staticReferenceType()));
+      }
+
+      // A variable name of "class" is valid only when it's a static reference.
+      String varName = variableExpr.variable().identifier().name();
+      if (Keyword.isKeyword(varName)) {
+        Preconditions.checkState(
+            variableExpr.staticReferenceType() != null
+                || (variableExpr.exprReferenceExpr() != null
+                    && TypeNode.isReferenceType(variableExpr.exprReferenceExpr().type())),
+            String.format(
+                "Variable field name %s is invalid on non-static or non-reference types", varName));
+      }
+
       return variableExpr;
     }
   }

src/main/java/com/google/api/generator/engine/lexicon/Keyword.java

@@ -17,6 +17,9 @@
 import com.google.common.collect.ImmutableList;
 
 public class Keyword {
+  // This is a valid field for all objects, so handle particular keyword differently.
+  private static final String CLASS_KEYWORD = "class";
+
   private static final ImmutableList<String> KEYWORDS =
       ImmutableList.of(
           "abstract",
@@ -59,7 +62,6 @@ public class Keyword {
           "interface",
           "static",
           "void",
-          "class",
           "finally",
           "long",
           "strictfp",
@@ -71,6 +73,10 @@ public class Keyword {
           "while");
 
   public static boolean isKeyword(String s) {
+    return s.equals(CLASS_KEYWORD) || KEYWORDS.contains(s);
+  }
+
+  public static boolean isInvalidFieldName(String s) {
     return KEYWORDS.contains(s);
   }
 }

src/main/java/com/google/api/generator/engine/writer/ImportWriterVisitor.java

@@ -135,6 +135,9 @@ public void visit(VariableExpr variableExpr) {
     if (variableExpr.exprReferenceExpr() != null) {
       variableExpr.exprReferenceExpr().accept(this);
     }
+    if (variableExpr.staticReferenceType() != null) {
+      variableExpr.staticReferenceType().accept(this);
+    }
     variableExpr.templateNodes().stream().forEach(n -> n.accept(this));
   }
 
@@ -146,6 +149,8 @@ public void visit(AssignmentExpr assignmentExpr) {
 
   @Override
   public void visit(MethodInvocationExpr methodInvocationExpr) {
+    // May not actually be used in source, but import it anyway. Unused imports will be removed by
+    // the formatter.
     methodInvocationExpr.returnType().accept(this);
     if (methodInvocationExpr.staticReferenceType() != null) {
       methodInvocationExpr.staticReferenceType().accept(this);
@@ -173,6 +178,9 @@ public void visit(AnonymousClassExpr anonymousClassExpr) {
   @Override
   public void visit(ThrowExpr throwExpr) {
     throwExpr.type().accept(this);
+    if (throwExpr.messageExpr() != null) {
+      throwExpr.messageExpr().accept(this);
+    }
   }
 
   @Override

src/main/java/com/google/api/generator/engine/writer/JavaWriterVisitor.java

@@ -49,7 +49,6 @@
 import com.google.api.generator.engine.ast.Variable;
 import com.google.api.generator.engine.ast.VariableExpr;
 import com.google.api.generator.engine.ast.WhileStatement;
-import com.google.common.base.Strings;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
@@ -202,9 +201,15 @@ public void visit(VariableExpr variableExpr) {
         rightAngle();
       }
       space();
-    } else if (variableExpr.exprReferenceExpr() != null) {
-      variableExpr.exprReferenceExpr().accept(this);
-      buffer.append(DOT);
+    } else {
+      // Expression or static reference.
+      if (variableExpr.exprReferenceExpr() != null) {
+        variableExpr.exprReferenceExpr().accept(this);
+        buffer.append(DOT);
+      } else if (variableExpr.staticReferenceType() != null) {
+        variableExpr.staticReferenceType().accept(this);
+        buffer.append(DOT);
+      }
     }
 
     variable.identifier().accept(this);
@@ -304,11 +309,8 @@ public void visit(ThrowExpr throwExpr) {
     space();
     throwExpr.type().accept(this);
     leftParen();
-    if (!Strings.isNullOrEmpty(throwExpr.message())) {
-      // TODO(miraleung): Update this when we use StringObjectValue.
-      buffer.append(ESCAPED_QUOTE);
-      buffer.append(throwExpr.message());
-      buffer.append(ESCAPED_QUOTE);
+    if (throwExpr.messageExpr() != null) {
+      throwExpr.messageExpr().accept(this);
     }
     rightParen();
   }

src/main/java/com/google/api/generator/gapic/composer/BUILD.bazel

@@ -13,6 +13,7 @@ java_library(
     deps = [
         "//:longrunning_java_proto",
         "//:monitored_resource_java_proto",
+        "//:service_config_java_proto",
         "//src/main/java/com/google/api/generator/engine/ast",
         "//src/main/java/com/google/api/generator/gapic:status_java_proto",
         "//src/main/java/com/google/api/generator/gapic/model",