Remove all of FormatExceptionPolicy except Strict, which remains for easy API conversion.

Author: nedtwigg

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 DiffPlug
+ * Copyright 2016-2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
  * A policy for handling exceptions in the format.  Any exceptions will
  * halt the build except for a specifically excluded path or step.
  */
-public class FormatExceptionPolicyStrict extends NoLambda.EqualityBasedOnSerialization implements FormatExceptionPolicy {
+public class FormatExceptionPolicyStrict extends NoLambda.EqualityBasedOnSerialization {
 	private static final long serialVersionUID = 1L;
 
 	private final Set<String> excludeSteps = new TreeSet<>();
@@ -39,18 +39,17 @@ public void excludePath(String relativePath) {
 		excludePaths.add(Objects.requireNonNull(relativePath));
 	}
 
-	@Override
 	public void handleError(Throwable e, FormatterStep step, String relativePath) {
 		Objects.requireNonNull(e, "e");
 		Objects.requireNonNull(step, "step");
 		Objects.requireNonNull(relativePath, "relativePath");
 		if (excludeSteps.contains(step.getName())) {
-			FormatExceptionPolicyLegacy.warning(e, step, relativePath);
+			LintPolicy.warning(e, step, relativePath);
 		} else {
 			if (excludePaths.contains(relativePath)) {
-				FormatExceptionPolicyLegacy.warning(e, step, relativePath);
+				LintPolicy.warning(e, step, relativePath);
 			} else {
-				FormatExceptionPolicyLegacy.error(e, step, relativePath);
+				LintPolicy.error(e, step, relativePath);
 				throw ThrowingEx.asRuntimeRethrowError(e);
 			}
 		}

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2024 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,21 +18,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-class FormatExceptionPolicyLegacy extends NoLambda.EqualityBasedOnSerialization implements FormatExceptionPolicy {
-	private static final long serialVersionUID = 1L;
-
+class LintPolicy {
 	private static final Logger logger = LoggerFactory.getLogger(Formatter.class);
 
-	@Override
-	public void handleError(Throwable e, FormatterStep step, String relativePath) {
-		if (e instanceof Error) {
-			error(e, step, relativePath);
-			throw ((Error) e);
-		} else {
-			warning(e, step, relativePath);
-		}
-	}
-
 	static void error(Throwable e, FormatterStep step, String relativePath) {
 		logger.error("Step '{}' found problem in '{}':\n{}", step.getName(), relativePath, e.getMessage(), e);
 	}

lib/src/main/java/com/diffplug/spotless/FormatExceptionPolicyLegacy.java renamed to lib/src/main/java/com/diffplug/spotless/LintPolicy.java

@@ -37,7 +37,6 @@
 import org.gradle.api.tasks.PathSensitivity;
 import org.gradle.work.Incremental;
 
-import com.diffplug.spotless.FormatExceptionPolicy;
 import com.diffplug.spotless.FormatExceptionPolicyStrict;
 import com.diffplug.spotless.Formatter;
 import com.diffplug.spotless.FormatterStep;
@@ -115,14 +114,14 @@ public ObjectId getRatchetSha() {
 		return subtreeSha;
 	}
 
-	protected FormatExceptionPolicy exceptionPolicy = new FormatExceptionPolicyStrict();
+	protected FormatExceptionPolicyStrict exceptionPolicy = new FormatExceptionPolicyStrict();
 
-	public void setExceptionPolicy(FormatExceptionPolicy exceptionPolicy) {
+	public void setExceptionPolicy(FormatExceptionPolicyStrict exceptionPolicy) {
 		this.exceptionPolicy = Objects.requireNonNull(exceptionPolicy);
 	}
 
 	@Input
-	public FormatExceptionPolicy getExceptionPolicy() {
+	public FormatExceptionPolicyStrict getExceptionPolicy() {
 		return exceptionPolicy;
 	}