Merge remote-tracking branch 'origin/fix/bazel' into fix/bazel

Author: miraleung

.github/workflows/ci.yaml

@@ -51,11 +51,6 @@ jobs:
       - name: Integration Tests
         run: bazel --batch test //test/integration/...
 
-      - uses: actions/upload-artifact@v2
-        if: ${{ failure() }}
-
-        run: bazel --batch test //test/integration/...
-
       - uses: actions/upload-artifact@v2
         if: ${{ failure() }}
         with:

CHANGELOG.md

@@ -1,5 +1,36 @@
 # Changelog
 
+### [1.0.15](https://www.github.com/googleapis/gapic-generator-java/compare/v1.0.14...v1.0.15) (2021-06-22)
+
+
+### Features
+
+* Implement field presence support for DIREGAPIC ([#774](https://www.github.com/googleapis/gapic-generator-java/issues/774)) ([c820361](https://www.github.com/googleapis/gapic-generator-java/commit/c82036105d299b0a1192cd0def5e68253e4f542c))
+
+
+### Bug Fixes
+
+* **service.yaml:** Remove allowlist restriction ([#776](https://www.github.com/googleapis/gapic-generator-java/issues/776)) ([8f42efd](https://www.github.com/googleapis/gapic-generator-java/commit/8f42efdb92d606a768a524517fe949c4f9112025))
+
+
+### Miscellaneous Chores
+
+* release 1.0.15 ([f752478](https://www.github.com/googleapis/gapic-generator-java/commit/f75247845344540a94c4efcd416f34f96ea0c2a3))
+
+### [1.0.14](https://www.github.com/googleapis/gapic-generator-java/compare/v1.0.13...v1.0.14) (2021-06-17)
+
+
+### Features
+
+* Add DIREGAPIC-specific pagination ([#767](https://www.github.com/googleapis/gapic-generator-java/issues/767)) ([1294c29](https://www.github.com/googleapis/gapic-generator-java/commit/1294c298f50cc4474ae562e6a07f37a5f94fe5b8))
+
+
+### Bug Fixes
+
+* **bazel:** Remove monolith rule deps from the Java µgen Bazel rules ([#764](https://www.github.com/googleapis/gapic-generator-java/issues/764)) ([bff3efc](https://www.github.com/googleapis/gapic-generator-java/commit/bff3efc25e43692ea5b6e769c20d25d5b9a1e3d2))
+
+
+
 ### [1.0.13](https://www.github.com/googleapis/gapic-generator-java/compare/v1.0.12...v1.0.13) (2021-06-16)
 
 

rules_java_gapic/java_gapic.bzl

@@ -14,7 +14,6 @@
 
 load("@rules_gapic//:gapic.bzl", "proto_custom_library", "unzipped_srcjar")
 
-SERVICE_YAML_ALLOWLIST = ["clouddms", "cloudkms", "datastream", "pubsub"]
 NO_GRPC_CONFIG_ALLOWLIST = ["library"]
 
 def _java_gapic_postprocess_srcjar_impl(ctx):
@@ -144,19 +143,8 @@ def _java_gapic_srcjar(
     if gapic_yaml:
         file_args_dict[gapic_yaml] = "gapic-config"
 
-    # Check the allow-list.
-    # TODO: Open this up after mixins are published, and gate on
-    # the allowlisted "mixed-in" APIs present in Java.
     if service_yaml:
-        service_yaml_in_allowlist = False
-        for keyword in SERVICE_YAML_ALLOWLIST:
-            if keyword in service_yaml:
-                service_yaml_in_allowlist = True
-                break
-        if service_yaml_in_allowlist:
-            file_args_dict[service_yaml] = "api-service-config"
-        else:
-            fail("Service.yaml is no longer supported in the Java microgenerator")
+        file_args_dict[service_yaml] = "api-service-config"
 
     output_suffix = ".srcjar"
     opt_args = []

src/main/java/com/google/api/generator/gapic/composer/grpc/GrpcServiceStubClassComposer.java

@@ -34,6 +34,7 @@
 import com.google.api.generator.engine.ast.VariableExpr;
 import com.google.api.generator.gapic.composer.common.AbstractServiceStubClassComposer;
 import com.google.api.generator.gapic.composer.store.TypeStore;
+import com.google.api.generator.gapic.model.HttpBindings.HttpBinding;
 import com.google.api.generator.gapic.model.Method;
 import com.google.api.generator.gapic.model.Service;
 import com.google.api.generator.gapic.utils.JavaStyle;
@@ -288,11 +289,11 @@ private AnonymousClassExpr createRequestParamsExtractorAnonClass(Method method)
         VariableExpr.withVariable(
             Variable.builder().setType(method.inputType()).setName("request").build());
 
-    for (String httpBindingFieldName : method.httpBindings().pathParameters()) {
+    for (HttpBinding httpBindingFieldBinding : method.httpBindings().pathParameters()) {
       // Handle foo.bar cases by descending into the subfields.
       MethodInvocationExpr.Builder requestFieldGetterExprBuilder =
           MethodInvocationExpr.builder().setExprReferenceExpr(requestVarExpr);
-      String[] descendantFields = httpBindingFieldName.split("\\.");
+      String[] descendantFields = httpBindingFieldBinding.name().split("\\.");
       for (int i = 0; i < descendantFields.length; i++) {
         String currFieldName = descendantFields[i];
         String bindingFieldMethodName =
@@ -319,7 +320,7 @@ private AnonymousClassExpr createRequestParamsExtractorAnonClass(Method method)
               .setExprReferenceExpr(paramsVarExpr)
               .setMethodName("put")
               .setArguments(
-                  ValueExpr.withValue(StringObjectValue.withValue(httpBindingFieldName)),
+                  ValueExpr.withValue(StringObjectValue.withValue(httpBindingFieldBinding.name())),
                   valueOfExpr)
               .build();
       bodyExprs.add(paramsPutExpr);

src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java

@@ -30,6 +30,7 @@
 import com.google.api.generator.engine.ast.EnumRefExpr;
 import com.google.api.generator.engine.ast.Expr;
 import com.google.api.generator.engine.ast.ExprStatement;
+import com.google.api.generator.engine.ast.IfStatement;
 import com.google.api.generator.engine.ast.MethodDefinition;
 import com.google.api.generator.engine.ast.MethodInvocationExpr;
 import com.google.api.generator.engine.ast.NewObjectExpr;
@@ -42,6 +43,7 @@
 import com.google.api.generator.engine.ast.VariableExpr;
 import com.google.api.generator.gapic.composer.common.AbstractServiceStubClassComposer;
 import com.google.api.generator.gapic.composer.store.TypeStore;
+import com.google.api.generator.gapic.model.HttpBindings.HttpBinding;
 import com.google.api.generator.gapic.model.Method;
 import com.google.api.generator.gapic.model.Service;
 import com.google.api.generator.gapic.utils.JavaStyle;
@@ -357,9 +359,9 @@ private List<Expr> setResponseParserExpr(Method protoMethod) {
   private Expr createFieldsExtractorAnonClass(
       Method method,
       TypeNode extractorReturnType,
-      Set<String> httpBindingFieldNames,
+      Set<HttpBinding> httpBindingFieldNames,
       String serializerMethodName) {
-    List<Expr> bodyExprs = new ArrayList<>();
+    List<Statement> bodyStatements = new ArrayList<>();
 
     Expr returnExpr = null;
     VariableExpr fieldsVarExpr = null;
@@ -389,7 +391,7 @@ private Expr createFieldsExtractorAnonClass(
                       .build())
               .build();
 
-      bodyExprs.add(fieldsAssignExpr);
+      bodyStatements.add(ExprStatement.withExpr(fieldsAssignExpr));
       returnExpr = fieldsVarExpr;
 
       TypeNode serializerVarType =
@@ -417,40 +419,57 @@ private Expr createFieldsExtractorAnonClass(
 
       serializerExpr = serializerVarExpr;
 
-      bodyExprs.add(serializerAssignExpr);
+      bodyStatements.add(ExprStatement.withExpr(serializerAssignExpr));
     }
 
     VariableExpr requestVarExpr =
         VariableExpr.withVariable(
             Variable.builder().setType(method.inputType()).setName("request").build());
 
-    for (String httpBindingFieldName : httpBindingFieldNames) {
+    for (HttpBinding httpBindingFieldName : httpBindingFieldNames) {
       // Handle foo.bar cases by descending into the subfields.
       MethodInvocationExpr.Builder requestFieldGetterExprBuilder =
           MethodInvocationExpr.builder().setExprReferenceExpr(requestVarExpr);
-      String[] descendantFields = httpBindingFieldName.split("\\.");
+      MethodInvocationExpr.Builder requestFieldHasExprBuilder =
+          MethodInvocationExpr.builder().setExprReferenceExpr(requestVarExpr);
+      String[] descendantFields = httpBindingFieldName.name().split("\\.");
       for (int i = 0; i < descendantFields.length; i++) {
         String currFieldName = descendantFields[i];
         String bindingFieldMethodName =
             String.format("get%s", JavaStyle.toUpperCamelCase(currFieldName));
         requestFieldGetterExprBuilder =
             requestFieldGetterExprBuilder.setMethodName(bindingFieldMethodName);
+
+        String bindingFieldHasMethodName =
+            (i < descendantFields.length - 1)
+                ? bindingFieldMethodName
+                : String.format("has%s", JavaStyle.toUpperCamelCase(currFieldName));
+        requestFieldHasExprBuilder =
+            requestFieldHasExprBuilder
+                .setMethodName(bindingFieldHasMethodName)
+                .setReturnType(TypeNode.BOOLEAN);
+
         if (i < descendantFields.length - 1) {
           requestFieldGetterExprBuilder =
               MethodInvocationExpr.builder()
                   .setExprReferenceExpr(requestFieldGetterExprBuilder.build());
+          requestFieldHasExprBuilder =
+              MethodInvocationExpr.builder()
+                  .setExprReferenceExpr(requestFieldHasExprBuilder.build());
         }
       }
 
       MethodInvocationExpr requestBuilderExpr = requestFieldGetterExprBuilder.build();
+      MethodInvocationExpr requestHasExpr = requestFieldHasExprBuilder.build();
 
       ImmutableList.Builder<Expr> paramsPutArgs = ImmutableList.builder();
       if (fieldsVarExpr != null) {
         paramsPutArgs.add(fieldsVarExpr);
       }
       paramsPutArgs.add(
           ValueExpr.withValue(
-              StringObjectValue.withValue(JavaStyle.toLowerCamelCase(httpBindingFieldName))));
+              StringObjectValue.withValue(
+                  JavaStyle.toLowerCamelCase(httpBindingFieldName.name()))));
       paramsPutArgs.add(requestBuilderExpr);
 
       Expr paramsPutExpr =
@@ -464,7 +483,15 @@ private Expr createFieldsExtractorAnonClass(
       if (fieldsVarExpr == null) {
         returnExpr = paramsPutExpr;
       } else {
-        bodyExprs.add(paramsPutExpr);
+        if (httpBindingFieldName.isOptional()) {
+          bodyStatements.add(
+              IfStatement.builder()
+                  .setConditionExpr(requestHasExpr)
+                  .setBody(Arrays.asList(ExprStatement.withExpr(paramsPutExpr)))
+                  .build());
+        } else {
+          bodyStatements.add(ExprStatement.withExpr(paramsPutExpr));
+        }
       }
     }
 
@@ -475,7 +502,7 @@ private Expr createFieldsExtractorAnonClass(
             .setReturnType(extractorReturnType)
             .setName("extract")
             .setArguments(requestVarExpr.toBuilder().setIsDecl(true).build())
-            .setBody(bodyExprs.stream().map(ExprStatement::withExpr).collect(Collectors.toList()))
+            .setBody(bodyStatements)
             .setReturnExpr(returnExpr)
             .build();
 

src/main/java/com/google/api/generator/gapic/model/Field.java

@@ -17,12 +17,19 @@
 import com.google.api.generator.engine.ast.TypeNode;
 import com.google.auto.value.AutoValue;
 import java.util.Objects;
+import java.util.Optional;
 import javax.annotation.Nullable;
 
 @AutoValue
 public abstract class Field {
+  // The field's canonical name, potentially post-processed by conflict resolution logic.
   public abstract String name();
 
+  // The field's name as it appeared in the protobuf.
+  // Not equal to name() only when there is a field name conflict, as per protoc's conflict
+  // resolution behavior. For more context, please see the invocation site of the setter method.
+  public abstract String originalName();
+
   public abstract TypeNode type();
 
   public abstract boolean isMessage();
@@ -35,12 +42,18 @@ public abstract class Field {
 
   public abstract boolean isContainedInOneof();
 
+  public abstract boolean isProto3Optional();
+
   @Nullable
   public abstract ResourceReference resourceReference();
 
   @Nullable
   public abstract String description();
 
+  public boolean hasFieldNameConflict() {
+    return !name().equals(originalName());
+  }
+
   public boolean hasDescription() {
     return description() != null;
   }
@@ -57,25 +70,29 @@ public boolean equals(Object o) {
 
     Field other = (Field) o;
     return name().equals(other.name())
+        && originalName().equals(other.originalName())
         && type().equals(other.type())
         && isMessage() == other.isMessage()
         && isEnum() == other.isEnum()
         && isRepeated() == other.isRepeated()
         && isMap() == other.isMap()
         && isContainedInOneof() == other.isContainedInOneof()
+        && isProto3Optional() == other.isProto3Optional()
         && Objects.equals(resourceReference(), other.resourceReference())
         && Objects.equals(description(), other.description());
   }
 
   @Override
   public int hashCode() {
     return 17 * name().hashCode()
+        + 31 * originalName().hashCode()
         + 19 * type().hashCode()
         + (isMessage() ? 1 : 0) * 23
         + (isEnum() ? 1 : 0) * 29
         + (isRepeated() ? 1 : 0) * 31
         + (isMap() ? 1 : 0) * 37
         + (isContainedInOneof() ? 1 : 0) * 41
+        + (isProto3Optional() ? 1 : 0) * 43
         + (resourceReference() == null ? 0 : resourceReference().hashCode())
         + (description() == null ? 0 : description().hashCode());
   }
@@ -88,13 +105,16 @@ public static Builder builder() {
         .setIsEnum(false)
         .setIsRepeated(false)
         .setIsMap(false)
-        .setIsContainedInOneof(false);
+        .setIsContainedInOneof(false)
+        .setIsProto3Optional(false);
   }
 
   @AutoValue.Builder
   public abstract static class Builder {
     public abstract Builder setName(String name);
 
+    public abstract Builder setOriginalName(String originalName);
+
     public abstract Builder setType(TypeNode type);
 
     public abstract Builder setIsMessage(boolean isMessage);
@@ -107,10 +127,24 @@ public abstract static class Builder {
 
     public abstract Builder setIsContainedInOneof(boolean isContainedInOneof);
 
+    public abstract Builder setIsProto3Optional(boolean isProto3Optional);
+
     public abstract Builder setResourceReference(ResourceReference resourceReference);
 
     public abstract Builder setDescription(String description);
 
-    public abstract Field build();
+    // Private accessors.
+    abstract String name();
+
+    abstract Optional<String> originalName();
+
+    abstract Field autoBuild();
+
+    public Field build() {
+      if (!originalName().isPresent()) {
+        setOriginalName(name());
+      }
+      return autoBuild();
+    }
   }
 }