Enum naming convention, EBiomeFlavor -> BiomeFlavor

Author: awa-xima

lib/src/main/java/com/diffplug/spotless/rome/EBiomeFlavor.java renamed to lib/src/main/java/com/diffplug/spotless/rome/BiomeFlavor.java

@@ -21,7 +21,7 @@
  * <p>
  * Will be removed once the old Rome project is not supported anymore.
  */
-public enum EBiomeFlavor {
+public enum BiomeFlavor {
 	/** The new forked Biome project. */
 	BIOME("biome", "1.2.0", "biome.json", "biome-%s-%s-%s",
 			"https://github.com/biomejs/biome/releases/download/cli%%2Fv%s/biome-%s"),
@@ -42,7 +42,7 @@ public enum EBiomeFlavor {
 	private final String shortName;
 	private final String urlPattern;
 
-	EBiomeFlavor(String shortName, String defaultVersion, String configName, String downloadFilePattern,
+	BiomeFlavor(String shortName, String defaultVersion, String configName, String downloadFilePattern,
 			String urlPattern) {
 		this.shortName = shortName;
 		this.defaultVersion = defaultVersion;

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

@@ -71,7 +71,7 @@ final class RomeExecutableDownloader {
 
 	private final Path downloadDir;
 
-	private final EBiomeFlavor flavor;
+	private final BiomeFlavor flavor;
 
 	/**
 	 * Creates a new downloader for the Biome executable. The executable files are
@@ -80,7 +80,7 @@ final class RomeExecutableDownloader {
 	 * @param flavor Flavor of Biome to use.
 	 * @param downloadDir Directory where to store the downloaded executable.
 	 */
-	public RomeExecutableDownloader(EBiomeFlavor flavor, Path downloadDir) {
+	public RomeExecutableDownloader(BiomeFlavor flavor, Path downloadDir) {
 		this.flavor = flavor;
 		this.downloadDir = downloadDir;
 	}

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

@@ -74,7 +74,7 @@ public class RomeStep {
 	 * Biome flavor to use. Will be removed once we stop supporting the deprecated Rome project.
 	 */
 	@Deprecated
-	private final EBiomeFlavor flavor;
+	private final BiomeFlavor flavor;
 
 	/**
 	 * Path to the Biome executable. Can be <code>null</code>, but either a path to
@@ -113,7 +113,7 @@ public String name() {
 	 * @param downloadDir Directory where to place the downloaded executable.
 	 * @return A new Biome step that download the executable from the network.
 	 */
-	public static RomeStep withExeDownload(EBiomeFlavor flavor, String version, String downloadDir) {
+	public static RomeStep withExeDownload(BiomeFlavor flavor, String version, String downloadDir) {
 		return new RomeStep(flavor, version, null, downloadDir);
 	}
 
@@ -125,7 +125,7 @@ public static RomeStep withExeDownload(EBiomeFlavor flavor, String version, Stri
 	 * @param pathToExe Path to the Biome executable to use.
 	 * @return A new Biome step that format with the given executable.
 	 */
-	public static RomeStep withExePath(EBiomeFlavor flavor, String pathToExe) {
+	public static RomeStep withExePath(BiomeFlavor flavor, String pathToExe) {
 		return new RomeStep(flavor, null, pathToExe, null);
 	}
 
@@ -154,7 +154,7 @@ private static void attemptToAddPosixPermission(Path file, PosixFilePermission p
 	 *
 	 * @return The default version for Biome.
 	 */
-	private static String defaultVersion(EBiomeFlavor flavor) {
+	private static String defaultVersion(BiomeFlavor flavor) {
 		return flavor.defaultVersion();
 	}
 
@@ -198,7 +198,7 @@ private static String resolveNameAgainstPath(String name) throws IOException, In
 	 * Checks the Biome config path. When the config path does not exist or when it
 	 * does not contain a file named {@code biome.json}, an error is thrown.
 	 */
-	private static void validateBiomeConfigPath(EBiomeFlavor flavor, String configPath) {
+	private static void validateBiomeConfigPath(BiomeFlavor flavor, String configPath) {
 		if (configPath == null) {
 			return;
 		}
@@ -230,7 +230,7 @@ private static void validateBiomeExecutable(String resolvedPathToExe) {
 	 * @param pathToExe Path to the Biome executable to use.
 	 * @param downloadDir Directory where to place the downloaded executable.
 	 */
-	private RomeStep(EBiomeFlavor flavor, String version, String pathToExe, String downloadDir) {
+	private RomeStep(BiomeFlavor flavor, String version, String pathToExe, String downloadDir) {
 		this.flavor = flavor;
 		this.version = version != null && !version.isBlank() ? version : defaultVersion(flavor);
 		this.pathToExe = pathToExe;

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

@@ -67,7 +67,7 @@
 import com.diffplug.spotless.generic.TrimTrailingWhitespaceStep;
 import com.diffplug.spotless.npm.NpmPathResolver;
 import com.diffplug.spotless.npm.PrettierFormatterStep;
-import com.diffplug.spotless.rome.EBiomeFlavor;
+import com.diffplug.spotless.rome.BiomeFlavor;
 
 import groovy.lang.Closure;
 
@@ -740,7 +740,7 @@ public class BiomeGeneric extends RomeStepConfig<BiomeGeneric> {
 		 *                <code>null</code>.
 		 */
 		public BiomeGeneric(String version) {
-			super(getProject(), FormatExtension.this::replaceStep, EBiomeFlavor.BIOME, version);
+			super(getProject(), FormatExtension.this::replaceStep, BiomeFlavor.BIOME, version);
 		}
 
 		/**
@@ -799,7 +799,7 @@ public class RomeGeneric extends RomeStepConfig<RomeGeneric> {
 		 *                <code>null</code>.
 		 */
 		public RomeGeneric(String version) {
-			super(getProject(), FormatExtension.this::replaceStep, EBiomeFlavor.ROME, version);
+			super(getProject(), FormatExtension.this::replaceStep, BiomeFlavor.ROME, version);
 		}
 
 		/**

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

@@ -34,7 +34,7 @@
 import com.diffplug.spotless.npm.EslintFormatterStep;
 import com.diffplug.spotless.npm.NpmPathResolver;
 import com.diffplug.spotless.npm.PrettierFormatterStep;
-import com.diffplug.spotless.rome.EBiomeFlavor;
+import com.diffplug.spotless.rome.BiomeFlavor;
 
 public class JavascriptExtension extends FormatExtension {
 
@@ -193,7 +193,7 @@ public class BiomeJs extends RomeStepConfig<BiomeJs> {
 		 * @param version Biome version to use.
 		 */
 		public BiomeJs(String version) {
-			super(getProject(), JavascriptExtension.this::replaceStep, EBiomeFlavor.BIOME, version);
+			super(getProject(), JavascriptExtension.this::replaceStep, BiomeFlavor.BIOME, version);
 		}
 
 		@Override
@@ -221,7 +221,7 @@ public class RomeJs extends RomeStepConfig<RomeJs> {
 		 * @param version Rome version to use.
 		 */
 		public RomeJs(String version) {
-			super(getProject(), JavascriptExtension.this::replaceStep, EBiomeFlavor.ROME, version);
+			super(getProject(), JavascriptExtension.this::replaceStep, BiomeFlavor.ROME, version);
 		}
 
 		@Override

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

@@ -27,7 +27,7 @@
 import com.diffplug.spotless.json.JsonPatchStep;
 import com.diffplug.spotless.json.JsonSimpleStep;
 import com.diffplug.spotless.json.gson.GsonStep;
-import com.diffplug.spotless.rome.EBiomeFlavor;
+import com.diffplug.spotless.rome.BiomeFlavor;
 
 public class JsonExtension extends FormatExtension {
 	private static final int DEFAULT_INDENTATION = 4;
@@ -217,7 +217,7 @@ public class BiomeJson extends RomeStepConfig<BiomeJson> {
 		 * @param version Biome version to use.
 		 */
 		public BiomeJson(String version) {
-			super(getProject(), JsonExtension.this::replaceStep, EBiomeFlavor.BIOME, version);
+			super(getProject(), JsonExtension.this::replaceStep, BiomeFlavor.BIOME, version);
 		}
 
 		@Override
@@ -245,7 +245,7 @@ public class RomeJson extends RomeStepConfig<RomeJson> {
 		 * @param version Rome version to use.
 		 */
 		public RomeJson(String version) {
-			super(getProject(), JsonExtension.this::replaceStep, EBiomeFlavor.ROME, version);
+			super(getProject(), JsonExtension.this::replaceStep, BiomeFlavor.ROME, version);
 		}
 
 		@Override

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

@@ -28,7 +28,7 @@
 import org.gradle.api.artifacts.repositories.MavenArtifactRepository;
 
 import com.diffplug.spotless.FormatterStep;
-import com.diffplug.spotless.rome.EBiomeFlavor;
+import com.diffplug.spotless.rome.BiomeFlavor;
 import com.diffplug.spotless.rome.RomeStep;
 
 public abstract class RomeStepConfig<Self extends RomeStepConfig<Self>> {
@@ -54,7 +54,7 @@ public abstract class RomeStepConfig<Self extends RomeStepConfig<Self>> {
 	 * The flavor of Biome to use. Will be removed when we stop support the
 	 * deprecated Rome project.
 	 */
-	private final EBiomeFlavor flavor;
+	private final BiomeFlavor flavor;
 
 	/**
 	 * Optional path to the Biome executable. Either a <code>version</code> or a
@@ -95,7 +95,7 @@ public abstract class RomeStepConfig<Self extends RomeStepConfig<Self>> {
 	@Nullable
 	private String version;
 
-	protected RomeStepConfig(Project project, Consumer<FormatterStep> replaceStep, EBiomeFlavor flavor,
+	protected RomeStepConfig(Project project, Consumer<FormatterStep> replaceStep, BiomeFlavor flavor,
 			String version) {
 		this.project = requireNonNull(project);
 		this.replaceStep = requireNonNull(replaceStep);

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

@@ -38,7 +38,7 @@
 import com.diffplug.spotless.npm.TsConfigFileType;
 import com.diffplug.spotless.npm.TsFmtFormatterStep;
 import com.diffplug.spotless.npm.TypedTsFmtConfigFile;
-import com.diffplug.spotless.rome.EBiomeFlavor;
+import com.diffplug.spotless.rome.BiomeFlavor;
 
 public class TypescriptExtension extends FormatExtension {
 
@@ -278,7 +278,7 @@ public class BiomeTs extends RomeStepConfig<BiomeTs> {
 		 * @param version Biome version to use.
 		 */
 		public BiomeTs(String version) {
-			super(getProject(), TypescriptExtension.this::replaceStep, EBiomeFlavor.BIOME, version);
+			super(getProject(), TypescriptExtension.this::replaceStep, BiomeFlavor.BIOME, version);
 		}
 
 		@Override
@@ -306,7 +306,7 @@ public class RomeTs extends RomeStepConfig<RomeTs> {
 		 * @param version Rome version to use.
 		 */
 		public RomeTs(String version) {
-			super(getProject(), TypescriptExtension.this::replaceStep, EBiomeFlavor.ROME, version);
+			super(getProject(), TypescriptExtension.this::replaceStep, BiomeFlavor.ROME, version);
 		}
 
 		@Override

plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Biome.java

@@ -18,7 +18,7 @@
 import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.maven.rome.AbstractRome;
-import com.diffplug.spotless.rome.EBiomeFlavor;
+import com.diffplug.spotless.rome.BiomeFlavor;
 
 /**
  * Generic Biome formatter step that detects the language of the input file from
@@ -27,7 +27,7 @@
  */
 public class Biome extends AbstractRome {
 	public Biome() {
-		super(EBiomeFlavor.BIOME);
+		super(BiomeFlavor.BIOME);
 	}
 
 	/**

plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Rome.java

@@ -18,15 +18,15 @@
 import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.maven.rome.AbstractRome;
-import com.diffplug.spotless.rome.EBiomeFlavor;
+import com.diffplug.spotless.rome.BiomeFlavor;
 
 /**
  * See {@link Biome}.
  * @deprecated Rome has transitioned to Biome. This will be removed shortly.
  */
 public class Rome extends AbstractRome {
 	public Rome() {
-		super(EBiomeFlavor.ROME);
+		super(BiomeFlavor.ROME);
 	}
 
 	/**