[DRAFT] - Code to generate spring autoconfig modules. (not intended to merge)

.bazeliskrc

@@ -0,0 +1,2 @@
+# See https://github.com/bazelbuild/bazelisk
+USE_BAZEL_VERSION=4.2.2

.github/workflows/ci.yaml

@@ -7,8 +7,8 @@ name: ci
 jobs:
   build:
     runs-on: ubuntu-latest
-
     strategy:
+      fail-fast: false
       matrix:
         java: [8, 11]
     steps:
@@ -18,7 +18,7 @@ jobs:
           java-version: ${{ matrix.java }}
           distribution: temurin
       - run: java -version
-
+      - run: bazelisk version
       - name: Bazel File Cache Setup
         id: cache-bazel
         uses: actions/cache@v3
@@ -41,31 +41,8 @@ jobs:
           echo "and it will start over with a clean cache."
           echo "The old one will disappear after 7 days."
 
-      - name: Unit Tests
-        run: bazel --batch test //:units --noshow_progress --test_output=errors
-
       - name: Integration Tests
-        run: bazel --batch test //test/integration/...
-
-      - name: Gradle Build Generated Storage Client Library
-        run: |
-          echo "Building Storage lib from generated source..."
-          mkdir /tmp/java-storage
-          bazel --batch build @com_google_googleapis//google/storage/v2:google-cloud-storage-v2-java
-          tar zxvf bazel-bin/external/com_google_googleapis/google/storage/v2/google-cloud-storage-v2-java.tar.gz -C /tmp/java-storage
-          pushd /tmp/java-storage/google-cloud-storage-v2-java
-          ./gradlew clean build publishToMavenLocal sourcesJar allJars
-          popd
-
-      - name: Gradle Build Generated Compute Client Library
-        run: |
-          echo "Building Compute lib from generated source..."
-          mkdir /tmp/java-compute
-          bazel --batch build @com_google_googleapis//google/cloud/compute/v1small:google-cloud-compute-small-v1-java
-          tar zxvf bazel-bin/external/com_google_googleapis/google/cloud/compute/v1small/google-cloud-compute-small-v1-java.tar.gz -C /tmp/java-compute
-          pushd /tmp/java-compute/google-cloud-compute-small-v1-java
-          ./gradlew clean build publishToMavenLocal sourcesJar allJars
-          popd
+        run: bazelisk --batch test //test/integration/...
 
       - uses: actions/upload-artifact@v3
         if: ${{ failure() }}
@@ -74,21 +51,61 @@ jobs:
           path: ~/.cache/bazel/*/*/*/gapic_generator_java/bazel-out/*/testlogs/*
           retention-days: 5
 
-      - name: Java Linter
-        run: bazel --batch run //:google_java_format_verification
-
-  coverage:
+  generate-client-libraries:
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [ 8, 11 ]
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v3
-        with:
-          java-version: 8
-      - run: java -version
+    - uses: actions/checkout@v2
+    - uses: actions/setup-java@v3
+      with:
+        java-version: ${{ matrix.java }}
+        distribution: temurin
+    - run: java -version
+    - run: bazelisk version
+    - name: Bazel File Cache Setup
+      id: cache-bazel
+      uses: actions/cache@v3
+      with:
+        path: ~/.cache/bazel
+        key: ${{ runner.os }}-${{ secrets.CACHE_VERSION }}
+
+    - name: Bazel Cache Not Found
+      if: steps.cache-bazel.outputs.cache-hit != 'true'
+      run: |
+        echo "No cache found."
+    - name: Bazel Cache Found
+      if: steps.cache-bazel.outputs.cache-hit == 'true'
+      run: |
+        echo -n "Cache found. Cache size: "
+        du -sh ~/.cache/bazel
+        echo "If the cache seems broken, update the CACHE_VERSION secret in"
+        echo "https://github.com/googleapis/googleapis-discovery/settings/secrets/actions"
+        echo "(use any random string, any GUID will work)"
+        echo "and it will start over with a clean cache."
+        echo "The old one will disappear after 7 days."
+
+    - name: Gradle Build Generated Storage Client Library
+      run: |
+        echo "Building Storage lib from generated source..."
+        mkdir /tmp/java-storage
+        bazelisk --batch build @com_google_googleapis//google/storage/v2:google-cloud-storage-v2-java
+        tar zxvf bazel-bin/external/com_google_googleapis/google/storage/v2/google-cloud-storage-v2-java.tar.gz -C /tmp/java-storage
+        pushd /tmp/java-storage/google-cloud-storage-v2-java
+        ./gradlew clean build publishToMavenLocal sourcesJar allJars
+        popd
 
-      - name: Generate Code Coverage Report
-        # Run only test targets, and not golden_update targets.
-        run: bazel coverage //:units --combined_report=lcov
+    - name: Gradle Build Generated Compute Client Library
+      run: |
+        echo "Building Compute lib from generated source..."
+        mkdir /tmp/java-compute
+        bazelisk --batch build @com_google_googleapis//google/cloud/compute/v1small:google-cloud-compute-small-v1-java
+        tar zxvf bazel-bin/external/com_google_googleapis/google/cloud/compute/v1small/google-cloud-compute-small-v1-java.tar.gz -C /tmp/java-compute
+        pushd /tmp/java-compute/google-cloud-compute-small-v1-java
+        ./gradlew clean build publishToMavenLocal sourcesJar allJars
+        popd
 
   license-header:
     runs-on: ubuntu-latest

BUILD.bazel

@@ -47,6 +47,17 @@ TEST_DEPS = [
     "@io_github_java_diff_utils//jar",
 ]
 
+SPRING_DEPS = [
+    "@maven//:org_springframework_boot_spring_boot_starter",
+    "@maven//:org_springframework_boot_spring_boot_autoconfigure",
+    "@maven//:org_springframework_boot_spring_boot",
+    "@maven//:org_springframework_spring_context",
+    "@maven//:org_springframework_spring_beans",
+    "@maven//:com_google_cloud_spring_cloud_gcp_autoconfigure",
+    "@maven//:com_google_cloud_spring_cloud_gcp_core",
+    "@maven//:commons_logging_commons_logging",
+]
+
 proto_library(
     name = "service_config_proto",
     srcs = ["src/main/proto/service_config.proto"],
@@ -100,13 +111,13 @@ java_library(
     name = "gapic_generator_java",
     srcs = glob(["src/main/java/**/*.java"]),
     plugins = [":autovalue_plugin"],
-    deps = MAIN_DEPS,
+    deps = MAIN_DEPS + SPRING_DEPS,
 )
 
 java_library(
     name = "gapic_generator_java_test",
     srcs = glob(["src/test/java/**/*.java"]),
-    deps = [":gapic_generator_java"] + MAIN_DEPS + TEST_DEPS,
+    deps = [":gapic_generator_java"] + MAIN_DEPS + TEST_DEPS + SPRING_DEPS,
 )
 
 java_binary(
@@ -115,6 +126,12 @@ java_binary(
     runtime_deps = [":gapic_generator_java"] + MAIN_DEPS,
 )
 
+java_binary(
+    name = "protoc-gen-java_gapic_spring",
+    main_class = "com.google.api.generator.spring.Main",
+    runtime_deps = [":gapic_generator_java"] + MAIN_DEPS + SPRING_DEPS,
+)
+
 # Request dumper binary, which dumps the CodeGeneratorRequest to a file on disk
 # which will be identical to the one passed to the protoc-gen-java_gapic during
 # normal execution. The dumped file then can be used to run this gapic-generator

WORKSPACE

@@ -79,8 +79,14 @@ load("@com_google_protobuf//:protobuf_deps.bzl", "PROTOBUF_MAVEN_ARTIFACTS", "pr
 
 load("@rules_jvm_external//:defs.bzl", "maven_install")
 
+
+SPRING_MAVEN_ARTIFACTS = [
+    "org.springframework.boot:spring-boot-starter:2.7.4",
+    "com.google.cloud:spring-cloud-gcp-autoconfigure:3.4.1",
+]
+
 maven_install(
-    artifacts = PROTOBUF_MAVEN_ARTIFACTS,
+    artifacts = PROTOBUF_MAVEN_ARTIFACTS + SPRING_MAVEN_ARTIFACTS,
     generate_compat_repositories = True,
     repositories = [
         "https://repo.maven.apache.org/maven2/",

pom.xml

@@ -15,7 +15,7 @@
       <dependency>
         <groupId>com.google.cloud</groupId>
         <artifactId>google-cloud-shared-dependencies</artifactId>
-        <version>3.0.5</version>
+        <version>3.0.6</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
@@ -27,7 +27,7 @@
       <extension>
         <groupId>kr.motd.maven</groupId>
         <artifactId>os-maven-plugin</artifactId>
-        <version>1.7.0</version>
+        <version>1.7.1</version>
       </extension>
     </extensions>
 
@@ -324,6 +324,18 @@
       <version>4.13.2</version>
     </dependency>
 
+    <!-- Spring related dependencies-->
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter</artifactId>
+      <version>2.7.4</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.cloud</groupId>
+      <artifactId>spring-cloud-gcp-autoconfigure</artifactId>
+      <version>3.4.1</version>
+    </dependency>
+
     <!--
       TODO: remove when dropping Java 8.
       https://github.com/googleapis/gapic-generator-java/issues/888

rules_java_gapic/java_gapic.bzl

@@ -273,6 +273,8 @@ def java_gapic_library(
         **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,
     )