Make JsonSimpleStep round-trippable

Author: Goooler

lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2023 DiffPlug
+ * Copyright 2021-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
  */
 package com.diffplug.spotless.json;
 
-import java.io.IOException;
 import java.io.Serializable;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -26,17 +25,35 @@
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
+import com.diffplug.spotless.RoundedStep;
 
 /**
  * Simple JSON formatter which reformats the file according to the org.json library's default pretty-printing, but has no ability to customise more than the indentation size.
  */
-public final class JsonSimpleStep {
+public final class JsonSimpleStep implements RoundedStep {
+	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "org.json:json:";
 	private static final String DEFAULT_VERSION = "20210307";
+	public static final String NAME = "jsonSimple";
+
+	private final JarState.Promised jarState;
+	private final int indentSpaces;
+
+	private JsonSimpleStep(JarState.Promised jarState, int indentSpaces) {
+		this.indentSpaces = indentSpaces;
+		this.jarState = jarState;
+	}
 
 	public static FormatterStep create(int indent, Provisioner provisioner) {
 		Objects.requireNonNull(provisioner, "provisioner cannot be null");
-		return FormatterStep.createLazy("json", () -> new State(indent, provisioner), State::toFormatter);
+		return FormatterStep.create(NAME,
+				new JsonSimpleStep(JarState.promise(() -> JarState.from(MAVEN_COORDINATE + DEFAULT_VERSION, provisioner)), indent),
+				JsonSimpleStep::equalityState,
+				State::toFormatter);
+	}
+
+	private State equalityState() {
+		return new State(jarState.get(), indentSpaces);
 	}
 
 	private static final class State implements Serializable {
@@ -45,9 +62,9 @@ private static final class State implements Serializable {
 		private final int indentSpaces;
 		private final JarState jarState;
 
-		private State(int indent, Provisioner provisioner) throws IOException {
+		State(JarState jarState, int indent) {
+			this.jarState = jarState;
 			this.indentSpaces = indent;
-			this.jarState = JarState.from(MAVEN_COORDINATE + DEFAULT_VERSION, provisioner);
 		}
 
 		FormatterFunc toFormatter() {
@@ -94,8 +111,4 @@ private String format(Constructor<?> constructor, Method toString, String input)
 			}
 		}
 	}
-
-	private JsonSimpleStep() {
-		// cannot be directly instantiated
-	}
 }

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

@@ -51,7 +51,7 @@ protected StepHarnessBase(Formatter formatter) {
 				supportsRoundTrip = true;
 			} else if (Set.of("black", "buf", "clang", "ktlint", "ktfmt", "scalafmt", "palantir-java-format", "google-java-format",
 					"removeUnusedImports", "cleanthat", "No line break between type annotation and type",
-					"gson", "jacksonJson", "apply-json-patch",
+					"gson", "jacksonJson", "apply-json-patch", "jsonSimple",
 					"importOrder", "Remove unnecessary semicolons").contains(onlyStepName)) {
 				supportsRoundTrip = true;
 			}