feat(pom): pom parent passed from BUILD rule

rules_java_gapic/java_gapic.bzl

@@ -22,6 +22,7 @@ def _java_gapic_postprocess_srcjar_impl(ctx):
     output_main = ctx.outputs.main
     output_test = ctx.outputs.test
     output_samples = ctx.outputs.samples
+    output_spring = ctx.outputs.spring
     output_resource_name = ctx.outputs.resource_name
     formatter = ctx.executable.formatter
 
@@ -65,10 +66,21 @@ def _java_gapic_postprocess_srcjar_impl(ctx):
 
     cd $WORKING_DIR
 
+    unzip -q temp-codegen-spring.srcjar -d {output_dir_path}/spring
+    # This may fail if there are spaces and/or too many files (exceed max length of command length).
+    {formatter} --replace $(find {output_dir_path}/spring -type f -printf "%p ")
+
+    # Spring source files.
+    cd {output_dir_path}/spring
+    zip -r $WORKING_DIR/{output_srcjar_name}-spring.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}
     mv {output_srcjar_name}-samples.srcjar {output_samples}
+    mv {output_srcjar_name}-spring.srcjar {output_spring}
     """.format(
         gapic_srcjar = gapic_srcjar.path,
         output_srcjar_name = output_srcjar_name,
@@ -79,13 +91,14 @@ def _java_gapic_postprocess_srcjar_impl(ctx):
         output_resource_name = output_resource_name.path,
         output_test = output_test.path,
         output_samples = output_samples.path,
+        output_spring = output_spring.path,
     )
 
     ctx.actions.run_shell(
         inputs = [gapic_srcjar],
         tools = [formatter],
         command = script,
-        outputs = [output_main, output_resource_name, output_test, output_samples],
+        outputs = [output_main, output_resource_name, output_test, output_samples, output_spring],
     )
 
 _java_gapic_postprocess_srcjar = rule(
@@ -102,6 +115,7 @@ _java_gapic_postprocess_srcjar = rule(
         "resource_name": "%{name}-resource-name.srcjar",
         "test": "%{name}-test.srcjar",
         "samples": "%{name}-samples.srcjar",
+        "spring": "%{name}-spring.srcjar",
     },
     implementation = _java_gapic_postprocess_srcjar_impl,
 )
@@ -161,6 +175,62 @@ _java_gapic_samples_srcjar = rule(
     implementation = _java_gapic_samples_srcjar_impl,
 )
 
+
+def _java_gapic_spring_srcjar_impl(ctx):
+    gapic_srcjar = ctx.file.gapic_srcjar
+    output_srcjar_name = ctx.label.name
+    output_spring = ctx.outputs.spring
+    formatter = ctx.executable.formatter
+
+    output_dir_name = ctx.label.name
+    output_dir_path = "%s/%s" % (output_spring.dirname, output_dir_name)
+
+    script = """
+    unzip -q {gapic_srcjar}
+    # Sync'd to the output file name in Writer.java.
+    unzip -q temp-codegen-spring.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}/spring -type f -printf "%p ")
+    WORKING_DIR=`pwd`
+
+    # Spring source files.
+    cd $WORKING_DIR/{output_dir_path}
+    zip -r $WORKING_DIR/{output_srcjar_name}-spring.srcjar ./
+
+    cd $WORKING_DIR
+
+    mv {output_srcjar_name}-spring.srcjar {output_spring}
+    """.format(
+        gapic_srcjar = gapic_srcjar.path,
+        output_srcjar_name = output_srcjar_name,
+        formatter = formatter,
+        output_dir_name = output_dir_name,
+        output_dir_path = output_dir_path,
+        output_spring = output_spring.path,
+    )
+
+    ctx.actions.run_shell(
+        inputs = [gapic_srcjar],
+        tools = [formatter],
+        command = script,
+        outputs = [output_spring],
+    )
+
+_java_gapic_spring_srcjar = rule(
+    attrs = {
+        "gapic_srcjar": attr.label(mandatory = True, allow_single_file = True),
+        "formatter": attr.label(
+            default = Label("//:google_java_format_binary"),
+            executable = True,
+            cfg = "host",
+        ),
+    },
+    outputs = {
+        "spring": "%{name}-spring.srcjar",
+    },
+    implementation = _java_gapic_spring_srcjar_impl,
+)
+
 def _extract_common_proto_dep(dep):
     return dep[dep.index("/"):] if "//google" in dep else dep
 
@@ -190,6 +260,7 @@ def _java_gapic_srcjar(
         # possible values are: "grpc", "rest", "grpc+rest"
         transport,
         rest_numeric_enums,
+        spring_parent_coordinates,
         # Can be used to provide a java_library with a customized generator,
         # like the one which dumps descriptor to a file for future debugging.
         java_generator_name = "java_gapic",
@@ -217,6 +288,9 @@ def _java_gapic_srcjar(
     if rest_numeric_enums:
         opt_args.append("rest-numeric-enums")
 
+    if spring_parent_coordinates:
+        opt_args.append("spring-parent-coordinates=%s" % spring_parent_coordinates)
+
     # Produces the GAPIC metadata file if this flag is set. to any value.
     # Protoc invocation: --java_gapic_opt=metadata
     plugin_args = ["metadata"]
@@ -245,6 +319,7 @@ def java_gapic_library(
         # possible values are: "grpc", "rest", "grpc+rest"
         transport = None,
         rest_numeric_enums = False,
+        spring_parent_coordinates = None,
         **kwargs):
     srcjar_name = name + "_srcjar"
     raw_srcjar_name = srcjar_name + "_raw"
@@ -257,6 +332,7 @@ def java_gapic_library(
         service_yaml = service_yaml,
         transport = transport,
         rest_numeric_enums = rest_numeric_enums,
+        spring_parent_coordinates = spring_parent_coordinates,
         java_generator_name = "java_gapic",
         **kwargs
     )
@@ -273,6 +349,14 @@ def java_gapic_library(
         **kwargs
     )
 
+    _java_gapic_spring_srcjar(
+        name = "%s_spring" % name,
+        gapic_srcjar = "%s.srcjar" % raw_srcjar_name,
+        **kwargs
+    )
+
+    print("postprocessing done.\n")
+
     resource_name_name = "%s_resource_name" % name
     resource_name_deps = [resource_name_name]
     native.java_library(

rules_java_gapic/java_gapic_pkg.bzl

@@ -68,6 +68,11 @@ def _gapic_pkg_tar_impl(ctx):
         for f in s.files.to_list():
             samples.append(f)
 
+    spring =[]
+    for s in ctx.attr.spring:
+        for f in s.files.to_list():
+            spring.append(f)
+
     paths = _construct_package_dir_paths(
         ctx.attr.package_dir,
         ctx.outputs.pkg,
@@ -80,6 +85,11 @@ def _gapic_pkg_tar_impl(ctx):
         unzip -q ./$s -d {package_dir_path}/{tar_cd_suffix}/{tar_prefix}/samples/snippets/generated/
     done
 
+    for s in {spring}; do
+        mkdir -p {package_dir_path}/{tar_cd_suffix}/{tar_prefix}/spring/
+        unzip -q ./$s -d {package_dir_path}/{tar_cd_suffix}/{tar_prefix}/spring/
+    done
+
     mkdir -p {package_dir_path}
     for dep in {deps}; do
         tar -xzpf $dep -C {package_dir_path}
@@ -95,13 +105,14 @@ def _gapic_pkg_tar_impl(ctx):
         package_dir_path = paths.package_dir_path,
         package_dir = paths.package_dir,
         samples = " ".join(["'%s'" % s.path for s in samples]),
+        spring = " ".join(["'%s'" % s.path for s in spring]),
         pkg = ctx.outputs.pkg.path,
         tar_cd_suffix = paths.tar_cd_suffix,
         tar_prefix = paths.tar_prefix,
     )
 
     ctx.actions.run_shell(
-        inputs = deps + samples,
+        inputs = deps + samples + spring,
         command = script,
         outputs = [ctx.outputs.pkg],
     )
@@ -114,6 +125,7 @@ gapic_pkg_tar = rule(
     attrs = {
         "deps": attr.label_list(mandatory = True),
         "samples": attr.label_list(mandatory = False),
+        "spring": attr.label_list(mandatory = False),
         "package_dir": attr.string(mandatory = False, default = ""),
         "extension": attr.string(mandatory = False, default = "tar.gz"),
     },
@@ -274,6 +286,10 @@ def _java_gapic_srcs_pkg_impl(ctx):
         if [ -d {package_dir_path}/src/main/java/samples ]; then
             mv {package_dir_path}/src/main/java/samples {package_dir_path}
         fi
+
+        if [ -d {package_dir_path}/src/main/java/spring ]; then
+            mv {package_dir_path}/src/main/java/spring {package_dir_path}
+        fi
     done
     for proto_src in {proto_srcs}; do
         mkdir -p {package_dir_path}/src/main/proto
@@ -319,6 +335,7 @@ def java_gapic_assembly_gradle_pkg(
         name,
         deps,
         include_samples = False,
+        include_spring = False,
         assembly_name = None,
         transport = None,
         **kwargs):
@@ -339,13 +356,16 @@ def java_gapic_assembly_gradle_pkg(
     grpc_deps = []
     proto_deps = []
     samples = []
+    spring = []
 
     processed_deps = {}  #there is no proper Set in Starlark
     for dep in deps:
         # Use contains instead of endswith since microgenerator testing may use differently-named targets.
         if "_java_gapic" in dep:
             if include_samples:
                 samples.append(dep + "_samples")
+            if include_spring:
+                spring.append(dep + "_spring")
             _put_dep_in_a_bucket(dep, client_deps, processed_deps)
             _put_dep_in_a_bucket("%s_test" % dep, client_test_deps, processed_deps)
             _put_dep_in_a_bucket("%s_resource_name" % dep, proto_deps, processed_deps)
@@ -393,7 +413,8 @@ def java_gapic_assembly_gradle_pkg(
         name = name,
         assembly_name = package_dir,
         deps = proto_target_dep + grpc_target_dep + client_target_dep,
-        samples = samples,
+        samples = samples, # :vision_java_gapic_samples
+        spring = spring, # :vision_java_gapic_spring
     )
 
 def _java_gapic_gradle_pkg(
@@ -439,7 +460,7 @@ def _java_gapic_gradle_pkg(
         **kwargs
     )
 
-def _java_gapic_assembly_gradle_pkg(name, assembly_name, deps, samples = None, visibility = None):
+def _java_gapic_assembly_gradle_pkg(name, assembly_name, deps, samples = None, spring = None, visibility = None):
     resource_target_name = "%s-resources" % assembly_name
     java_gapic_build_configs_pkg(
         name = resource_target_name,
@@ -459,5 +480,6 @@ def _java_gapic_assembly_gradle_pkg(name, assembly_name, deps, samples = None, v
         ] + deps,
         samples = samples,
         package_dir = assembly_name,
+        spring = spring,
         visibility = visibility,
     )

src/main/java/com/google/api/generator/Main.java

@@ -15,6 +15,7 @@
 package com.google.api.generator;
 
 import com.google.api.generator.gapic.Generator;
+import com.google.api.generator.spring.SpringGenerator;
 import com.google.protobuf.ExtensionRegistry;
 import com.google.protobuf.compiler.PluginProtos.CodeGeneratorRequest;
 import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse;
@@ -26,6 +27,8 @@ public static void main(String[] args) throws IOException {
     ProtoRegistry.registerAllExtensions(registry);
     CodeGeneratorRequest request = CodeGeneratorRequest.parseFrom(System.in, registry);
     CodeGeneratorResponse response = Generator.generateGapic(request);
+    CodeGeneratorResponse springResponse = SpringGenerator.generateSpring(request);
     response.writeTo(System.out);
+    springResponse.writeTo(System.out);
   }
 }

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

@@ -49,6 +49,9 @@ public abstract class GapicContext {
 
   public abstract boolean restNumericEnumsEnabled();
 
+  @Nullable
+  public abstract String springParentCoordinates();
+
   public GapicMetadata gapicMetadata() {
     return gapicMetadata;
   }
@@ -113,6 +116,8 @@ public Builder setHelperResourceNames(Set<ResourceName> helperResourceNames) {
 
     public abstract Builder setRestNumericEnumsEnabled(boolean restNumericEnumsEnabled);
 
+    public abstract Builder setSpringParentCoordinates(String springParentCoordinates);
+
     public abstract Builder setTransport(Transport transport);
 
     abstract ImmutableMap<String, ResourceName> resourceNames();

src/main/java/com/google/api/generator/gapic/protoparser/Parser.java

@@ -118,6 +118,7 @@ public static GapicContext parse(CodeGeneratorRequest request) {
     Optional<GapicLanguageSettings> languageSettingsOpt =
         GapicLanguageSettingsParser.parse(gapicYamlConfigPathOpt);
     Optional<String> transportOpt = PluginArgumentParser.parseTransport(request);
+    Optional<String> springParent = PluginArgumentParser.parseSpringParentCoordinates(request);
 
     boolean willGenerateMetadata = PluginArgumentParser.hasMetadataFlag(request);
     boolean willGenerateNumericEnum = PluginArgumentParser.hasNumericEnumFlag(request);
@@ -218,6 +219,7 @@ public static GapicContext parse(CodeGeneratorRequest request) {
         .setServiceYamlProto(serviceYamlProtoOpt.orElse(null))
         .setTransport(transport)
         .setRestNumericEnumsEnabled(willGenerateNumericEnum)
+        .setSpringParentCoordinates(springParent.orElse(null))
         .build();
   }
 

src/main/java/com/google/api/generator/gapic/protoparser/PluginArgumentParser.java

@@ -31,6 +31,7 @@ public class PluginArgumentParser {
   @VisibleForTesting static final String KEY_METADATA = "metadata";
   @VisibleForTesting static final String KEY_NUMERIC_ENUM = "rest-numeric-enums";
   @VisibleForTesting static final String KEY_SERVICE_YAML_CONFIG = "api-service-config";
+  @VisibleForTesting static final String KEY_SPRING_PARENT = "spring-parent-coordinates";
   @VisibleForTesting static final String KEY_TRANSPORT = "transport";
 
   private static final String JSON_FILE_ENDING = "grpc_service_config.json";
@@ -61,6 +62,10 @@ static boolean hasNumericEnumFlag(CodeGeneratorRequest request) {
     return hasFlag(request.getParameter(), KEY_NUMERIC_ENUM);
   }
 
+  static Optional<String> parseSpringParentCoordinates(CodeGeneratorRequest request) {
+    return parseConfigArgument(request.getParameter(), KEY_SPRING_PARENT);
+  }
+
   /** Expects a comma-separated list of file paths. */
   @VisibleForTesting
   static Optional<String> parseJsonConfigPath(String pluginProtocArgument) {

src/main/java/com/google/api/generator/spring/SpringGenerator.java

@@ -0,0 +1,34 @@
+// Copyright 2022 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.api.generator.spring;
+
+import com.google.api.generator.gapic.model.GapicClass;
+import com.google.api.generator.gapic.model.GapicContext;
+import com.google.api.generator.gapic.model.GapicPackageInfo;
+import com.google.api.generator.gapic.protoparser.Parser;
+import com.google.api.generator.spring.composer.SpringComposer;
+import com.google.protobuf.compiler.PluginProtos.CodeGeneratorRequest;
+import com.google.protobuf.compiler.PluginProtos.CodeGeneratorResponse;
+import java.util.List;
+
+public class SpringGenerator {
+  public static CodeGeneratorResponse generateSpring(CodeGeneratorRequest request) {
+    GapicContext context = Parser.parse(request);
+    List<GapicClass> clazzes = SpringComposer.composeServiceAutoConfigClasses(context);
+    GapicPackageInfo packageInfo = SpringComposer.composePackageInfo(context);
+    String outputFilename = "temp-codegen-spring.srcjar";
+    return SpringWriter.write(context, clazzes, packageInfo, outputFilename);
+  }
+}