Consolidate our hydrate exceptions into one place.

Author: nedtwigg

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

@@ -37,6 +37,7 @@
 import org.gradle.work.InputChanges;
 
 import com.diffplug.common.base.StringPrinter;
+import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.Formatter;
 import com.diffplug.spotless.FormatterStep;
 import com.diffplug.spotless.LineEnding;
@@ -68,22 +69,18 @@ public void performAction(InputChanges inputs) throws Exception {
 			Files.createDirectories(outputDirectory.toPath());
 		}
 
-		if (lineEndingsPolicy != null) {
-			try (Formatter formatter = buildFormatter()) {
-				for (FileChange fileChange : inputs.getFileChanges(target)) {
-					File input = fileChange.getFile();
-					if (fileChange.getChangeType() == ChangeType.REMOVED) {
-						deletePreviousResult(input);
-					} else {
-						if (input.isFile()) {
-							processInputFile(formatter, input);
-						}
+		assertHydrated(this);
+		try (Formatter formatter = buildFormatter()) {
+			for (FileChange fileChange : inputs.getFileChanges(target)) {
+				File input = fileChange.getFile();
+				if (fileChange.getChangeType() == ChangeType.REMOVED) {
+					deletePreviousResult(input);
+				} else {
+					if (input.isFile()) {
+						processInputFile(formatter, input);
 					}
 				}
 			}
-		} else {
-			throw new GradleException("Spotless doesn't support configuration cache yet.\n" +
-					"Rerun with --no-configuration-cache");
 		}
 	}
 
@@ -139,6 +136,19 @@ static boolean isHydrated(SpotlessTask task) {
 		return task.lineEndingsPolicy != null;
 	}
 
+	static void assertHydrated(SpotlessTask task) {
+		if (!isHydrated(task)) {
+			throw new GradleException("Spotless doesn't support configuration cache yet.\n" +
+					"Rerun with --no-configuration-cache");
+		}
+	}
+
+	static GradleException cacheIsStale() {
+		return new GradleException("Spotless daemon-local cache is stale. Regenerate the cache with\n" +
+				"  " + (FileSignature.machineIsWin() ? "rmdir /q /s" : "rm -rf") + " .gradle/configuration-cache\n" +
+				"For more information see #123");
+	}
+
 	static class LiveCache {
 		LineEnding.Policy lineEndingsPolicy;
 		List<FormatterStep> steps;

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

@@ -23,7 +23,6 @@
 import javax.inject.Inject;
 
 import org.gradle.api.DefaultTask;
-import org.gradle.api.GradleException;
 import org.gradle.api.Project;
 import org.gradle.api.file.DirectoryProperty;
 import org.gradle.api.model.ObjectFactory;
@@ -36,7 +35,6 @@
 
 import com.diffplug.common.base.Preconditions;
 import com.diffplug.common.base.Unhandled;
-import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.Provisioner;
 
 /**
@@ -68,6 +66,7 @@ void hydrate(SpotlessTask task) {
 
 	private void storeOrHydrate(SpotlessTask task) {
 		if (!enableConfigCacheDaemonLocal) {
+			SpotlessTaskImpl.assertHydrated(task);
 			return;
 		}
 		String cacheKey = task.getProjectDir().getAsFile().get().getAbsolutePath() + ">" + task.getPath();
@@ -76,9 +75,7 @@ private void storeOrHydrate(SpotlessTask task) {
 		} else {
 			SpotlessTaskImpl.LiveCache cached = daemonLocalMap.get(cacheKey);
 			if (cached == null) {
-				throw new GradleException("Spotless daemon-local cache is stale. Regenerate the cache with\n" +
-						"  " + (FileSignature.machineIsWin() ? "rmdir /q /s" : "rm -rf") + " .gradle/configuration-cache\n" +
-						"For more information see #123");
+				throw SpotlessTaskImpl.cacheIsStale();
 			} else {
 				cached.hydrate(task);
 			}