Refactor SpotlessCheck to use that formatter so that we can ditch the clumsy cache.

Author: nedtwigg

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

@@ -18,6 +18,7 @@
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -32,6 +33,7 @@
 
 import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.ThrowingEx;
+import com.diffplug.spotless.extra.integration.DiffMessageFormatter;
 
 public abstract class SpotlessCheck extends SpotlessTaskService.ClientTask {
 	public void performActionTest() throws IOException {
@@ -91,9 +93,14 @@ public void visitFile(FileVisitDetails fileVisitDetails) {
 			});
 			if (!problemFiles.isEmpty()) {
 				Collections.sort(problemFiles);
-				String errMsg = errorMsgForCheck(problemFiles, "Run '" + calculateGradleCommand() + " " + getTaskPathPrefix() + "spotlessApply' to fix these violations.");
-				throw new GradleException(errMsg);
-
+				throw new GradleException(DiffMessageFormatter.builder()
+						.runToFix("Run '" + calculateGradleCommand() + " " + getTaskPathPrefix() + "spotlessApply' to fix these violations.")
+						.formatterFolder(
+								getProject().getRootDir().toPath(),
+								getSpotlessOutDirectory().get().toPath(),
+								StandardCharsets.UTF_8.name())
+						.problemFiles(problemFiles)
+						.getMessage());
 			}
 		}
 	}

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

@@ -16,11 +16,8 @@
 package com.diffplug.gradle.spotless;
 
 import java.io.File;
-import java.io.IOException;
-import java.io.Serializable;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 import org.gradle.api.DefaultTask;
@@ -31,10 +28,6 @@
 
 import com.diffplug.common.base.Preconditions;
 import com.diffplug.common.base.Unhandled;
-import com.diffplug.common.collect.Maps;
-import com.diffplug.spotless.FileSignature;
-import com.diffplug.spotless.Formatter;
-import com.diffplug.spotless.extra.integration.DiffMessageFormatter;
 
 /**
  * Allows the check and apply tasks to coordinate
@@ -47,8 +40,6 @@ public abstract class SpotlessTaskService implements BuildService<BuildServicePa
 	private final Map<String, SpotlessTask> source = Collections.synchronizedMap(new HashMap<>());
 
 	public void registerSourceAlreadyRan(SpotlessTask task) {
-		// if there's a registered source, we can wipe the cache
-		cachePut(task.getOutputDirectory(), null, null);
 		source.put(task.getPath(), task);
 	}
 
@@ -97,50 +88,5 @@ protected boolean sourceDidWork() {
 		protected boolean applyHasRun() {
 			return service().apply.containsKey(sourceTaskPath());
 		}
-
-		protected String errorMsgForCheck(List<File> problemFiles, String runToFix) throws IOException {
-			SpotlessTask task = service().source.get(sourceTaskPath());
-			((SpotlessCheck) this).getSpotlessOutDirectory();
-			if (task != null) {
-				try (Formatter formatter = task.buildFormatter()) {
-					String msg = DiffMessageFormatter.builder()
-							.runToFix(runToFix)
-							.formatter(formatter)
-							.problemFiles(problemFiles)
-							.getMessage();
-					cachePut(FileSignature.signAsList(problemFiles), msg);
-					return msg;
-				}
-			} else {
-				return cacheGet(FileSignature.signAsList(problemFiles));
-			}
-		}
-
-		private void cachePut(FileSignature key, String msg) {
-			SpotlessTaskService.cachePut(getSpotlessOutDirectory().get(), key, msg);
-		}
-
-		private String cacheGet(FileSignature key) {
-			Map.Entry<FileSignature, String> cached = SerializableMisc.fromFile(Map.Entry.class, getCacheFile(getSpotlessOutDirectory().get()));
-			if (cached != null && cached.getKey().equals(key)) {
-				return cached.getValue();
-			} else {
-				throw new IllegalStateException(getPath() + " is running but " + sourceTaskPath() + " was up-to-date and didn't run");
-			}
-		}
-	}
-
-	private static void cachePut(File spotlessOut, FileSignature key, String msg) {
-		File cacheFile = getCacheFile(spotlessOut);
-		if (key == null) {
-			cacheFile.delete();
-		} else {
-			SerializableMisc.toFile((Serializable) Maps.immutableEntry(key, msg), cacheFile);
-		}
-	}
-
-	private static File getCacheFile(File spotlessOut) {
-		File parent = spotlessOut.getParentFile();
-		return new File(parent, spotlessOut.getName() + "-errorMsg");
 	}
 }