Make it pretty, make it nice

Author: kelvinou01

gradle-palantir-java-format/src/test/groovy/com/palantir/javaformat/gradle/GradlewExecutor.groovy

@@ -24,6 +24,13 @@ import java.util.concurrent.TimeUnit
 import java.util.stream.Collectors
 import java.util.stream.Stream
 
+/**
+ * IntegrationTestKitSpec currently [loads more than what it needs into the classpath](https://github.com/nebula-plugins/nebula-test/blob/c5d3af9004898276bde5c68da492c6b0b4c5facc/src/main/groovy/nebula/test/IntegrationTestKitBase.groovy#L136)
+ * This means the Formatter is loaded onto the classpath eagerly, [erroneously](https://github.com/palantir/palantir-java-format/blob/00b08d2f471d66382d6c4cd2d05f56b6bb546ad3/gradle-palantir-java-format/src/main/java/com/palantir/javaformat/gradle/spotless/PalantirJavaFormatStep.java#L83).
+ * As a workaround, let's use the classpath produced by Gradle Test Kit in plugin-under-test-metadata.properties
+ * This classpath only contains the dependencies required by the plugin, as well as the plugin itself.
+ * This means no more eager loading of Formatters onto the classpath, no more complaints from PalantirJavaFormatStep
+ */
 class GradlewExecutor {
     File projectDir
 

gradle-palantir-java-format/src/test/groovy/com/palantir/javaformat/gradle/PalantirJavaFormatSpotlessPluginTest.groovy

@@ -31,6 +31,8 @@ class PalantirJavaFormatSpotlessPluginTest extends IntegrationTestKitSpec {
     private static final NATIVE_IMAGE_FILE = new File("build/nativeImage.path")
     private static final NATIVE_CONFIG = String.format("palantirJavaFormatNative files(\"%s\")", NATIVE_IMAGE_FILE.text)
 
+    private final executor = new GradlewExecutor(projectDir)
+
     @Unroll
     def "formats with spotless when spotless is applied"(String extraGradleProperties, String javaVersion, String expectedOutput) {
         def extraDependencies = extraGradleProperties.isEmpty() ? "" : NATIVE_CONFIG
@@ -109,7 +111,7 @@ class PalantirJavaFormatSpotlessPluginTest extends IntegrationTestKitSpec {
 
 
         when:
-        def result = runGradlewTasks('spotlessApply', '--info')
+        def result = executor.runGradlewTasks('spotlessApply', '--info')
 
         then:
         result.standardOutput.contains(expectedOutput)
@@ -123,61 +125,6 @@ class PalantirJavaFormatSpotlessPluginTest extends IntegrationTestKitSpec {
 
     }
 
-    private static Iterable<File> getBuildPluginClasspathInjector() {
-        return getPluginClasspathInjector(Path.of("../gradle-palantir-java-format/build/pluginUnderTestMetadata/plugin-under-test-metadata.properties"))
-    }
-
-    private static Iterable<File> getPluginClasspathInjector(Path path) {
-        File propertiesFile = path.toFile()
-        Properties properties = new Properties()
-        propertiesFile.withInputStream { inputStream ->
-            properties.load(inputStream)
-        }
-        String classpath = properties.getProperty('implementation-classpath')
-        return classpath.split(File.pathSeparator).collect { new File(it) }
-    }
-
-    private GradlewExecutionResult runGradlewTasks(String... tasks) {
-        ProcessBuilder processBuilder = getProcessBuilder(tasks)
-        Process process = processBuilder.start()
-        String output = readAllInput(process.getInputStream())
-        process.waitFor(1, TimeUnit.MINUTES)
-        GradlewExecutionResult result = new GradlewExecutionResult(process.exitValue(), output)
-        assert result.success
-        return result
-    }
-
-    final class GradlewExecutionResult {
-
-        private final Boolean success
-        private final String standardOutput
-        private final Throwable failure
-
-        GradlewExecutionResult(int exitValue, String output) {
-            this.success = exitValue == 0
-            this.standardOutput =  output
-            this.failure = exitValue != 0 ? new RuntimeException(String.format("Build failed with exitCode %s", exitValue)) : null
-        }
-    }
-
-    static String readAllInput(InputStream inputStream) {
-        try (Stream<String> lines =
-                new BufferedReader(new InputStreamReader(inputStream, StandardCharsets.UTF_8)).lines()) {
-            return lines.collect(Collectors.joining("\n"));
-        }
-    }
-
-    private ProcessBuilder getProcessBuilder(String... tasks) {
-        File initScript = new File(projectDir, "init.gradle")
-        ClasspathAddingInitScriptBuilder.build(initScript, getBuildPluginClasspathInjector().toList())
-        List<String> arguments = ["./gradlew", "--init-script", initScript.toPath().toString()]
-        Arrays.asList(tasks).forEach(arguments::add)
-        ProcessBuilder processBuilder = new ProcessBuilder()
-                .command(arguments)
-                .directory(projectDir)
-                .redirectErrorStream(true)
-        return processBuilder
-    }
 
     def validJavaFile = '''\
     package test;