FenceStep can't use serialization for equality on its delegate steps anymore, it has to use "real" equality now.

Author: nedtwigg

lib/src/main/java/com/diffplug/spotless/Formatter.java

@@ -35,6 +35,8 @@
 
 import javax.annotation.Nullable;
 
+import com.diffplug.spotless.generic.FenceStep;
+
 /** Formatter which performs the full formatting. */
 public final class Formatter implements Serializable, AutoCloseable {
 	private static final long serialVersionUID = 1L;
@@ -306,6 +308,8 @@ public void close() {
 				((FormatterStepImpl.Standard) step).cleanupFormatterFunc();
 			} else if (step instanceof FormatterStepEqualityOnStateSerialization) {
 				((FormatterStepEqualityOnStateSerialization) step).cleanupFormatterFunc();
+			} else if (step instanceof FenceStep.Apply) {
+				((FenceStep.Apply) step).cleanup();
 			}
 		}
 	}

lib/src/main/java/com/diffplug/spotless/generic/FenceStep.java

@@ -25,11 +25,12 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javax.annotation.Nullable;
+
 import com.diffplug.spotless.Formatter;
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.LineEnding;
-import com.diffplug.spotless.SerializedFunction;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
@@ -81,10 +82,7 @@ private void assertRegexSet() {
 	/** Returns a step which will apply the given steps but preserve the content selected by the regex / openClose pair. */
 	public FormatterStep preserveWithin(List<FormatterStep> steps) {
 		assertRegexSet();
-		return FormatterStep.createLazy(name,
-				() -> new PreserveWithin(regex, steps),
-				SerializedFunction.identity(),
-				state -> FormatterFunc.Closeable.of(state.buildFormatter(), state));
+		return new PreserveWithin(name, regex, steps);
 	}
 
 	/**
@@ -93,17 +91,14 @@ public FormatterStep preserveWithin(List<FormatterStep> steps) {
 	 */
 	public FormatterStep applyWithin(List<FormatterStep> steps) {
 		assertRegexSet();
-		return FormatterStep.createLazy(name,
-				() -> new ApplyWithin(regex, steps),
-				SerializedFunction.identity(),
-				state -> FormatterFunc.Closeable.of(state.buildFormatter(), state));
+		return new ApplyWithin(name, regex, steps);
 	}
 
 	static class ApplyWithin extends Apply implements FormatterFunc.Closeable.ResourceFuncNeedsFile<Formatter> {
 		private static final long serialVersionUID = 17061466531957339L;
 
-		ApplyWithin(Pattern regex, List<FormatterStep> steps) {
-			super(regex, steps);
+		ApplyWithin(String name, Pattern regex, List<FormatterStep> steps) {
+			super(name, regex, steps);
 		}
 
 		@Override
@@ -122,8 +117,8 @@ public String apply(Formatter formatter, String unix, File file) throws Exceptio
 	static class PreserveWithin extends Apply implements FormatterFunc.Closeable.ResourceFuncNeedsFile<Formatter> {
 		private static final long serialVersionUID = -8676786492305178343L;
 
-		PreserveWithin(Pattern regex, List<FormatterStep> steps) {
-			super(regex, steps);
+		PreserveWithin(String name, Pattern regex, List<FormatterStep> steps) {
+			super(name, regex, steps);
 		}
 
 		private void storeGroups(String unix) {
@@ -144,15 +139,17 @@ public String apply(Formatter formatter, String unix, File file) throws Exceptio
 	}
 
 	@SuppressFBWarnings("SE_TRANSIENT_FIELD_NOT_RESTORED")
-	static class Apply implements Serializable {
+	public static abstract class Apply implements Serializable, FormatterStep, FormatterFunc.Closeable.ResourceFuncNeedsFile<Formatter> {
+		final String name;
 		private static final long serialVersionUID = -2301848328356559915L;
 		final Pattern regex;
 		final List<FormatterStep> steps;
 
 		transient ArrayList<String> groups = new ArrayList<>();
 		transient StringBuilder builderInternal;
 
-		public Apply(Pattern regex, List<FormatterStep> steps) {
+		public Apply(String name, Pattern regex, List<FormatterStep> steps) {
+			this.name = name;
 			this.regex = regex;
 			this.steps = steps;
 		}
@@ -218,5 +215,43 @@ protected String assembleGroups(String unix) {
 				throw new Error("An intermediate step removed a match of " + pattern);
 			}
 		}
+
+		@Override
+		public String getName() {
+			return name;
+		}
+
+		private transient Formatter formatter;
+
+		@Nullable
+		@Override
+		public String format(String rawUnix, File file) throws Exception {
+			if (formatter == null) {
+				formatter = buildFormatter();
+			}
+			return this.apply(formatter, rawUnix, file);
+		}
+
+		@Override
+		public boolean equals(Object o) {
+			if (this == o)
+				return true;
+			if (o == null || getClass() != o.getClass())
+				return false;
+			Apply step = (Apply) o;
+			return name.equals(step.name) && regex.pattern().equals(step.regex.pattern()) && regex.flags() == step.regex.flags() && steps.equals(step.steps);
+		}
+
+		@Override
+		public int hashCode() {
+			return Objects.hash(name, regex.pattern(), regex.flags(), steps);
+		}
+
+		public void cleanup() {
+			if (formatter != null) {
+				formatter.close();
+				formatter = null;
+			}
+		}
 	}
 }