Minor refactor, remove useless extra builder class

Author: blutorange

lib/src/main/java/com/diffplug/spotless/rome/RomeStep.java

@@ -50,7 +50,7 @@ public class RomeStep {
 	 * Path to the directory with the {@code rome.json} config file, can be
 	 * <code>null</code>, in which case the defaults are used.
 	 */
-	private final String configPath;
+	private String configPath;
 
 	/**
 	 * The language (syntax) of the input files to format. When <code>null</code> or
@@ -68,7 +68,7 @@ public class RomeStep {
 	 * <li>json (JSON)</li>
 	 * </ul>
 	 */
-	private final String language;
+	private String language;
 
 	/**
 	 * Path to the Rome executable. Can be <code>null</code>, but either a path to
@@ -106,8 +106,8 @@ public static String name() {
 	 * @param downloadDir Directory where to place the downloaded executable.
 	 * @return A new Rome step that download the executable from the network.
 	 */
-	public static RomeStep.Builder withExeDownload(String version, String downloadDir) {
-		return new RomeStep.Builder(version, null, downloadDir);
+	public static RomeStep withExeDownload(String version, String downloadDir) {
+		return new RomeStep(version, null, downloadDir);
 	}
 
 	/**
@@ -117,8 +117,8 @@ public static RomeStep.Builder withExeDownload(String version, String downloadDi
 	 * @param pathToExe Path to the Rome executable to use.
 	 * @return A new Rome step that format with the given executable.
 	 */
-	public static RomeStep.Builder withExePath(String pathToExe) {
-		return new RomeStep.Builder(null, pathToExe, null);
+	public static RomeStep withExePath(String pathToExe) {
+		return new RomeStep(null, pathToExe, null);
 	}
 
 	/**
@@ -217,12 +217,10 @@ private static void validateRomeExecutable(String resolvedPathToExe) {
 	 *
 	 * @param builder Builder with the configuration to use.
 	 */
-	private RomeStep(RomeStep.Builder builder) {
-		this.version = builder.version != null && !builder.version.isBlank() ? builder.version : defaultVersion();
-		this.pathToExe = builder.pathToExe;
-		this.downloadDir = builder.downloadDir;
-		this.configPath = builder.configPath;
-		this.language = builder.language;
+	private RomeStep(String version, String pathToExe, String downloadDir) {
+		this.version = version != null && !version.isBlank() ? version : defaultVersion();
+		this.pathToExe = pathToExe;
+		this.downloadDir = downloadDir;
 	}
 
 	/**
@@ -235,6 +233,44 @@ public FormatterStep create() {
 		return FormatterStep.createLazy(name(), this::createState, State::toFunc);
 	}
 
+	/**
+	 * Sets the path to the directory with the {@code rome.json} config file. When
+	 * no config path is set, the default configuration is used.
+	 *
+	 * @param configPath Config path to use. Must point to a directory which contain
+	 *                   a file named {@code rome.json}.
+	 * @return This builder instance for chaining method calls.
+	 */
+	public RomeStep withConfigPath(String configPath) {
+		this.configPath = configPath;
+		return this;
+	}
+
+	/**
+	 * Sets the language of the files to format When no language is set, it is
+	 * determined automatically from the file name. The following languages are
+	 * currently supported by Rome.
+	 *
+	 * <ul>
+	 * <li>js (JavaScript)</li>
+	 * <li>jsx (JavaScript + JSX)</li>
+	 * <li>js? (JavaScript or JavaScript + JSX, depending on the file
+	 * extension)</li>
+	 * <li>ts (TypeScript)</li>
+	 * <li>tsx (TypeScript + JSX)</li>
+	 * <li>ts? (TypeScript or TypeScript + JSX, depending on the file
+	 * extension)</li>
+	 * <li>json (JSON)</li>
+	 * </ul>
+	 *
+	 * @param language The language of the files to format.
+	 * @return This builder instance for chaining method calls.
+	 */
+	public RomeStep withLanguage(String language) {
+		this.language = language;
+		return this;
+	}
+
 	/**
 	 * Resolves the Rome executable, possibly downloading it from the network, and
 	 * creates a new state instance with the resolved executable that can format
@@ -290,88 +326,6 @@ private String resolveExe() throws IOException, InterruptedException {
 		}
 	}
 
-	public final static class Builder {
-		/** See {@link RomeStep#configPath} */
-		private String configPath;
-
-		/** See {@link RomeStep#downloadDir} */
-		private final String downloadDir;
-
-		/** See {@link RomeStep#language} */
-		private String language;
-
-		/** See {@link RomeStep#pathToExe} */
-		private final String pathToExe;
-
-		/** See {@link RomeStep#version} */
-		private final String version;
-
-		/**
-		 * Creates a new builder for configuring a Rome step that can format code via
-		 * Rome. Either a version and and downloadDir, or a pathToExe must be given.
-		 *
-		 * @param version     The version of Rome to download, see
-		 *                    {@link RomeStep#version}.
-		 * @param pathToExe   The path to the Rome executable to use, see
-		 *                    {@link RomeStep#pathToExe}.
-		 * @param downloadDir The path to the download directory when downloading Rome
-		 *                    from the network, {@link RomeStep#downloadDir}.
-		 */
-		private Builder(String version, String pathToExe, String downloadDir) {
-			this.version = version;
-			this.pathToExe = pathToExe;
-			this.downloadDir = downloadDir;
-		}
-
-		/**
-		 * Creates a new Rome step for formatting code with Rome from the current
-		 * configuration of this builder.
-		 *
-		 * @return A new Rome step with the current configuration.
-		 */
-		public RomeStep build() {
-			return new RomeStep(this);
-		}
-
-		/**
-		 * Sets the path to the directory with the {@code rome.json} config file. When
-		 * no config path is set, the default configuration is used.
-		 *
-		 * @param configPath Config path to use. Must point to a directory which contain
-		 *                   a file named {@code rome.json}.
-		 * @return This builder instance for chaining method calls.
-		 */
-		public Builder withConfigPath(String configPath) {
-			this.configPath = configPath;
-			return this;
-		}
-
-		/**
-		 * Sets the language of the files to format When no language is set, it is
-		 * determined automatically from the file name. The following languages are
-		 * currently supported by Rome.
-		 *
-		 * <ul>
-		 * <li>js (JavaScript)</li>
-		 * <li>jsx (JavaScript + JSX)</li>
-		 * <li>js? (JavaScript or JavaScript + JSX, depending on the file
-		 * extension)</li>
-		 * <li>ts (TypeScript)</li>
-		 * <li>tsx (TypeScript + JSX)</li>
-		 * <li>ts? (TypeScript or TypeScript + JSX, depending on the file
-		 * extension)</li>
-		 * <li>json (JSON)</li>
-		 * </ul>
-		 *
-		 * @param language The language of the files to format.
-		 * @return This builder instance for chaining method calls.
-		 */
-		public Builder withLanguage(String language) {
-			this.language = language;
-			return this;
-		}
-	}
-
 	/**
 	 * The internal state used by the Rome formatter. A state instance is created
 	 * when the spotless plugin for Maven or Gradle is executed, and reused for all

plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java

@@ -770,8 +770,7 @@ protected FormatterStep createStep() {
 				builder.withConfigPath(resolvedConfigPath.toString());
 			}
 			builder.withLanguage(getLanguage());
-			var rome = builder.build();
-			return rome.create();
+			return builder.create();
 		}
 
 		/**
@@ -842,7 +841,7 @@ private File findDataDir() {
 		 *
 		 * @return A builder for a Rome step.
 		 */
-		private RomeStep.Builder newBuilder() {
+		private RomeStep newBuilder() {
 			if (pathToExe != null) {
 				var resolvedPathToExe = resolvePathToExe();
 				return RomeStep.withExePath(resolvedPathToExe);

plugin-maven/src/main/java/com/diffplug/spotless/maven/rome/AbstractRome.java

@@ -23,7 +23,6 @@
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
 import com.diffplug.spotless.rome.RomeStep;
-import com.diffplug.spotless.rome.RomeStep.Builder;
 
 /**
  * Factory for creating the Rome formatter step that can format format code in
@@ -94,8 +93,7 @@ public FormatterStep newFormatterStep(FormatterStepConfig config) {
 		if (getLanguage() != null) {
 			builder.withLanguage(getLanguage());
 		}
-		var step = builder.build();
-		return step.create();
+		return builder.create();
 	}
 
 	/**
@@ -127,7 +125,7 @@ public FormatterStep newFormatterStep(FormatterStepConfig config) {
 	 *               the currently executed project.
 	 * @return A builder for a Rome step.
 	 */
-	private Builder newBuilder(FormatterStepConfig config) {
+	private RomeStep newBuilder(FormatterStepConfig config) {
 		if (pathToExe != null) {
 			var resolvedExePath = resolveExePath(config);
 			return RomeStep.withExePath(resolvedExePath);