Prepare to remove _LEGACY_ANY_TYPE_ATTRS workaround in java_toolchain

cushon · rules_java Copybara · commit b5b4100314da · 2025-11-26T03:01:16.000-08:00
PiperOrigin-RevId: 837039389
Change-Id: Ib484a607424abb1558651f73d7e12bea9ec8ad47
diff --git a/java/common/rules/java_toolchain.bzl b/java/common/rules/java_toolchain.bzl
@@ -240,6 +240,7 @@ def _extract_singleton_list_value(dict, key):
         else:
             dict[key] = None
 
+# TODO: b/463873596 - remove this in Bazel 10
 _LEGACY_ANY_TYPE_ATTRS = [
     "genclass",
     "deps_checker",
diff --git a/test/java/toolchains/java_toolchain_tests.bzl b/test/java/toolchains/java_toolchain_tests.bzl
@@ -13,12 +13,12 @@ def _declare_java_toolchain(*, name, **kwargs):
     util.helper_target(
         java_toolchain,
         name = name,
-        genclass = [kwargs.get("genclass", "default_genclass.jar")],
+        genclass = kwargs.get("genclass", "default_genclass.jar"),
         jacocorunner = kwargs.get("jacocorunner", None),
-        javabuilder = [kwargs.get("javabuilder", "default_javabuilder.jar")],
+        javabuilder = kwargs.get("javabuilder", "default_javabuilder.jar"),
         java_runtime = kwargs["java_runtime"],
-        ijar = [kwargs.get("ijar", "default_ijar.jar")],
-        singlejar = [kwargs.get("singlejar", "default_singlejar.jar")],
+        ijar = kwargs.get("ijar", "default_ijar.jar"),
+        singlejar = kwargs.get("singlejar", "default_singlejar.jar"),
     )
 
 def _test_jacocorunner(name):
diff --git a/toolchains/default_java_toolchain.bzl b/toolchains/default_java_toolchain.bzl
@@ -77,11 +77,11 @@ _DEFAULT_JAVA_LANGUAGE_VERSION = "11"
 # Default java_toolchain parameters
 _BASE_TOOLCHAIN_CONFIGURATION = dict(
     forcibly_disable_header_compilation = False,
-    genclass = [Label("@remote_java_tools//:GenClass")],
-    header_compiler = [Label("@remote_java_tools//:TurbineDirect")],
-    header_compiler_direct = [Label("//toolchains:turbine_direct")],
-    ijar = [Label("//toolchains:ijar")],
-    javabuilder = [Label("@remote_java_tools//:JavaBuilder")],
+    genclass = Label("@remote_java_tools//:GenClass"),
+    header_compiler = Label("@remote_java_tools//:TurbineDirect"),
+    header_compiler_direct = Label("//toolchains:turbine_direct"),
+    ijar = Label("//toolchains:ijar"),
+    javabuilder = Label("@remote_java_tools//:JavaBuilder"),
     javac_supports_workers = True,
     jacocorunner = Label("@remote_java_tools//:jacoco_coverage_runner_filegroup"),
     jvm_opts = BASE_JDK9_JVM_OPTS,
@@ -90,7 +90,7 @@ _BASE_TOOLCHAIN_CONFIGURATION = dict(
         "-XX:+UseParallelGC",
     ],
     misc = DEFAULT_JAVACOPTS,
-    singlejar = [Label("//toolchains:singlejar")],
+    singlejar = Label("//toolchains:singlejar"),
     # Code to enumerate target JVM boot classpath uses host JVM. Because
     # java_runtime-s are involved, its implementation is in @bazel_tools.
     bootclasspath = [Label("//toolchains:platformclasspath")],
@@ -121,7 +121,7 @@ DEFAULT_TOOLCHAIN_CONFIGURATION = _BASE_TOOLCHAIN_CONFIGURATION
 # However it does allow using a wider range of `--host_javabase`s, including
 # versions newer than the current JDK.
 VANILLA_TOOLCHAIN_CONFIGURATION = dict(
-    javabuilder = [Label("@remote_java_tools//:VanillaJavaBuilder")],
+    javabuilder = Label("@remote_java_tools//:VanillaJavaBuilder"),
     jvm_opts = [],
     java_runtime = None,
 )
@@ -132,16 +132,16 @@ VANILLA_TOOLCHAIN_CONFIGURATION = dict(
 # same, otherwise the binaries will not work on the execution
 # platform.
 PREBUILT_TOOLCHAIN_CONFIGURATION = dict(
-    ijar = [Label("//toolchains:ijar_prebuilt_binary")],
-    singlejar = [Label("//toolchains:prebuilt_singlejar")],
+    ijar = Label("//toolchains:ijar_prebuilt_binary"),
+    singlejar = Label("//toolchains:prebuilt_singlejar"),
     oneversion = Label("//toolchains:prebuilt_one_version"),
 )
 
 # The new toolchain is using all the tools from sources.
 NONPREBUILT_TOOLCHAIN_CONFIGURATION = dict(
-    ijar = [Label("@remote_java_tools//:ijar_cc_binary")],
-    singlejar = [Label("@remote_java_tools//:singlejar_cc_bin")],
-    header_compiler_direct = [Label("@remote_java_tools//:TurbineDirect")],
+    ijar = Label("@remote_java_tools//:ijar_cc_binary"),
+    singlejar = Label("@remote_java_tools//:singlejar_cc_bin"),
+    header_compiler_direct = Label("@remote_java_tools//:TurbineDirect"),
     oneversion = Label("@remote_java_tools//:one_version_cc_bin"),
     bootclasspath = [Label("//toolchains:platformclasspath_nostrip")],
 )
