[internal] Refactor consumption of JVM tool lockfiles

src/python/pants/backend/codegen/avro/java/rules.py

@@ -38,8 +38,8 @@
 from pants.jvm.resolve import jvm_tool
 from pants.jvm.resolve.coursier_fetch import (
     CoursierResolvedLockfile,
-    MaterializedClasspath,
-    MaterializedClasspathRequest,
+    ToolClasspath,
+    ToolClasspathRequest,
 )
 from pants.jvm.resolve.jvm_tool import GenerateJvmLockfileFromTool, ValidatedJvmToolLockfileRequest
 from pants.source.source_root import SourceRoot, SourceRootRequest
@@ -105,12 +105,7 @@ async def compile_avro_source(
     lockfile = await Get(CoursierResolvedLockfile, ValidatedJvmToolLockfileRequest(avro_tools))
 
     tool_classpath, subsetted_input_digest, empty_output_dir = await MultiGet(
-        Get(
-            MaterializedClasspath,
-            MaterializedClasspathRequest(
-                lockfiles=(lockfile,),
-            ),
-        ),
+        Get(ToolClasspath, ToolClasspathRequest(lockfile=lockfile)),
         Get(
             Digest,
             DigestSubset(

src/python/pants/backend/codegen/protobuf/scala/rules.py

@@ -49,8 +49,8 @@
 from pants.jvm.resolve.common import ArtifactRequirements, Coordinate
 from pants.jvm.resolve.coursier_fetch import (
     CoursierResolvedLockfile,
-    MaterializedClasspath,
-    MaterializedClasspathRequest,
+    ToolClasspath,
+    ToolClasspathRequest,
 )
 from pants.jvm.resolve.jvm_tool import (
     GatherJvmCoordinatesRequest,
@@ -83,7 +83,7 @@ class MaterializeJvmPluginRequest:
 @dataclass(frozen=True)
 class MaterializedJvmPlugin:
     name: str
-    classpath: MaterializedClasspath
+    classpath: ToolClasspath
 
     def setup_arg(self, plugin_relpath: str) -> str:
         classpath_arg = ":".join(self.classpath.classpath_entries(plugin_relpath))
@@ -129,12 +129,7 @@ async def generate_scala_from_protobuf(
         inherit_env,
     ) = await MultiGet(
         Get(DownloadedExternalTool, ExternalToolRequest, protoc.get_request(Platform.current)),
-        Get(
-            MaterializedClasspath,
-            MaterializedClasspathRequest(
-                lockfiles=(lockfile,),
-            ),
-        ),
+        Get(ToolClasspath, ToolClasspathRequest(lockfile=lockfile)),
         Get(Digest, CreateDigest([Directory(output_dir)])),
         Get(TransitiveTargets, TransitiveTargetsRequest([request.protocol_target.address])),
         # Need PATH so that ScalaPB can invoke `mkfifo`.
@@ -180,13 +175,7 @@ async def generate_scala_from_protobuf(
     }
 
     input_digest = await Get(
-        Digest,
-        MergeDigests(
-            [
-                all_sources_stripped.snapshot.digest,
-                empty_output_dir,
-            ]
-        ),
+        Digest, MergeDigests([all_sources_stripped.snapshot.digest, empty_output_dir])
     )
 
     result = await Get(
@@ -248,13 +237,8 @@ async def materialize_jvm_plugin(request: MaterializeJvmPluginRequest) -> Materi
             option_name="[scalapb].jvm_plugins",
         ),
     )
-    classpath = await Get(
-        MaterializedClasspath, MaterializedClasspathRequest(artifact_requirements=(requirements,))
-    )
-    return MaterializedJvmPlugin(
-        name=request.plugin.name,
-        classpath=classpath,
-    )
+    classpath = await Get(ToolClasspath, ToolClasspathRequest(artifact_requirements=requirements))
+    return MaterializedJvmPlugin(name=request.plugin.name, classpath=classpath)
 
 
 @rule
@@ -292,59 +276,36 @@ async def setup_scalapb_shim_classfiles(
 
     tool_classpath, shim_classpath, source_digest = await MultiGet(
         Get(
-            MaterializedClasspath,
-            MaterializedClasspathRequest(
+            ToolClasspath,
+            ToolClasspathRequest(
                 prefix="__toolcp",
-                artifact_requirements=(
-                    ArtifactRequirements.from_coordinates(
-                        [
-                            Coordinate(
-                                group="org.scala-lang",
-                                artifact="scala-compiler",
-                                version=SHIM_SCALA_VERSION,
-                            ),
-                            Coordinate(
-                                group="org.scala-lang",
-                                artifact="scala-library",
-                                version=SHIM_SCALA_VERSION,
-                            ),
-                            Coordinate(
-                                group="org.scala-lang",
-                                artifact="scala-reflect",
-                                version=SHIM_SCALA_VERSION,
-                            ),
-                        ]
-                    ),
+                artifact_requirements=ArtifactRequirements.from_coordinates(
+                    [
+                        Coordinate(
+                            group="org.scala-lang",
+                            artifact="scala-compiler",
+                            version=SHIM_SCALA_VERSION,
+                        ),
+                        Coordinate(
+                            group="org.scala-lang",
+                            artifact="scala-library",
+                            version=SHIM_SCALA_VERSION,
+                        ),
+                        Coordinate(
+                            group="org.scala-lang",
+                            artifact="scala-reflect",
+                            version=SHIM_SCALA_VERSION,
+                        ),
+                    ]
                 ),
             ),
         ),
-        Get(
-            MaterializedClasspath,
-            MaterializedClasspathRequest(
-                prefix="__shimcp",
-                lockfiles=(lockfile,),
-            ),
-        ),
-        Get(
-            Digest,
-            CreateDigest(
-                [
-                    scalapb_shim_source,
-                    Directory(dest_dir),
-                ]
-            ),
-        ),
+        Get(ToolClasspath, ToolClasspathRequest(prefix="__shimcp", lockfile=lockfile)),
+        Get(Digest, CreateDigest([scalapb_shim_source, Directory(dest_dir)])),
     )
 
     merged_digest = await Get(
-        Digest,
-        MergeDigests(
-            (
-                tool_classpath.digest,
-                shim_classpath.digest,
-                source_digest,
-            )
-        ),
+        Digest, MergeDigests((tool_classpath.digest, shim_classpath.digest, source_digest))
     )
 
     # NB: We do not use nailgun for this process, since it is launched exactly once.

src/python/pants/backend/codegen/thrift/scrooge/rules.py

@@ -19,8 +19,8 @@
 from pants.jvm.jdk_rules import JdkSetup
 from pants.jvm.resolve.coursier_fetch import (
     CoursierResolvedLockfile,
-    MaterializedClasspath,
-    MaterializedClasspathRequest,
+    ToolClasspath,
+    ToolClasspathRequest,
 )
 from pants.jvm.resolve.jvm_tool import GenerateJvmLockfileFromTool, ValidatedJvmToolLockfileRequest
 from pants.source.source_root import SourceRootsRequest, SourceRootsResult
@@ -56,12 +56,7 @@ async def generate_scrooge_thrift_sources(
     lockfile = await Get(CoursierResolvedLockfile, ValidatedJvmToolLockfileRequest(scrooge))
 
     tool_classpath, transitive_targets, empty_output_dir_digest, wrapped_target = await MultiGet(
-        Get(
-            MaterializedClasspath,
-            MaterializedClasspathRequest(
-                lockfiles=(lockfile,),
-            ),
-        ),
+        Get(ToolClasspath, ToolClasspathRequest(lockfile=lockfile)),
         Get(TransitiveTargets, TransitiveTargetsRequest([request.thrift_source_field.address])),
         Get(Digest, CreateDigest([Directory(output_dir)])),
         Get(WrappedTarget, Address, request.thrift_source_field.address),

src/python/pants/backend/java/dependency_inference/java_parser.py

@@ -19,7 +19,7 @@
 from pants.engine.process import BashBinary, FallibleProcessResult, Process, ProcessExecutionFailure
 from pants.engine.rules import Get, MultiGet, collect_rules, rule
 from pants.jvm.jdk_rules import JdkSetup
-from pants.jvm.resolve.coursier_fetch import MaterializedClasspath, MaterializedClasspathRequest
+from pants.jvm.resolve.coursier_fetch import ToolClasspath, ToolClasspathRequest
 from pants.option.global_options import ProcessCleanupOption
 from pants.util.logging import LogLevel
 
@@ -88,10 +88,8 @@ async def analyze_java_source_dependencies(
 
     (tool_classpath, prefixed_source_files_digest,) = await MultiGet(
         Get(
-            MaterializedClasspath,
-            MaterializedClasspathRequest(
-                artifact_requirements=(java_parser_artifact_requirements(),),
-            ),
+            ToolClasspath,
+            ToolClasspathRequest(artifact_requirements=java_parser_artifact_requirements()),
         ),
         Get(Digest, AddPrefix(source_files.snapshot.digest, source_prefix)),
     )

src/python/pants/backend/java/dependency_inference/java_parser_launcher.py

@@ -13,7 +13,7 @@
 from pants.engine.rules import Get, MultiGet, collect_rules, rule
 from pants.jvm.jdk_rules import JdkSetup
 from pants.jvm.resolve.common import ArtifactRequirements, Coordinate
-from pants.jvm.resolve.coursier_fetch import MaterializedClasspath, MaterializedClasspathRequest
+from pants.jvm.resolve.coursier_fetch import ToolClasspath, ToolClasspathRequest
 from pants.util.logging import LogLevel
 
 logger = logging.getLogger(__name__)
@@ -59,10 +59,9 @@ async def build_processors(bash: BashBinary, jdk_setup: JdkSetup) -> JavaParserC
 
     materialized_classpath, source_digest = await MultiGet(
         Get(
-            MaterializedClasspath,
-            MaterializedClasspathRequest(
-                prefix="__toolcp",
-                artifact_requirements=(java_parser_artifact_requirements(),),
+            ToolClasspath,
+            ToolClasspathRequest(
+                prefix="__toolcp", artifact_requirements=java_parser_artifact_requirements()
             ),
         ),
         Get(

src/python/pants/backend/java/lint/google_java_format/rules.py

@@ -21,8 +21,8 @@
 from pants.jvm.resolve import jvm_tool
 from pants.jvm.resolve.coursier_fetch import (
     CoursierResolvedLockfile,
-    MaterializedClasspath,
-    MaterializedClasspathRequest,
+    ToolClasspath,
+    ToolClasspathRequest,
 )
 from pants.jvm.resolve.jvm_tool import GenerateJvmLockfileFromTool, ValidatedJvmToolLockfileRequest
 from pants.util.logging import LogLevel
@@ -77,12 +77,7 @@ async def setup_google_java_format(
             SourceFiles,
             SourceFilesRequest(field_set.source for field_set in setup_request.request.field_sets),
         ),
-        Get(
-            MaterializedClasspath,
-            MaterializedClasspathRequest(
-                lockfiles=(lockfile,),
-            ),
-        ),
+        Get(ToolClasspath, ToolClasspathRequest(lockfile=lockfile)),
     )
 
     source_files_snapshot = (

src/python/pants/backend/scala/compile/scalac.py

@@ -28,7 +28,7 @@
 from pants.jvm.compile import rules as jvm_compile_rules
 from pants.jvm.jdk_rules import JdkSetup
 from pants.jvm.resolve.common import ArtifactRequirements, Coordinate
-from pants.jvm.resolve.coursier_fetch import MaterializedClasspath, MaterializedClasspathRequest
+from pants.jvm.resolve.coursier_fetch import ToolClasspath, ToolClasspathRequest
 from pants.jvm.resolve.coursier_setup import Coursier
 from pants.util.logging import LogLevel
 
@@ -116,23 +116,21 @@ async def compile_scala_source(
     user_classpath = Classpath(direct_dependency_classpath_entries)
     tool_classpath, sources_digest = await MultiGet(
         Get(
-            MaterializedClasspath,
-            MaterializedClasspathRequest(
-                artifact_requirements=(
-                    ArtifactRequirements.from_coordinates(
-                        [
-                            Coordinate(
-                                group="org.scala-lang",
-                                artifact="scala-compiler",
-                                version=scala.version,
-                            ),
-                            Coordinate(
-                                group="org.scala-lang",
-                                artifact="scala-library",
-                                version=scala.version,
-                            ),
-                        ]
-                    ),
+            ToolClasspath,
+            ToolClasspathRequest(
+                artifact_requirements=ArtifactRequirements.from_coordinates(
+                    [
+                        Coordinate(
+                            group="org.scala-lang",
+                            artifact="scala-compiler",
+                            version=scala.version,
+                        ),
+                        Coordinate(
+                            group="org.scala-lang",
+                            artifact="scala-library",
+                            version=scala.version,
+                        ),
+                    ]
                 ),
             ),
         ),

src/python/pants/backend/scala/compile/scalac_plugins.py

@@ -20,8 +20,8 @@
 from pants.jvm.goals import lockfile
 from pants.jvm.resolve.coursier_fetch import (
     CoursierResolvedLockfile,
-    MaterializedClasspath,
-    MaterializedClasspathRequest,
+    ToolClasspath,
+    ToolClasspathRequest,
 )
 from pants.jvm.resolve.jvm_tool import GenerateJvmLockfileFromTool
 from pants.jvm.resolve.jvm_tool import rules as jvm_tool_rules
@@ -86,7 +86,7 @@ def generate_global_scalac_plugins_lockfile_request(
 @dataclass(frozen=True)
 class GlobalScalacPlugins:
     names: tuple[str, ...]
-    classpath: MaterializedClasspath
+    classpath: ToolClasspath
 
     def args(self, prefix: str | None = None) -> Iterator[str]:
         for scalac_plugin_path in self.classpath.classpath_entries(prefix):
@@ -101,11 +101,8 @@ async def global_scalac_plugins(
 ) -> GlobalScalacPlugins:
     lockfile = await Get(CoursierResolvedLockfile, GlobalScalacPluginsToolLockfileSentinel())
     classpath = await Get(
-        MaterializedClasspath,
-        MaterializedClasspathRequest(
-            prefix="__scalac_plugin_cp",
-            lockfiles=(lockfile,),
-        ),
+        ToolClasspath,
+        ToolClasspathRequest(prefix="__scalac_plugin_cp", lockfile=lockfile),
     )
     return GlobalScalacPlugins(loaded_global_plugins.names, classpath)