Change to using the EclipseWtpFormatterStep enum as the argument.

nedtwigg · nedtwigg · commit 11147a96e815 · 2018-12-18T10:53:53.000-08:00
diff --git a/lib-extra/src/main/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStep.java b/lib-extra/src/main/java/com/diffplug/spotless/extra/wtp/EclipseWtpFormatterStep.java
@@ -15,14 +15,9 @@
  */
 package com.diffplug.spotless.extra.wtp;
 
-import static java.util.Arrays.stream;
-import static java.util.stream.Collectors.joining;
-
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.util.Locale;
-import java.util.Objects;
 import java.util.Properties;
 
 import com.diffplug.spotless.FormatterFunc;
@@ -53,20 +48,6 @@ public enum EclipseWtpFormatterStep {
 		this.formatterCall = formatterCall;
 	}
 
-	/** Similar to {@link #valueOf(Class, String)}, ignores whitespace, case and adds helpful exception messages. */
-	public static EclipseWtpFormatterStep valueFrom(String name) {
-		Objects.requireNonNull(name);
-		name = name.trim().toUpperCase(Locale.ENGLISH);
-		try {
-			return valueOf(name);
-		} catch (IllegalArgumentException e) {
-			throw new IllegalArgumentException(e.getMessage() +
-					" (allowed values: " +
-					stream(values()).map(enumType -> enumType.toString()).collect(joining("; ")) +
-					")");
-		}
-	}
-
 	public EclipseBasedStepBuilder createBuilder(Provisioner provisioner) {
 		return new EclipseBasedStepBuilder(NAME, " - " + toString(), provisioner, state -> formatterCall.apply(implementationClassName, state));
 	}
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/FormatExtension.java
@@ -488,13 +488,9 @@ public PrettierConfig prettier() {
 	public class EclipseWtpConfig {
 		private final EclipseBasedStepBuilder builder;
 
-		EclipseWtpConfig(EclipseWtpFormatterStep type) {
-			this(type, EclipseWtpFormatterStep.defaultVersion());
-		}
-
 		EclipseWtpConfig(EclipseWtpFormatterStep type, String version) {
 			builder = type.createBuilder(GradleProvisioner.fromProject(getProject()));
-			builder.setVersion(EclipseWtpFormatterStep.defaultVersion());
+			builder.setVersion(version);
 			addStep(builder.build());
 		}
 
@@ -504,17 +500,14 @@ public void configFile(Object... configFiles) {
 			builder.setPreferences(project.files(configFiles).getFiles());
 			replaceStep(builder.build());
 		}
-
 	}
 
-	public EclipseWtpConfig eclipseWtp(String type) {
-		return new EclipseWtpConfig(EclipseWtpFormatterStep.valueFrom(type));
+	public EclipseWtpConfig eclipseWtp(EclipseWtpFormatterStep type) {
+		return eclipseWtp(type, EclipseWtpFormatterStep.defaultVersion());
 	}
 
-	public EclipseWtpConfig eclipseWtp(String type, String version) {
-		return new EclipseWtpConfig(
-				EclipseWtpFormatterStep.valueFrom(type),
-				version);
+	public EclipseWtpConfig eclipseWtp(EclipseWtpFormatterStep type, String version) {
+		return new EclipseWtpConfig(type, version);
 	}
 
 	/** Sets up a format task according to the values in this extension. */
diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/EclipseWtp.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/EclipseWtp.java
@@ -28,7 +28,7 @@
 
 public class EclipseWtp implements FormatterStepFactory {
 	@Parameter
-	private String type;
+	private EclipseWtpFormatterStep type;
 
 	@Parameter
 	private String version;
@@ -38,7 +38,7 @@ public class EclipseWtp implements FormatterStepFactory {
 
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
-		EclipseBasedStepBuilder eclipseConfig = EclipseWtpFormatterStep.valueFrom(type).createBuilder(stepConfig.getProvisioner());
+		EclipseBasedStepBuilder eclipseConfig = type.createBuilder(stepConfig.getProvisioner());
 		eclipseConfig.setVersion(version == null ? EclipseWtpFormatterStep.defaultVersion() : version);
 		if (null != files) {
 			eclipseConfig.setPreferences(
