Use SpotlessTaskService.init to consolidate configuration-avoidance fixups.

Author: nedtwigg

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

@@ -770,8 +770,7 @@ public SpotlessApply createIndependentApplyTask(String taskName) {
 		spotlessTask.mustRunAfter(clean);
 		// create the apply task
 		SpotlessApply applyTask = spotless.project.getTasks().create(taskName, SpotlessApply.class);
-		applyTask.getSpotlessOutDirectory().set(spotlessTask.getOutputDirectory());
-		applyTask.getTaskService().set(spotless.getTaskService());
+		applyTask.init(spotlessTask);
 		applyTask.dependsOn(spotlessTask);
 
 		return applyTask;

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

@@ -97,8 +97,7 @@ protected void createFormatTasks(String name, FormatExtension formatExtension) {
 
 		// create the check and apply control tasks
 		TaskProvider<SpotlessApply> applyTask = tasks.register(taskName + APPLY, SpotlessApply.class, task -> {
-			task.getSpotlessOutDirectory().set(spotlessTask.get().getOutputDirectory());
-			task.getTaskService().set(taskService);
+			task.init(spotlessTask.get());
 			task.setEnabled(!isIdeHook);
 			task.dependsOn(spotlessTask);
 		});
@@ -112,9 +111,8 @@ protected void createFormatTasks(String name, FormatExtension formatExtension) {
 		});
 
 		TaskProvider<SpotlessCheck> checkTask = tasks.register(taskName + CHECK, SpotlessCheck.class, task -> {
-			SpotlessTask source = spotlessTask.get();
-			task.getSpotlessOutDirectory().set(source.getOutputDirectory());
-			task.getTaskService().set(taskService);
+			SpotlessTaskImpl source = spotlessTask.get();
+			task.init(spotlessTask.get());
 			task.getEncoding().set(source.getEncoding());
 			task.setEnabled(!isIdeHook);
 			task.dependsOn(spotlessTask);

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

@@ -62,6 +62,11 @@ static abstract class ClientTask extends DefaultTask {
 		@Inject
 		protected abstract ObjectFactory getConfigCacheWorkaround();
 
+		void init(SpotlessTaskImpl impl) {
+			getSpotlessOutDirectory().set(impl.getOutputDirectory());
+			getTaskService().set(impl.getTaskService());
+		}
+
 		String sourceTaskPath() {
 			String path = getPath();
 			if (this instanceof SpotlessApply) {

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/DiffMessageFormatterTest.java

@@ -67,18 +67,16 @@ private SpotlessTaskImpl createFormatTask(String name) {
 			return task;
 		}
 
-		private SpotlessCheck createCheckTask(String name, SpotlessTask source) {
+		private SpotlessCheck createCheckTask(String name, SpotlessTaskImpl source) {
 			SpotlessCheck task = project.getTasks().create("spotless" + SpotlessPlugin.capitalize(name) + "Check", SpotlessCheck.class);
-			task.getSpotlessOutDirectory().set(source.getOutputDirectory());
-			task.getTaskService().set(taskService);
+			task.init(source);
 			task.getEncoding().set(StandardCharsets.UTF_8.name());
 			return task;
 		}
 
-		private SpotlessApply createApplyTask(String name, SpotlessTask source) {
+		private SpotlessApply createApplyTask(String name, SpotlessTaskImpl source) {
 			SpotlessApply task = project.getTasks().create("spotless" + SpotlessPlugin.capitalize(name) + "Apply", SpotlessApply.class);
-			task.getSpotlessOutDirectory().set(source.getOutputDirectory());
-			task.getTaskService().set(taskService);
+			task.init(source);
 			return task;
 		}
 

plugin-gradle/src/test/java/com/diffplug/gradle/spotless/PaddedCellTaskTest.java

@@ -48,18 +48,18 @@ public BuildServiceParameters.None getParameters() {
 		};
 		File file;
 		File outputFile;
-		SpotlessTaskImpl task;
+		SpotlessTaskImpl source;
 		SpotlessCheck check;
 		SpotlessApply apply;
 
 		Bundle(String name, FormatterFunc function) throws IOException {
 			this.name = name;
 			file = setFile("src/test." + name).toContent("CCC");
 			FormatterStep step = FormatterStep.createNeverUpToDate(name, function);
-			task = createFormatTask(name, step);
-			check = createCheckTask(name, task);
-			apply = createApplyTask(name, task);
-			outputFile = new File(task.getOutputDirectory() + "/src", file.getName());
+			source = createFormatTask(name, step);
+			check = createCheckTask(name, source);
+			apply = createApplyTask(name, source);
+			outputFile = new File(source.getOutputDirectory() + "/src", file.getName());
 		}
 
 		private SpotlessTaskImpl createFormatTask(String name, FormatterStep step) {
@@ -71,18 +71,16 @@ private SpotlessTaskImpl createFormatTask(String name, FormatterStep step) {
 			return task;
 		}
 
-		private SpotlessCheck createCheckTask(String name, SpotlessTask source) {
+		private SpotlessCheck createCheckTask(String name, SpotlessTaskImpl source) {
 			SpotlessCheck task = project.getTasks().create("spotless" + SpotlessPlugin.capitalize(name) + "Check", SpotlessCheck.class);
-			task.getTaskService().set(taskService);
-			task.getSpotlessOutDirectory().set(source.getOutputDirectory());
+			task.init(source);
 			task.getEncoding().set(StandardCharsets.UTF_8.name());
 			return task;
 		}
 
-		private SpotlessApply createApplyTask(String name, SpotlessTask source) {
+		private SpotlessApply createApplyTask(String name, SpotlessTaskImpl source) {
 			SpotlessApply task = project.getTasks().create("spotless" + SpotlessPlugin.capitalize(name) + "Apply", SpotlessApply.class);
-			task.getTaskService().set(taskService);
-			task.getSpotlessOutDirectory().set(source.getOutputDirectory());
+			task.init(source);
 			return task;
 		}
 
@@ -97,21 +95,21 @@ String checkFailureMsg() {
 
 		void diagnose() throws IOException {
 			SpotlessDiagnoseTask diagnose = project.getTasks().create("spotless" + SpotlessPlugin.capitalize(name) + "Diagnose", SpotlessDiagnoseTask.class);
-			diagnose.source = task;
+			diagnose.source = source;
 			diagnose.performAction();
 		}
 
 		void format() throws Exception {
-			Tasks.execute(task);
+			Tasks.execute(source);
 		}
 
 		void apply() throws Exception {
-			Tasks.execute(task);
+			Tasks.execute(source);
 			apply.performAction();
 		}
 
 		void check() throws Exception {
-			Tasks.execute(task);
+			Tasks.execute(source);
 			check.performActionTest();
 		}
 	}