Remove the FormatExceptionPolicy from the Formatter because it will become part of linting.

Author: nedtwigg

lib/src/main/java/com/diffplug/spotless/Formatter.java

@@ -36,21 +36,18 @@ public final class Formatter implements Serializable, AutoCloseable {
 	private LineEnding.Policy lineEndingsPolicy;
 	private Charset encoding;
 	private List<FormatterStep> steps;
-	private FormatExceptionPolicy exceptionPolicy;
 
-	private Formatter(LineEnding.Policy lineEndingsPolicy, Charset encoding, List<FormatterStep> steps, FormatExceptionPolicy exceptionPolicy) {
+	private Formatter(LineEnding.Policy lineEndingsPolicy, Charset encoding, List<FormatterStep> steps) {
 		this.lineEndingsPolicy = Objects.requireNonNull(lineEndingsPolicy, "lineEndingsPolicy");
 		this.encoding = Objects.requireNonNull(encoding, "encoding");
 		this.steps = requireElementsNonNull(new ArrayList<>(steps));
-		this.exceptionPolicy = Objects.requireNonNull(exceptionPolicy, "exceptionPolicy");
 	}
 
 	// override serialize output
 	private void writeObject(ObjectOutputStream out) throws IOException {
 		out.writeObject(lineEndingsPolicy);
 		out.writeObject(encoding.name());
 		out.writeObject(steps);
-		out.writeObject(exceptionPolicy);
 	}
 
 	// override serialize input
@@ -59,7 +56,6 @@ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundE
 		lineEndingsPolicy = (LineEnding.Policy) in.readObject();
 		encoding = Charset.forName((String) in.readObject());
 		steps = (List<FormatterStep>) in.readObject();
-		exceptionPolicy = (FormatExceptionPolicy) in.readObject();
 	}
 
 	// override serialize input
@@ -80,10 +76,6 @@ public List<FormatterStep> getSteps() {
 		return steps;
 	}
 
-	public FormatExceptionPolicy getExceptionPolicy() {
-		return exceptionPolicy;
-	}
-
 	public static Formatter.Builder builder() {
 		return new Formatter.Builder();
 	}
@@ -93,7 +85,6 @@ public static class Builder {
 		private LineEnding.Policy lineEndingsPolicy;
 		private Charset encoding;
 		private List<FormatterStep> steps;
-		private FormatExceptionPolicy exceptionPolicy;
 
 		private Builder() {}
 
@@ -112,14 +103,8 @@ public Builder steps(List<FormatterStep> steps) {
 			return this;
 		}
 
-		public Builder exceptionPolicy(FormatExceptionPolicy exceptionPolicy) {
-			this.exceptionPolicy = exceptionPolicy;
-			return this;
-		}
-
 		public Formatter build() {
-			return new Formatter(lineEndingsPolicy, encoding, steps,
-					exceptionPolicy == null ? FormatExceptionPolicy.failOnlyOnError() : exceptionPolicy);
+			return new Formatter(lineEndingsPolicy, encoding, steps);
 		}
 	}
 
@@ -157,9 +142,12 @@ public String compute(String unix, File file) {
 					unix = LineEnding.toUnix(formatted);
 				}
 			} catch (Throwable e) {
-				// TODO: this is not accurate, but it won't matter when add support for linting
-				String relativePath = file.toString();
-				exceptionPolicy.handleError(e, step, relativePath);
+				// TODO: this is bad, but it won't matter when add support for linting
+				if (e instanceof RuntimeException) {
+					throw (RuntimeException) e;
+				} else {
+					throw new RuntimeException(e);
+				}
 			}
 		}
 		return unix;
@@ -172,7 +160,6 @@ public int hashCode() {
 		result = prime * result + encoding.hashCode();
 		result = prime * result + lineEndingsPolicy.hashCode();
 		result = prime * result + steps.hashCode();
-		result = prime * result + exceptionPolicy.hashCode();
 		return result;
 	}
 
@@ -190,8 +177,7 @@ public boolean equals(Object obj) {
 		Formatter other = (Formatter) obj;
 		return encoding.equals(other.encoding) &&
 				lineEndingsPolicy.equals(other.lineEndingsPolicy) &&
-				steps.equals(other.steps) &&
-				exceptionPolicy.equals(other.exceptionPolicy);
+				steps.equals(other.steps);
 	}
 
 	@SuppressWarnings("rawtypes")

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

@@ -178,7 +178,6 @@ Formatter buildFormatter() {
 				.lineEndingsPolicy(getLineEndingsPolicy().get())
 				.encoding(Charset.forName(encoding))
 				.steps(steps)
-				.exceptionPolicy(exceptionPolicy)
 				.build();
 	}
 }

plugin-maven/src/main/java/com/diffplug/spotless/maven/FormatterFactory.java

@@ -32,7 +32,6 @@
 import org.apache.maven.project.MavenProject;
 
 import com.diffplug.common.collect.Sets;
-import com.diffplug.spotless.FormatExceptionPolicyStrict;
 import com.diffplug.spotless.Formatter;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.LineEnding;
@@ -103,7 +102,6 @@ public final Formatter newFormatter(Supplier<Iterable<File>> filesToFormat, Form
 		return Formatter.builder()
 				.encoding(formatterEncoding)
 				.lineEndingsPolicy(formatterLineEndingPolicy)
-				.exceptionPolicy(new FormatExceptionPolicyStrict())
 				.steps(formatterSteps)
 				.build();
 	}

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

@@ -54,7 +54,6 @@ public static StepHarness forStepNoRoundtrip(FormatterStep step) {
 				.steps(Arrays.asList(step))
 				.lineEndingsPolicy(LineEnding.UNIX.createPolicy())
 				.encoding(StandardCharsets.UTF_8)
-				.exceptionPolicy(new FormatExceptionPolicyStrict())
 				.build(), RoundTrip.DONT_ROUNDTRIP);
 	}
 

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

@@ -40,7 +40,6 @@ public static StepHarnessWithFile forStep(ResourceHarness harness, FormatterStep
 				.encoding(StandardCharsets.UTF_8)
 				.lineEndingsPolicy(LineEnding.UNIX.createPolicy())
 				.steps(Collections.singletonList(step))
-				.exceptionPolicy(new FormatExceptionPolicyStrict())
 				.build());
 	}
 

testlib/src/test/java/com/diffplug/spotless/FormatterTest.java

@@ -21,7 +21,6 @@
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -30,7 +29,6 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
-import com.diffplug.common.base.StandardSystemProperty;
 import com.diffplug.spotless.generic.EndWithNewlineStep;
 
 class FormatterTest {
@@ -79,9 +77,6 @@ protected Formatter create() {
 	public void testExceptionWithSentinelNoFileOnDisk() throws Exception {
 		LineEnding.Policy lineEndingsPolicy = LineEnding.UNIX.createPolicy();
 		Charset encoding = StandardCharsets.UTF_8;
-		FormatExceptionPolicy exceptionPolicy = FormatExceptionPolicy.failOnlyOnError();
-
-		Path rootDir = Paths.get(StandardSystemProperty.USER_DIR.value());
 
 		FormatterStep step = Mockito.mock(FormatterStep.class);
 		Mockito.when(step.getName()).thenReturn("someFailingStep");
@@ -92,7 +87,6 @@ public void testExceptionWithSentinelNoFileOnDisk() throws Exception {
 				.lineEndingsPolicy(lineEndingsPolicy)
 				.encoding(encoding)
 				.steps(steps)
-				.exceptionPolicy(exceptionPolicy)
 				.build();
 
 		formatter.compute("someFileContent", Formatter.NO_FILE_SENTINEL);
@@ -103,7 +97,6 @@ public void testExceptionWithSentinelNoFileOnDisk() throws Exception {
 	public void testExceptionWithRootDirIsNotFileSystem() throws Exception {
 		LineEnding.Policy lineEndingsPolicy = LineEnding.UNIX.createPolicy();
 		Charset encoding = StandardCharsets.UTF_8;
-		FormatExceptionPolicy exceptionPolicy = FormatExceptionPolicy.failOnlyOnError();
 
 		Path rootDir = Mockito.mock(Path.class);
 		FileSystem customFileSystem = Mockito.mock(FileSystem.class);
@@ -131,7 +124,6 @@ public void testExceptionWithRootDirIsNotFileSystem() throws Exception {
 				.lineEndingsPolicy(lineEndingsPolicy)
 				.encoding(encoding)
 				.steps(steps)
-				.exceptionPolicy(exceptionPolicy)
 				.build();
 
 		formatter.compute("someFileContent", new File("/some/folder/some.file"));