Use the new API.

Author: nedtwigg

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

@@ -15,12 +15,14 @@
  */
 package com.diffplug.spotless.generic;
 
+import java.io.Serializable;
+
 import com.diffplug.spotless.FormatterFunc;
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.FormatterStepEqualityOnStateSerialization;
+import com.diffplug.spotless.SerializedFunction;
 
 /** Simple step which checks for consistent indentation characters. */
-public final class IndentStep extends FormatterStepEqualityOnStateSerialization<IndentStep> {
+public final class IndentStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	final Type type;
@@ -31,21 +33,6 @@ private IndentStep(Type type, int numSpacesPerTab) {
 		this.numSpacesPerTab = numSpacesPerTab;
 	}
 
-	@Override
-	public String getName() {
-		return "indentWith" + type.tabSpace("Tabs", "Spaces");
-	}
-
-	@Override
-	protected IndentStep stateSupplier() {
-		return this;
-	}
-
-	@Override
-	protected FormatterFunc stateToFormatter(IndentStep state) {
-		return new Runtime(this)::format;
-	}
-
 	private static final int DEFAULT_NUM_SPACES_PER_TAB = 4;
 
 	public enum Type {
@@ -68,7 +55,14 @@ public FormatterStep create(int numSpacesPerTab) {
 
 	/** Creates a step which will indent with the given type of whitespace, converting between tabs and spaces at the given ratio. */
 	public static FormatterStep create(Type type, int numSpacesPerTab) {
-		return new IndentStep(type, numSpacesPerTab);
+		return FormatterStep.create("indentWith" + type.tabSpace("Tabs", "Spaces"),
+				new IndentStep(type, numSpacesPerTab), SerializedFunction.identity(),
+				IndentStep::startFormatting);
+	}
+
+	private FormatterFunc startFormatting() {
+		var runtime = new Runtime(this);
+		return runtime::format;
 	}
 
 	static class Runtime {

lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java

@@ -25,7 +25,7 @@
 import com.diffplug.spotless.*;
 
 /** Wraps up <a href="https://github.com/cqfn/diKTat">diktat</a> as a FormatterStep. */
-public class DiktatStep extends FormatterStepEqualityOnStateSerialization<DiktatStep.State> {
+public class DiktatStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private final JarState.Promised jarState;
 	private final boolean isScript;
@@ -66,26 +66,16 @@ public static FormatterStep create(String versionDiktat, Provisioner provisioner
 		}
 		Objects.requireNonNull(versionDiktat, "versionDiktat");
 		Objects.requireNonNull(provisioner, "provisioner");
-		return new DiktatStep(JarState.promise(() -> JarState.from(MAVEN_COORDINATE + versionDiktat, provisioner)), isScript, config);
+		return FormatterStep.create(NAME,
+				new DiktatStep(JarState.promise(() -> JarState.from(MAVEN_COORDINATE + versionDiktat, provisioner)), isScript, config),
+				DiktatStep::equalityState, State::createFormat);
 	}
 
-	@Override
-	public String getName() {
-		return NAME;
-	}
-
-	@Override
-	protected State stateSupplier() throws Exception {
+	private State equalityState() throws Exception {
 		return new State(jarState.get(), isScript, FileSignature.stripAbsolutePathsNullable(config));
 	}
 
-	@Override
-	protected FormatterFunc stateToFormatter(State state) throws Exception {
-		return state.createFormat();
-	}
-
 	static final class State implements Serializable {
-
 		private static final long serialVersionUID = 1L;
 
 		final JarState jar;