[ggj][build] fix: fix asset_java_gapic build

rules_java_gapic/java_gapic.bzl

@@ -31,9 +31,14 @@ def _java_gapic_postprocess_srcjar_impl(ctx):
     unzip -q temp-codegen.srcjar -d {output_dir_path}
     # This may fail if there are spaces and/or too many files (exceed max length of command length).
     {formatter} --replace $(find {output_dir_path} -type f -printf "%p ")
-    zip -r -j {output_srcjar_name}.srcjar {output_dir_path}/src/main/*
-    zip -r -j {output_srcjar_name}-resource-name.srcjar {output_dir_path}/proto/src/main/*
-    zip -r -j {output_srcjar_name}-tests.srcjar {output_dir_path}/src/test/*
+    WORKING_DIR=`pwd`
+    cd {output_dir_path}/src/main/java
+    zip -r $WORKING_DIR/{output_srcjar_name}.srcjar ./
+    cd $WORKING_DIR/{output_dir_path}/proto/src/main/java
+    zip -r $WORKING_DIR/{output_srcjar_name}-resource-name.srcjar ./
+    cd $WORKING_DIR/{output_dir_path}/proto/src/test/java
+    zip -r $WORKING_DIR/{output_srcjar_name}-tests.srcjar ./
+    cd $WORKING_DIR
     mv {output_srcjar_name}.srcjar {output_main}
     mv {output_srcjar_name}-resource-name.srcjar {output_resource_name}
     mv {output_srcjar_name}-tests.srcjar {output_test}

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

@@ -89,11 +89,18 @@ public String pakkage() {
   public abstract boolean useFullName();
 
   @Override
-  public String enclosingClassName() {
+  public ImmutableList<String> enclosingClassNames() {
     if (!hasEnclosingClass()) {
-      return null;
+      return ImmutableList.of();
     }
-    return clazz().getEnclosingClass().getSimpleName();
+    // The innermost type will be the last element in the list.
+    ImmutableList.Builder<String> listBuilder = new ImmutableList.Builder<>();
+    Class currentClz = clazz();
+    while (currentClz.getEnclosingClass() != null) {
+      listBuilder.add(currentClz.getEnclosingClass().getSimpleName());
+      currentClz = currentClz.getEnclosingClass();
+    }
+    return listBuilder.build();
   }
 
   @Override

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

@@ -30,7 +30,7 @@ public interface Reference {
   boolean useFullName();
 
   @Nullable
-  String enclosingClassName();
+  ImmutableList<String> enclosingClassNames();
 
   @Nullable
   Reference wildcardUpperBound();

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

@@ -15,9 +15,9 @@
 package com.google.api.generator.engine.ast;
 
 import com.google.auto.value.AutoValue;
-import com.google.common.base.Strings;
 import com.google.common.collect.ImmutableList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import javax.annotation.Nullable;
@@ -43,7 +43,7 @@ public abstract class VaporReference implements Reference {
 
   @Nullable
   @Override
-  public abstract String enclosingClassName();
+  public abstract ImmutableList<String> enclosingClassNames();
 
   @Nullable
   public abstract Reference supertypeReference();
@@ -56,9 +56,9 @@ public Reference wildcardUpperBound() {
 
   @Override
   public String fullName() {
-    // TODO(unsupported): Nested classes with depth greater than 1.
     if (hasEnclosingClass()) {
-      return String.format("%s.%s.%s", pakkage(), enclosingClassName(), plainName());
+      return String.format(
+          "%s.%s.%s", pakkage(), String.join(DOT, enclosingClassNames()), plainName());
     }
     return String.format("%s.%s", pakkage(), plainName());
   }
@@ -68,7 +68,7 @@ public String fullName() {
 
   @Override
   public boolean hasEnclosingClass() {
-    return !Strings.isNullOrEmpty(enclosingClassName());
+    return !enclosingClassNames().isEmpty();
   }
 
   @Override
@@ -86,7 +86,7 @@ public boolean isSupertypeOrEquals(Reference other) {
     VaporReference ref = (VaporReference) other;
     return pakkage().equals(ref.pakkage())
         && plainName().equals(ref.plainName())
-        && Objects.equals(enclosingClassName(), ref.enclosingClassName());
+        && Objects.equals(enclosingClassNames(), ref.enclosingClassNames());
   }
 
   @Override
@@ -112,14 +112,14 @@ public boolean equals(Object o) {
     return pakkage().equals(ref.pakkage())
         && name().equals(ref.name())
         && generics().equals(ref.generics())
-        && Objects.equals(enclosingClassName(), ref.enclosingClassName());
+        && Objects.equals(enclosingClassNames(), ref.enclosingClassNames());
   }
 
   @Override
   public int hashCode() {
     int hash = 17 * pakkage().hashCode() + 19 * name().hashCode() + 23 * generics().hashCode();
-    if (!Strings.isNullOrEmpty(enclosingClassName())) {
-      hash += 29 * enclosingClassName().hashCode();
+    if (!enclosingClassNames().isEmpty()) {
+      hash += 29 * enclosingClassNames().hashCode();
     }
     return hash;
   }
@@ -133,7 +133,8 @@ public static Builder builder() {
     return new AutoValue_VaporReference.Builder()
         .setUseFullName(false)
         .setGenerics(ImmutableList.of())
-        .setIsStaticImport(false);
+        .setIsStaticImport(false)
+        .setEnclosingClassNames(Collections.emptyList());
   }
 
   // Private.
@@ -153,7 +154,11 @@ public Builder setGenerics(Reference... references) {
 
     public abstract Builder setGenerics(List<Reference> clazzes);
 
-    public abstract Builder setEnclosingClassName(String enclosingClassName);
+    public Builder setEnclosingClassNames(String... enclosingClassNames) {
+      return setEnclosingClassNames(Arrays.asList(enclosingClassNames));
+    }
+
+    public abstract Builder setEnclosingClassNames(List<String> enclosingClassNames);
 
     public abstract Builder setIsStaticImport(boolean isStaticImport);
 
@@ -166,8 +171,7 @@ public Builder setGenerics(Reference... references) {
 
     abstract ImmutableList<Reference> generics();
 
-    @Nullable
-    abstract String enclosingClassName();
+    abstract ImmutableList<String> enclosingClassNames();
 
     abstract boolean isStaticImport();
 
@@ -180,11 +184,11 @@ public VaporReference build() {
 
       setPlainName(name());
 
-      setIsStaticImport(enclosingClassName() != null && isStaticImport());
+      setIsStaticImport(!enclosingClassNames().isEmpty() && isStaticImport());
 
       StringBuilder sb = new StringBuilder();
-      if (enclosingClassName() != null && !isStaticImport()) {
-        sb.append(enclosingClassName());
+      if (!enclosingClassNames().isEmpty() && !isStaticImport()) {
+        sb.append(String.join(DOT, enclosingClassNames()));
         sb.append(DOT);
       }
 

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

@@ -68,6 +68,7 @@
 import javax.annotation.Nullable;
 
 public class ImportWriterVisitor implements AstNodeVisitor {
+  private static final String DOT = ".";
   private static final String NEWLINE = "\n";
   private static final String PKG_JAVA_LANG = "java.lang";
 
@@ -423,7 +424,8 @@ private void references(List<Reference> refs) {
 
       if (ref.isStaticImport()
           && !Strings.isNullOrEmpty(currentClassName)
-          && ref.enclosingClassName().equals(currentClassName)) {
+          && !ref.enclosingClassNames().isEmpty()
+          && ref.enclosingClassNames().contains(currentClassName)) {
         continue;
       }
 
@@ -432,7 +434,8 @@ private void references(List<Reference> refs) {
         staticImports.add(ref.fullName());
       } else {
         if (ref.hasEnclosingClass()) {
-          imports.add(String.format("%s.%s", ref.pakkage(), ref.enclosingClassName()));
+          imports.add(
+              String.format("%s.%s", ref.pakkage(), String.join(DOT, ref.enclosingClassNames())));
         } else {
           imports.add(ref.fullName());
         }

src/main/java/com/google/api/generator/gapic/composer/BatchingDescriptorComposer.java

@@ -153,7 +153,7 @@ private static MethodDefinition createGetRequestBuilderMethod(
     TypeNode builderType =
         TypeNode.withReference(
             VaporReference.builder()
-                .setEnclosingClassName(method.inputType().reference().name())
+                .setEnclosingClassNames(method.inputType().reference().name())
                 .setName("Builder")
                 .setPakkage(method.inputType().reference().pakkage())
                 .build());

src/main/java/com/google/api/generator/gapic/composer/DefaultValueComposer.java

@@ -77,10 +77,22 @@ static Expr createDefaultValue(
   }
 
   static Expr createDefaultValue(Field f) {
+    return createDefaultValue(f, false);
+  }
+
+  static Expr createDefaultValue(Field f, boolean useExplicitInitTypeInGenerics) {
     if (f.isRepeated()) {
-      TypeNode newType =
-          TypeNode.withReference(
-              ConcreteReference.withClazz(f.isMap() ? HashMap.class : ArrayList.class));
+      ConcreteReference.Builder refBuilder =
+          ConcreteReference.builder().setClazz(f.isMap() ? HashMap.class : ArrayList.class);
+      if (useExplicitInitTypeInGenerics) {
+        if (f.isMap()) {
+          refBuilder = refBuilder.setGenerics(f.type().reference().generics().subList(0, 2));
+        } else {
+          refBuilder = refBuilder.setGenerics(f.type().reference().generics().get(0));
+        }
+      }
+
+      TypeNode newType = TypeNode.withReference(refBuilder.build());
       return NewObjectExpr.builder().setType(newType).setIsGeneric(true).build();
     }
 
@@ -238,7 +250,7 @@ static Expr createSimpleMessageBuilderExpr(
                 .setReturnType(TypeNode.STRING)
                 .build();
       } else {
-        defaultExpr = createDefaultValue(field);
+        defaultExpr = createDefaultValue(field, true);
       }
       builderExpr =
           MethodInvocationExpr.builder()

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

@@ -1049,7 +1049,7 @@ private static Map<String, TypeNode> createDynamicTypes(Service service, String
                             VaporReference.builder()
                                 .setName(String.format(PAGED_RESPONSE_TYPE_NAME_PATTERN, m.name()))
                                 .setPakkage(service.pakkage())
-                                .setEnclosingClassName(String.format("%sClient", service.name()))
+                                .setEnclosingClassNames(String.format("%sClient", service.name()))
                                 .setIsStaticImport(true)
                                 .build()))));
     return types;

src/main/java/com/google/api/generator/gapic/composer/ResourceNameHelperClassComposer.java

@@ -1575,7 +1575,7 @@ private static Map<String, TypeNode> createDynamicTypes(
             VaporReference.builder()
                 .setName("Builder")
                 .setPakkage(resourceName.pakkage())
-                .setEnclosingClassName(thisClassName)
+                .setEnclosingClassNames(thisClassName)
                 .setIsStaticImport(true)
                 .build()));
 
@@ -1591,7 +1591,7 @@ private static Map<String, TypeNode> createDynamicTypes(
                               VaporReference.builder()
                                   .setName(s)
                                   .setPakkage(resourceName.pakkage())
-                                  .setEnclosingClassName(thisClassName)
+                                  .setEnclosingClassNames(thisClassName)
                                   .setIsStaticImport(true)
                                   .build()))));
     }

src/main/java/com/google/api/generator/gapic/composer/ResourceNameTokenizer.java

@@ -15,16 +15,21 @@
 package com.google.api.generator.gapic.composer;
 
 import com.google.api.pathtemplate.PathTemplate;
+import com.google.common.base.Preconditions;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
 public class ResourceNameTokenizer {
-  private static final String SLASH = "/";
   private static final String LEFT_BRACE = "{";
   private static final String RIGHT_BRACE = "}";
+  private static final String SLASH = "/";
+  private static final String EMPTY = "";
+
+  private static final String EQUALS_WILDCARD = "=*";
+  private static final String EQUALS_PATH_WILDCARD = "=**";
 
   static List<List<String>> parseTokenHierarchy(List<String> patterns) {
     List<String> nonSlashSepStrings = Arrays.asList("}_{", "}-{", "}.{", "}~{");
@@ -36,22 +41,38 @@ static List<List<String>> parseTokenHierarchy(List<String> patterns) {
       String[] patternTokens = pattern.split(SLASH);
       for (String patternToken : patternTokens) {
         if (patternToken.startsWith(LEFT_BRACE) && patternToken.endsWith(RIGHT_BRACE)) {
-          String processedPatternToken = patternToken;
+          String processedPatternToken =
+              // Replacement order matters - ensure the first is not a subcomponent of the second.
+              patternToken.replace(EQUALS_PATH_WILDCARD, EMPTY).replace(EQUALS_WILDCARD, EMPTY);
 
           // Handle non-slash separators.
           if (nonSlashSepStrings.stream().anyMatch(s -> patternToken.contains(s))) {
             for (String str : nonSlashSepStrings) {
               processedPatternToken = processedPatternToken.replace(str, "_");
             }
           } else {
+            final int processedPatternTokenLength = processedPatternToken.length();
             // Handles wildcards.
-            processedPatternToken =
+            List<String> candidateVars =
                 vars.stream()
-                    .filter(v -> patternToken.contains(v))
-                    .collect(Collectors.toList())
-                    .get(0);
+                    // Check that the token size is within ~3 of the var, to avoid mismatching on
+                    // variables with same-named subcomponents.
+                    // Otherwise, "customer_client_link" will match with "customer".
+                    .filter(
+                        v ->
+                            patternToken.contains(v)
+                                // Accounting for braces.
+                                && processedPatternTokenLength - v.length() < 3)
+                    .collect(Collectors.toList());
+            Preconditions.checkState(
+                !candidateVars.isEmpty(),
+                String.format(
+                    "No variable candidates found for token %s in pattern %s",
+                    processedPatternToken, pattern));
+            processedPatternToken = candidateVars.get(0);
           }
-          hierarchy.add(processedPatternToken.replace("{", "").replace("}", ""));
+          hierarchy.add(
+              processedPatternToken.replace(LEFT_BRACE, EMPTY).replace(RIGHT_BRACE, EMPTY));
         }
       }
       tokenHierachies.add(hierarchy);

src/main/java/com/google/api/generator/gapic/composer/ServiceClientClassComposer.java

@@ -1440,7 +1440,7 @@ private static Map<String, TypeNode> createVaporTypes(Service service) {
                               VaporReference.builder()
                                   .setName(
                                       String.format(t, JavaStyle.toUpperCamelCase(method.name())))
-                                  .setEnclosingClassName(getClientClassName(service.name()))
+                                  .setEnclosingClassNames(getClientClassName(service.name()))
                                   .setPakkage(service.pakkage())
                                   .setIsStaticImport(true) // Same class, so they won't be imported.
                                   .build()))));
@@ -1465,7 +1465,7 @@ private static Map<String, TypeNode> createVaporTypes(Service service) {
                             VaporReference.builder()
                                 .setName(String.format(PAGED_RESPONSE_TYPE_NAME_PATTERN, m.name()))
                                 .setPakkage(service.pakkage())
-                                .setEnclosingClassName(getClientClassName(service.name()))
+                                .setEnclosingClassNames(getClientClassName(service.name()))
                                 .setIsStaticImport(true)
                                 .build()))));
     return types;

src/main/java/com/google/api/generator/gapic/composer/ServiceClientTestClassComposer.java

@@ -1749,7 +1749,7 @@ private static Map<String, TypeNode> createDynamicTypes(Service service) {
                             VaporReference.builder()
                                 .setName(String.format(PAGED_RESPONSE_TYPE_NAME_PATTERN, m.name()))
                                 .setPakkage(service.pakkage())
-                                .setEnclosingClassName(getClientClassName(service.name()))
+                                .setEnclosingClassNames(getClientClassName(service.name()))
                                 .setIsStaticImport(true)
                                 .build()))));
     return types;
@@ -1864,7 +1864,7 @@ private static TypeNode getPagedResponseType(Method method, Service service) {
         VaporReference.builder()
             .setName(String.format(PAGED_RESPONSE_TYPE_NAME_PATTERN, method.name()))
             .setPakkage(service.pakkage())
-            .setEnclosingClassName(getClientClassName(service.name()))
+            .setEnclosingClassNames(getClientClassName(service.name()))
             .setIsStaticImport(true)
             .build());
   }