Add ImportDepsChecker to java_tools.

benjaminp · copybara-github · commit cff59076833c · 2025-05-19T11:50:43.000-07:00
Bazel has a handy utility for checking that java_import rules have the correct dependencies. But it wasn't packaged with java_tools, and therefore very hard to use. Closes #25664. PiperOrigin-RevId: 760711733 Change-Id: I9efd029c7310efd2f5cd6d914619884a08e6c8a5
diff --git a/src/BUILD b/src/BUILD
@@ -517,6 +517,7 @@ JAVA_TOOLS_DEPLOY_JARS = [
     "//src/java_tools/buildjar:VanillaJavaBuilder_deploy.jar",
     "//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass:GenClass_deploy.jar",
     "//src/java_tools/buildjar/java/com/google/devtools/build/java/turbine:turbine_direct_binary_deploy.jar",
+    "//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:ImportDepsChecker_deploy.jar",
     "//src/java_tools/junitrunner/java/com/google/testing/coverage:JacocoCoverage_jarjar_deploy.jar",
     "//src/java_tools/junitrunner/java/com/google/testing/junit/runner:Runner_deploy.jar",
 ]
diff --git a/src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps/BUILD b/src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps/BUILD
@@ -48,11 +48,6 @@ java_binary(
         "--add-opens=java.base/java.lang=ALL-UNNAMED",
     ],
     main_class = "com.google.devtools.build.importdeps.Main",
-    visibility = [
-        "//src/java_tools/import_deps_checker:__subpackages__",
-        "//tools/android:__pkg__",
-        "//tools/android/runtime_deps:__pkg__",
-    ],
     deps = [
         ":import_deps_checker",
         "//src/main/java/com/google/devtools/common/options",
diff --git a/src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps/ImportDepsChecker.java b/src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps/ImportDepsChecker.java
@@ -29,6 +29,7 @@
 import java.io.InputStream;
 import java.io.UncheckedIOException;
 import java.nio.file.Path;
+import java.util.Collection;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
@@ -141,7 +142,7 @@ private void emitAddDepCommandForIndirectJars(String ruleLabel, StringBuilder bu
     ImmutableMultimap<Path, String> indirectJars = resultCollector.getSortedIndirectDeps();
     if (!indirectJars.isEmpty()) {
       Set<String> labels = new LinkedHashSet<>();
-      for (var e : indirectJars.asMap().entrySet()) {
+      for (Map.Entry<Path, Collection<String>> e : indirectJars.asMap().entrySet()) {
         Path jar = e.getKey();
         String label = extractLabel(jar);
         builder.append("Indirect reference to classes from ");
diff --git a/src/test/shell/bazel/bazel_java_tools_test.sh b/src/test/shell/bazel/bazel_java_tools_test.sh
@@ -102,6 +102,9 @@ function expect_path_in_java_tools_prebuilt() {
   [[ "$count" -gt 0 ]] || fail "Path $path not found in java_tools_prebuilt.zip"
 }
 
+function test_java_tools_has_import_deps_checker() {
+  expect_path_in_java_tools "java_tools/ImportDepsChecker_deploy.jar"
+}
 
 function test_java_tools_has_ijar() {
   expect_path_in_java_tools "java_tools/ijar"
diff --git a/tools/jdk/BUILD.java_tools b/tools/jdk/BUILD.java_tools
@@ -19,6 +19,11 @@ SUPRESSED_WARNINGS = select({
     ],
 })
 
+filegroup(
+    name = "ImportDepsChecker",
+    srcs = ["java_tools/ImportDepsChecker_deploy.jar"],
+)
+
 filegroup(
     name = "GenClass",
     srcs = ["java_tools/GenClass_deploy.jar"],

Original file line number	Diff line number	Diff line change
`@@ -517,6 +517,7 @@ JAVA_TOOLS_DEPLOY_JARS = [`
`517`	`517`	`"//src/java_tools/buildjar:VanillaJavaBuilder_deploy.jar",`
`518`	`518`	`"//src/java_tools/buildjar/java/com/google/devtools/build/buildjar/genclass:GenClass_deploy.jar",`
`519`	`519`	`"//src/java_tools/buildjar/java/com/google/devtools/build/java/turbine:turbine_direct_binary_deploy.jar",`
	`520`	`+ "//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:ImportDepsChecker_deploy.jar",`
`520`	`521`	`"//src/java_tools/junitrunner/java/com/google/testing/coverage:JacocoCoverage_jarjar_deploy.jar",`
`521`	`522`	`"//src/java_tools/junitrunner/java/com/google/testing/junit/runner:Runner_deploy.jar",`
`522`	`523`	`]`
Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,9 @@ function expect_path_in_java_tools_prebuilt() {`
`102`	`102`	`[[ "$count" -gt 0 ]] \|\| fail "Path $path not found in java_tools_prebuilt.zip"`
`103`	`103`	`}`
`104`	`104`
	`105`	`+function test_java_tools_has_import_deps_checker() {`
	`106`	`+ expect_path_in_java_tools "java_tools/ImportDepsChecker_deploy.jar"`
	`107`	`+}`
`105`	`108`
`106`	`109`	`function test_java_tools_has_ijar() {`
`107`	`110`	`expect_path_in_java_tools "java_tools/ijar"`