More idiomatic code

Author: MartelliEnrico

build.gradle

@@ -1,3 +1,4 @@
+import com.github.stickerifier.stickerify.JlinkJavaLauncher
 import com.github.stickerifier.stickerify.JlinkTask
 
 plugins {
@@ -59,7 +60,7 @@ def jlink = tasks.register('jlink', JlinkTask) {
 
 test {
     inputs.dir jlink.get().outputDirectory
-    javaLauncher = JlinkTask.getJavaLauncher(jlink)
+    javaLauncher = new JlinkJavaLauncher(jlink.get())
 
     useJUnitPlatform()
     finalizedBy jacocoTestReport

buildSrc/src/main/java/com/github/stickerifier/stickerify/JlinkJavaLauncher.java

@@ -2,11 +2,22 @@
 
 import org.gradle.api.file.RegularFile;
 import org.gradle.api.provider.Provider;
+import org.gradle.jvm.toolchain.JavaCompiler;
 import org.gradle.jvm.toolchain.JavaInstallationMetadata;
 import org.gradle.jvm.toolchain.JavaLauncher;
 import org.jetbrains.annotations.NotNull;
 
-public record JlinkJavaLauncher(Provider<JavaInstallationMetadata> metadata, Provider<RegularFile> executablePath) implements JavaLauncher {
+public record JlinkJavaLauncher(
+		Provider<JavaInstallationMetadata> metadata,
+		Provider<RegularFile> executablePath
+) implements JavaLauncher {
+	public JlinkJavaLauncher(JlinkTask task) {
+		this(
+				task.getJavaCompiler().map(JavaCompiler::getMetadata),
+				task.getOutputDirectory().file("jre/bin/java")
+		);
+	}
+
 	@Override
 	public @NotNull JavaInstallationMetadata getMetadata() {
 		return metadata.get();

buildSrc/src/main/java/com/github/stickerifier/stickerify/JlinkTask.java

@@ -7,17 +7,13 @@
 import org.gradle.api.plugins.JavaPluginExtension;
 import org.gradle.api.provider.ListProperty;
 import org.gradle.api.provider.Property;
-import org.gradle.api.provider.Provider;
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.Nested;
 import org.gradle.api.tasks.OutputDirectory;
 import org.gradle.api.tasks.TaskAction;
-import org.gradle.api.tasks.TaskProvider;
 import org.gradle.jvm.toolchain.JavaCompiler;
-import org.gradle.jvm.toolchain.JavaLauncher;
 import org.gradle.jvm.toolchain.JavaToolchainService;
 import org.gradle.process.ExecOperations;
-import org.jetbrains.annotations.NotNull;
 
 import javax.inject.Inject;
 import java.io.ByteArrayOutputStream;
@@ -103,11 +99,4 @@ public void performAction() {
 		result.assertNormalExitValue();
 	}
 
-	public static Provider<JavaLauncher> getJavaLauncher(TaskProvider<@NotNull JlinkTask> taskProvider) {
-		return taskProvider.map(jlinkTask -> new JlinkJavaLauncher(
-				jlinkTask.getJavaCompiler().map(JavaCompiler::getMetadata),
-				jlinkTask.getOutputDirectory().file("jre/bin/java")
-		));
-	}
-
 }