Shorten Serializable imports (#2160)

nedtwigg · web-flow · commit bbf9a56f5d5a · 2024-06-05T10:20:56.000-07:00
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/EclipseBasedStepBuilder.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/EclipseBasedStepBuilder.java
@@ -126,7 +126,7 @@ public void setPreferences(Iterable<File> settingsFiles) {
 		this.settingsFiles = settingsFiles;
 	}
 
-	static class EclipseStep implements java.io.Serializable {
+	static class EclipseStep implements Serializable {
 		private static final long serialVersionUID = 1;
 		private final String semanticVersion;
 		private final String formatterStepExt;
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/EquoBasedStepBuilder.java
@@ -143,7 +143,7 @@ private P2Model createModelWithMirrors() {
 		return model;
 	}
 
-	static class EquoStep implements java.io.Serializable {
+	static class EquoStep implements Serializable {
 		private static final long serialVersionUID = 1;
 		private final String semanticVersion;
 		private final FileSignature.Promised settingsPromise;
diff --git a/lib/src/main/java/com/diffplug/spotless/antlr4/Antlr4FormatterStep.java b/lib/src/main/java/com/diffplug/spotless/antlr4/Antlr4FormatterStep.java
@@ -25,7 +25,7 @@
 import com.diffplug.spotless.Provisioner;
 import com.diffplug.spotless.ThrowingEx;
 
-public class Antlr4FormatterStep implements java.io.Serializable {
+public class Antlr4FormatterStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "com.khubla.antlr4formatter:antlr4-formatter:";
 	private static final String DEFAULT_VERSION = "1.2.1";
diff --git a/lib/src/main/java/com/diffplug/spotless/generic/IndentStep.java b/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.SerializedFunction;
 
 /** Simple step which checks for consistent indentation characters. */
-public final class IndentStep implements java.io.Serializable {
+public final class IndentStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	final Type type;
diff --git a/lib/src/main/java/com/diffplug/spotless/generic/Jsr223Step.java b/lib/src/main/java/com/diffplug/spotless/generic/Jsr223Step.java
@@ -28,7 +28,7 @@
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
 
-public final class Jsr223Step implements java.io.Serializable {
+public final class Jsr223Step implements Serializable {
 	private static final long serialVersionUID = 1L;
 	@Nullable
 	private final JarState.Promised jarState;
diff --git a/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsStep.java b/lib/src/main/java/com/diffplug/spotless/gherkin/GherkinUtilsStep.java
@@ -25,7 +25,7 @@
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
 
-public class GherkinUtilsStep implements java.io.Serializable {
+public class GherkinUtilsStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "io.cucumber:gherkin-utils:";
 	private static final String DEFAULT_VERSION = "9.0.0";
diff --git a/lib/src/main/java/com/diffplug/spotless/groovy/RemoveSemicolonsStep.java b/lib/src/main/java/com/diffplug/spotless/groovy/RemoveSemicolonsStep.java
@@ -27,7 +27,7 @@
  *
  * @author Jose Luis Badano
  */
-public final class RemoveSemicolonsStep implements java.io.Serializable {
+public final class RemoveSemicolonsStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String NAME = "Remove unnecessary semicolons";
 
diff --git a/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java b/lib/src/main/java/com/diffplug/spotless/java/CleanthatJavaStep.java
@@ -36,7 +36,7 @@
  * @author Benoit Lacelle
  */
 // https://github.com/diffplug/spotless/blob/main/CONTRIBUTING.md#how-to-add-a-new-formatterstep
-public final class CleanthatJavaStep implements java.io.Serializable {
+public final class CleanthatJavaStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String NAME = "cleanthat";
 	private static final String MAVEN_COORDINATE = "io.github.solven-eu.cleanthat:java";
diff --git a/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java b/lib/src/main/java/com/diffplug/spotless/java/FormatAnnotationsStep.java
@@ -37,7 +37,7 @@
  * <p>
  * Note: A type annotation is an annotation that is meta-annotated with {@code @Target({ElementType.TYPE_USE})}.
  */
-public final class FormatAnnotationsStep implements java.io.Serializable {
+public final class FormatAnnotationsStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	/**
diff --git a/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/GoogleJavaFormatStep.java
@@ -26,7 +26,7 @@
 import com.diffplug.spotless.Provisioner;
 
 /** Wraps up <a href="https://github.com/google/google-java-format">google-java-format</a> as a FormatterStep. */
-public class GoogleJavaFormatStep implements java.io.Serializable {
+public class GoogleJavaFormatStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String DEFAULT_STYLE = "GOOGLE";
 	private static final boolean DEFAULT_REFLOW_LONG_STRINGS = false;
diff --git a/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java b/lib/src/main/java/com/diffplug/spotless/java/ImportOrderStep.java
@@ -42,7 +42,7 @@
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
-public final class ImportOrderStep implements java.io.Serializable {
+public final class ImportOrderStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final boolean WILDCARDS_LAST_DEFAULT = false;
 	private static final boolean SEMANTIC_SORT_DEFAULT = false;
diff --git a/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java b/lib/src/main/java/com/diffplug/spotless/java/PalantirJavaFormatStep.java
@@ -23,7 +23,7 @@
 
 /** Wraps up <a href="https://github.com/palantir/palantir-java-format">palantir-java-format</a> fork of
  * <a href="https://github.com/google/google-java-format">google-java-format</a> as a FormatterStep. */
-public class PalantirJavaFormatStep implements java.io.Serializable {
+public class PalantirJavaFormatStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final boolean DEFAULT_FORMAT_JAVADOC = false;
 	private static final String DEFAULT_STYLE = "PALANTIR";
diff --git a/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java b/lib/src/main/java/com/diffplug/spotless/java/RemoveUnusedImportsStep.java
@@ -15,14 +15,15 @@
  */
 package com.diffplug.spotless.java;
 
+import java.io.Serializable;
 import java.util.List;
 import java.util.Objects;
 
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.Provisioner;
 
 /** Uses google-java-format or cleanthat.UnnecessaryImport, but only to remove unused imports. */
-public class RemoveUnusedImportsStep implements java.io.Serializable {
+public class RemoveUnusedImportsStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String NAME = "removeUnusedImports";
 
diff --git a/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java b/lib/src/main/java/com/diffplug/spotless/json/JacksonJsonStep.java
@@ -29,7 +29,7 @@
  * Simple YAML formatter which reformats the file according to Jackson YAMLFactory.
  */
 // https://stackoverflow.com/questions/14515994/convert-json-string-to-pretty-print-json-output-using-jackson
-public class JacksonJsonStep implements java.io.Serializable {
+public class JacksonJsonStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "com.fasterxml.jackson.core:jackson-databind:";
 	private static final String DEFAULT_VERSION = "2.17.1";
diff --git a/lib/src/main/java/com/diffplug/spotless/json/JsonPatchStep.java b/lib/src/main/java/com/diffplug/spotless/json/JsonPatchStep.java
@@ -29,7 +29,7 @@
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
 
-public class JsonPatchStep implements java.io.Serializable {
+public class JsonPatchStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "com.flipkart.zjsonpatch:zjsonpatch";
 	private static final String DEFAULT_VERSION = "0.4.16";
diff --git a/lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java b/lib/src/main/java/com/diffplug/spotless/json/JsonSimpleStep.java
@@ -29,7 +29,7 @@
 /**
  * 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 implements java.io.Serializable {
+public final class JsonSimpleStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "org.json:json:";
 	private static final String DEFAULT_VERSION = "20210307";
diff --git a/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java b/lib/src/main/java/com/diffplug/spotless/json/gson/GsonStep.java
@@ -25,7 +25,7 @@
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
 
-public class GsonStep implements java.io.Serializable {
+public class GsonStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATES = "com.google.code.gson:gson";
 	private static final String INCOMPATIBLE_ERROR_MESSAGE = "There was a problem interacting with Gson; maybe you set an incompatible version?";
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/DiktatStep.java
@@ -26,7 +26,7 @@
 import com.diffplug.spotless.*;
 
 /** Wraps up <a href="https://github.com/cqfn/diKTat">diktat</a> as a FormatterStep. */
-public class DiktatStep implements java.io.Serializable {
+public class DiktatStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private final JarState.Promised jarState;
 	private final String versionDiktat;
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtLintStep.java
@@ -34,7 +34,7 @@
 import com.diffplug.spotless.Provisioner;
 
 /** Wraps up <a href="https://github.com/pinterest/ktlint">ktlint</a> as a FormatterStep. */
-public class KtLintStep implements java.io.Serializable {
+public class KtLintStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String DEFAULT_VERSION = "1.2.1";
 	private static final String NAME = "ktlint";
diff --git a/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java b/lib/src/main/java/com/diffplug/spotless/kotlin/KtfmtStep.java
@@ -34,7 +34,7 @@
 /**
  * Wraps up <a href="https://github.com/facebookincubator/ktfmt">ktfmt</a> as a FormatterStep.
  */
-public class KtfmtStep implements java.io.Serializable {
+public class KtfmtStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String DEFAULT_VERSION = "0.49";
 	private static final String NAME = "ktfmt";
diff --git a/lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java b/lib/src/main/java/com/diffplug/spotless/markdown/FlexmarkStep.java
@@ -25,7 +25,7 @@
 import com.diffplug.spotless.Provisioner;
 
 /** A step for <a href="https://github.com/vsch/flexmark-java">flexmark-java</a>. */
-public class FlexmarkStep implements java.io.Serializable {
+public class FlexmarkStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String DEFAULT_VERSION = "0.64.8";
 	private static final String MAVEN_COORDINATE = "com.vladsch.flexmark:flexmark-all:";
diff --git a/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java b/lib/src/main/java/com/diffplug/spotless/markdown/FreshMarkStep.java
@@ -37,7 +37,7 @@
 import com.diffplug.spotless.Provisioner;
 
 /** A step for <a href="https://github.com/diffplug/freshmark">FreshMark</a>. */
-public class FreshMarkStep implements java.io.Serializable {
+public class FreshMarkStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	private static final String DEFAULT_VERSION = "1.3.1";
diff --git a/lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java b/lib/src/main/java/com/diffplug/spotless/pom/SortPomStep.java
@@ -24,7 +24,7 @@
 import com.diffplug.spotless.JarState;
 import com.diffplug.spotless.Provisioner;
 
-public class SortPomStep implements java.io.Serializable {
+public class SortPomStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "com.github.ekryd.sortpom:sortpom-sorter:";
 	public static final String NAME = "sortPom";
diff --git a/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java b/lib/src/main/java/com/diffplug/spotless/scala/ScalaFmtStep.java
@@ -30,7 +30,7 @@
 import com.diffplug.spotless.Provisioner;
 
 /** Wraps up <a href="https://github.com/scalameta/scalafmt">scalafmt</a> as a FormatterStep. */
-public class ScalaFmtStep implements java.io.Serializable {
+public class ScalaFmtStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	static final String DEFAULT_VERSION = "3.8.1";
diff --git a/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java b/lib/src/main/java/com/diffplug/spotless/yaml/JacksonYamlStep.java
@@ -30,7 +30,7 @@
  */
 // https://stackoverflow.com/questions/14515994/convert-json-string-to-pretty-print-json-output-using-jackson
 // https://stackoverflow.com/questions/60891174/i-want-to-load-a-yaml-file-possibly-edit-the-data-and-then-dump-it-again-how
-public class JacksonYamlStep implements java.io.Serializable {
+public class JacksonYamlStep implements Serializable {
 	private static final long serialVersionUID = 1L;
 	private static final String MAVEN_COORDINATE = "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:";
 	private static final String DEFAULT_VERSION = "2.14.1";

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ public void setPreferences(Iterable<File> settingsFiles) {`
`126`	`126`	`this.settingsFiles = settingsFiles;`
`127`	`127`	`}`
`128`	`128`
`129`		`- static class EclipseStep implements java.io.Serializable {`
	`129`	`+ static class EclipseStep implements Serializable {`
`130`	`130`	`private static final long serialVersionUID = 1;`
`131`	`131`	`private final String semanticVersion;`
`132`	`132`	`private final String formatterStepExt;`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ private P2Model createModelWithMirrors() {`
`143`	`143`	`return model;`
`144`	`144`	`}`
`145`	`145`
`146`		`- static class EquoStep implements java.io.Serializable {`
	`146`	`+ static class EquoStep implements Serializable {`
`147`	`147`	`private static final long serialVersionUID = 1;`
`148`	`148`	`private final String semanticVersion;`
`149`	`149`	`private final FileSignature.Promised settingsPromise;`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`*`
`28`	`28`	`* @author Jose Luis Badano`
`29`	`29`	`*/`
`30`		`-public final class RemoveSemicolonsStep implements java.io.Serializable {`
	`30`	`+public final class RemoveSemicolonsStep implements Serializable {`
`31`	`31`	`private static final long serialVersionUID = 1L;`
`32`	`32`	`private static final String NAME = "Remove unnecessary semicolons";`
`33`	`33`