Make NeverUpToDateStep actually roundtrip serializable for our tests.

Author: nedtwigg

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java

@@ -31,11 +31,11 @@
 
 import com.diffplug.common.base.StringPrinter;
 import com.diffplug.spotless.FileSignature;
-import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.LineEnding;
 import com.diffplug.spotless.NeverUpToDateStep;
 import com.diffplug.spotless.ResourceHarness;
+import com.diffplug.spotless.SerializedFunction;
 import com.diffplug.spotless.TestProvisioner;
 
 class PaddedCellTaskTest extends ResourceHarness {
@@ -54,7 +54,7 @@ public BuildServiceParameters.None getParameters() {
 		SpotlessCheck check;
 		SpotlessApply apply;
 
-		Bundle(String name, FormatterFunc function) throws IOException {
+		Bundle(String name, SerializedFunction<String, String> function) throws IOException {
 			this.name = name;
 			file = setFile("src/test." + name).toContent("CCC");
 			FormatterStep step = NeverUpToDateStep.create(name, function);

plugin-maven/src/test/java/com/diffplug/spotless/maven/incremental/PluginFingerprintTest.java

@@ -40,6 +40,7 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.LineEnding;
 import com.diffplug.spotless.NeverUpToDateStep;
+import com.diffplug.spotless.SerializedFunction;
 import com.diffplug.spotless.maven.MavenIntegrationHarness;
 
 class PluginFingerprintTest extends MavenIntegrationHarness {
@@ -163,7 +164,7 @@ private static Model readPom(String xml) throws Exception {
 	}
 
 	private static FormatterStep formatterStep(String name) {
-		return NeverUpToDateStep.create(name, input -> input);
+		return NeverUpToDateStep.create(name, SerializedFunction.identity());
 	}
 
 	private static Formatter formatter(FormatterStep... steps) {

testlib/src/main/java/com/diffplug/spotless/NeverUpToDateStep.java

@@ -16,27 +16,11 @@
 package com.diffplug.spotless;
 
 import java.io.File;
-import java.util.Objects;
 
 /**
  * Formatter which is equal to itself, but not to any other Formatter.
  */
 public class NeverUpToDateStep implements FormatterStep {
-	/**
-	 * @param name
-	 *             The name of the formatter step
-	 * @param functionSupplier
-	 *             A supplier which will lazily generate the function
-	 *             used by the formatter step
-	 * @return A FormatterStep which will never report that it is up-to-date, because
-	 *         it is not equal to the serialized representation of itself.
-	 */
-	public static FormatterStep createLazy(
-			String name,
-			ThrowingEx.Supplier<FormatterFunc> functionSupplier) {
-		return new NeverUpToDateStep(name, functionSupplier);
-	}
-
 	/**
 	 * @param name
 	 *             The name of the formatter step
@@ -47,20 +31,18 @@ public static FormatterStep createLazy(
 	 */
 	public static FormatterStep create(
 			String name,
-			FormatterFunc function) {
-		Objects.requireNonNull(function, "function");
-		return createLazy(name, () -> function);
+			SerializedFunction<String, String> function) {
+		return new NeverUpToDateStep(name, function);
 	}
 
 	private static final long serialVersionUID = 1L;
 
 	private final String name;
-	private final ThrowingEx.Supplier<FormatterFunc> formatterSupplier;
-	private transient FormatterFunc formatter; // initialized lazily
+	private final SerializedFunction<String, String> formatter; // initialized lazily
 
-	NeverUpToDateStep(String name, ThrowingEx.Supplier<FormatterFunc> formatterSupplier) {
+	NeverUpToDateStep(String name, SerializedFunction<String, String> formatter) {
 		this.name = name;
-		this.formatterSupplier = Objects.requireNonNull(formatterSupplier, "formatterSupplier");
+		this.formatter = formatter;
 	}
 
 	@Override
@@ -70,20 +52,13 @@ public String getName() {
 
 	@Override
 	public String format(String rawUnix, File file) throws Exception {
-		if (formatter == null) {
-			formatter = formatterSupplier.get();
-			if (formatter instanceof FormatterFunc.Closeable) {
-				throw new AssertionError("NeverUpToDate does not support FormatterFunc.Closeable.  See https://github.com/diffplug/spotless/pull/284");
-			}
-		}
-		return formatter.apply(rawUnix, file);
+		return formatter.apply(rawUnix);
 	}
 
 	@Override
 	public void close() throws Exception {
 		if (formatter instanceof FormatterFunc.Closeable) {
 			((FormatterFunc.Closeable) formatter).close();
-			formatter = null;
 		}
 	}
 }

testlib/src/test/java/com/diffplug/spotless/PaddedCellTest.java

@@ -37,15 +37,15 @@ class PaddedCellTest {
 	@TempDir
 	File rootFolder;
 
-	private void misbehaved(FormatterFunc step, String input, PaddedCell.Type expectedOutputType, String steps, String canonical) throws IOException {
+	private void misbehaved(SerializedFunction<String, String> step, String input, PaddedCell.Type expectedOutputType, String steps, String canonical) throws IOException {
 		testCase(step, input, expectedOutputType, steps, canonical, true);
 	}
 
-	private void wellBehaved(FormatterFunc step, String input, PaddedCell.Type expectedOutputType, String canonical) throws IOException {
+	private void wellBehaved(SerializedFunction<String, String> step, String input, PaddedCell.Type expectedOutputType, String canonical) throws IOException {
 		testCase(step, input, expectedOutputType, canonical, canonical, false);
 	}
 
-	private void testCase(FormatterFunc step, String input, PaddedCell.Type expectedOutputType, String expectedSteps, String canonical, boolean misbehaved) throws IOException {
+	private void testCase(SerializedFunction<String, String> step, String input, PaddedCell.Type expectedOutputType, String expectedSteps, String canonical, boolean misbehaved) throws IOException {
 		List<FormatterStep> formatterSteps = new ArrayList<>();
 		formatterSteps.add(NeverUpToDateStep.create("step", step));
 		try (Formatter formatter = Formatter.builder()