chore: re-work build infra, primarily around code format machinery (#915

)

- Removes `gapic_generator_java.bzl`.

- `:google_java_format_verification` is now working. (Fixes #914.)

- `:google_java_format_verification` now runs with `bazel run` instead of `bazel build`, which is consistent with how `:google_java_format` runs.

- Removes manual listing of files to format, which is error-prone. This actually revealed that we were missing out some files for formatting. (For example, `AbstractTransportServiceStubClassComposer.java` had an unused import.) 

- Removes unnecessary `filegroup` definitions triggered by removing manual file listing.

- Reduces visibility of many packages.

.githooks/pre-commit

@@ -83,7 +83,7 @@ fi
 if [ $NUM_JAVA_FILES_CHANGED -gt 0 ]
 then
   echo_status "Running Java linter..."
-  bazel --batch build --disk_cache="$BAZEL_CACHE_DIR" //:google_java_format_verification
+  bazel --batch run --disk_cache="$BAZEL_CACHE_DIR" //:google_java_format_verification
   FORMAT_STATUS=$?
   if [ $FORMAT_STATUS != 0 ]
   then

.github/workflows/ci.yaml

@@ -73,7 +73,7 @@ jobs:
           retention-days: 5
 
       - name: Java Linter
-        run: bazel --batch  build //:google_java_format_verification
+        run: bazel --batch run //:google_java_format_verification
 
   coverage:
     runs-on: ubuntu-latest
@@ -86,7 +86,7 @@ jobs:
 
       - name: Generate Code Coverage Report
         # Run only test targets, and not golden_update targets.
-        run: bazel coverage  $(bazel query "src/test/..." | grep "Test$")  --combined_report=lcov
+        run: bazel coverage $(bazel query "src/test/..." | grep "Test$") --combined_report=lcov
 
       - name: Upload Code Coverage Report
         uses: codecov/codecov-action@v1

BUILD.bazel

@@ -1,28 +1,7 @@
 load("@rules_java//java:defs.bzl", "java_binary", "java_proto_library")
-load(
-    "//:gapic_generator_java.bzl",
-    "google_java_format",
-    "google_java_format_verification",
-)
 
 package(default_visibility = ["//visibility:public"])
 
-JAVA_SRCS = [
-    "//src/main/java/com/google/api/generator/debug:debug_files",
-    "//src/main/java/com/google/api/generator:generator_files",
-    "//src/main/java/com/google/api/generator/engine:engine_files",
-    "//src/main/java/com/google/api/generator/gapic:gapic_files",
-    "//src/main/java/com/google/api/generator/util:util_files",
-]
-
-TEST_SRCS = [
-    "//src/test/java/com/google/api/generator/engine:engine_files",
-    "//src/test/java/com/google/api/generator/gapic:gapic_files",
-    "//src/test/java/com/google/api/generator/testutils:testutils_files",
-    "//src/test/java/com/google/api/generator/util:util_files",
-    "//src/test/java/com/google/api/generator/test/framework:framework_files",
-]
-
 # ============= Proto wrappers =================
 
 java_proto_library(
@@ -104,21 +83,25 @@ java_binary(
     name = "google_java_format_binary",
     jvm_flags = ["-Xmx512m"],
     main_class = "com.google.googlejavaformat.java.Main",
-    visibility = ["//visibility:public"],
     runtime_deps = ["@google_java_format_all_deps//jar"],
 )
 
+genrule(
+    name = "google_java_format",
+    outs = ["google_java_format.sh"],
+    cmd = "echo 'find src test -name \'*.java\' | grep -v /goldens/ | xargs $(execpath :google_java_format_binary) --replace' > $(OUTS)",
+    executable = 1,
+    tools = [":google_java_format_binary"],
+    local = 1,
+)
+
 # Run `bazel build //:google_java_format_verification` to verify that gapic-generator-java sources
 # are formatted correctly.
-google_java_format_verification(
+genrule(
     name = "google_java_format_verification",
-    srcs = JAVA_SRCS + TEST_SRCS,
-    formatter = "//:google_java_format_binary",
-)
-
-# Run `bazel run //:google_java_format` to format gapic-generator-java sources.
-google_java_format(
-    name = "google_java_format",
-    srcs = JAVA_SRCS + TEST_SRCS,
-    formatter = "//:google_java_format_binary",
+    outs = ["google_java_format_verification.sh"],
+    cmd = "echo 'find src test -name \'*.java\' | grep -v /goldens/ | xargs $(execpath :google_java_format_binary) --dry-run --set-exit-if-changed' > $(OUTS)",
+    executable = 1,
+    tools = [":google_java_format_binary"],
+    local = 1,
 )

DEVELOPMENT.md

@@ -90,7 +90,7 @@
 -   Run linter checks without actually doing the formatting.
 
     ```sh
-    bazel build :google_java_format_verification
+    bazel run :google_java_format_verification
     ```
 
 -   Format files.

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

@@ -1,12 +1,6 @@
 load("@rules_java//java:defs.bzl", "java_library", "java_plugin")
 
-package(default_visibility = ["//visibility:public"])
-#package(default_visibility = ["//:__pkg__"])
-
-filegroup(
-    name = "generator_files",
-    srcs = glob(["*.java"]),
-)
+package(default_visibility = ["//:__subpackages__"])
 
 java_plugin(
     name = "autovalue_plugin",
@@ -29,9 +23,7 @@ java_library(
 
 java_library(
     name = "generator",
-    srcs = [
-        ":generator_files",
-    ],
+    srcs = glob(["*.java"]),
     deps = [
         "//src/main/java/com/google/api/generator/engine",
         "//src/main/java/com/google/api/generator/engine/ast",

src/main/java/com/google/api/generator/debug/BUILD.bazel

@@ -1,17 +1,8 @@
 load("@rules_java//java:defs.bzl", "java_library")
 
-package(default_visibility = ["//visibility:public"])
-
-filegroup(
-    name = "debug_files",
-    srcs = glob(["*.java"]),
-)
-
 java_library(
     name = "debug",
-    srcs = [
-        ":debug_files",
-    ],
+    srcs = glob(["*.java"]),
     deps = [
         "//src/main/java/com/google/api/generator",
         "//src/main/java/com/google/api/generator/engine",

src/main/java/com/google/api/generator/engine/BUILD.bazel

@@ -1,16 +1,6 @@
 load("@rules_java//java:defs.bzl", "java_library")
 
-package(default_visibility = ["//visibility:public"])
-
-filegroup(
-    name = "engine_files",
-    srcs = [
-        "//src/main/java/com/google/api/generator/engine/ast:ast_files",
-        "//src/main/java/com/google/api/generator/engine/escaper:escaper_files",
-        "//src/main/java/com/google/api/generator/engine/lexicon:lexicon_files",
-        "//src/main/java/com/google/api/generator/engine/writer:writer_files",
-    ],
-)
+package(default_visibility = ["//:__subpackages__"])
 
 java_library(
     name = "engine",

src/main/java/com/google/api/generator/engine/ast/BUILD.bazel

@@ -1,17 +1,10 @@
 load("@rules_java//java:defs.bzl", "java_library")
 
-package(default_visibility = ["//visibility:public"])
-
-filegroup(
-    name = "ast_files",
-    srcs = glob(["*.java"]),
-)
+package(default_visibility = ["//:__subpackages__"])
 
 java_library(
     name = "ast",
-    srcs = [
-        ":ast_files",
-    ],
+    srcs = glob(["*.java"]),
     deps = [
         "//src/main/java/com/google/api/generator:autovalue",
         "//src/main/java/com/google/api/generator/engine/escaper",

src/main/java/com/google/api/generator/engine/escaper/BUILD.bazel

@@ -1,17 +1,10 @@
 load("@rules_java//java:defs.bzl", "java_library")
 
-package(default_visibility = ["//visibility:public"])
-
-filegroup(
-    name = "escaper_files",
-    srcs = glob(["*.java"]),
-)
+package(default_visibility = ["//:__subpackages__"])
 
 java_library(
     name = "escaper",
-    srcs = [
-        ":escaper_files",
-    ],
+    srcs = glob(["*.java"]),
     deps = [
         "@com_google_guava_guava//jar",
     ],

src/main/java/com/google/api/generator/engine/lexicon/BUILD.bazel

@@ -1,17 +1,10 @@
 load("@rules_java//java:defs.bzl", "java_library")
 
-package(default_visibility = ["//visibility:public"])
-
-filegroup(
-    name = "lexicon_files",
-    srcs = glob(["*.java"]),
-)
+package(default_visibility = ["//:__subpackages__"])
 
 java_library(
     name = "lexicon",
-    srcs = [
-        ":lexicon_files",
-    ],
+    srcs = glob(["*.java"]),
     deps = [
         "@com_google_guava_guava//jar",
     ],

src/main/java/com/google/api/generator/engine/writer/BUILD.bazel

@@ -1,17 +1,10 @@
 load("@rules_java//java:defs.bzl", "java_library")
 
-package(default_visibility = ["//visibility:public"])
-
-filegroup(
-    name = "writer_files",
-    srcs = glob(["*.java"]),
-)
+package(default_visibility = ["//:__subpackages__"])
 
 java_library(
     name = "writer",
-    srcs = [
-        ":writer_files",
-    ],
+    srcs = glob(["*.java"]),
     deps = [
         "//src/main/java/com/google/api/generator/engine/ast",
         "@com_google_guava_guava//jar",

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

@@ -1,26 +1,6 @@
 load("@rules_java//java:defs.bzl", "java_library", "java_proto_library")
 
-package(default_visibility = ["//visibility:public"])
-
-filegroup(
-    name = "gapic_files",
-    srcs = glob(["*.java"]) + [
-        "//src/main/java/com/google/api/generator/gapic/composer:composer_files",
-        "//src/main/java/com/google/api/generator/gapic/composer/comment:comment_files",
-        "//src/main/java/com/google/api/generator/gapic/composer/defaultvalue:defaultvalue_files",
-        "//src/main/java/com/google/api/generator/gapic/composer/grpc:grpc_files",
-        "//src/main/java/com/google/api/generator/gapic/composer/grpcrest:grpcrest_files",
-        "//src/main/java/com/google/api/generator/gapic/composer/resourcename:resourcename_files",
-        "//src/main/java/com/google/api/generator/gapic/composer/rest:rest_files",
-        "//src/main/java/com/google/api/generator/gapic/composer/samplecode:samplecode_files",
-        "//src/main/java/com/google/api/generator/gapic/composer/store:store_files",
-        "//src/main/java/com/google/api/generator/gapic/composer/utils:utils_files",
-        "//src/main/java/com/google/api/generator/gapic/model:model_files",
-        "//src/main/java/com/google/api/generator/gapic/protoparser:protoparser_files",
-        "//src/main/java/com/google/api/generator/gapic/protowriter:protowriter_files",
-        "//src/main/java/com/google/api/generator/gapic/utils:utils_files",
-    ],
-)
+package(default_visibility = ["//:__subpackages__"])
 
 java_proto_library(
     name = "status_java_proto",

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

@@ -1,17 +1,10 @@
 load("@rules_java//java:defs.bzl", "java_library")
 
-package(default_visibility = ["//visibility:public"])
-
-filegroup(
-    name = "composer_files",
-    srcs = glob(["*.java"]),
-)
+package(default_visibility = ["//:__subpackages__"])
 
 java_library(
     name = "composer",
-    srcs = [
-        ":composer_files",
-    ],
+    srcs = glob(["*.java"]),
     deps = [
         "//:service_config_java_proto",
         "//src/main/java/com/google/api/generator/engine/ast",

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

@@ -1,17 +1,10 @@
 load("@rules_java//java:defs.bzl", "java_library")
 
-package(default_visibility = ["//visibility:public"])
-
-filegroup(
-    name = "comment_files",
-    srcs = glob(["*.java"]),
-)
+package(default_visibility = ["//:__subpackages__"])
 
 java_library(
     name = "comment",
-    srcs = [
-        ":comment_files",
-    ],
+    srcs = glob(["*.java"]),
     deps = [
         "//src/main/java/com/google/api/generator/engine/ast",
         "//src/main/java/com/google/api/generator/gapic/composer/utils",

src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceCallableFactoryClassComposer.java

@@ -326,7 +326,6 @@ protected TypeNode getOperationsStubType(Service service) {
     return operationsStubType;
   }
 
-
   private TypeStore createTypes(Service service) {
     List<Class<?>> concreteClazzes =
         Arrays.asList(