Enforce the configFile consistently.

diffplug · Feb 9, 2021 · 6d9bcef · 6d9bcef
1 parent 8793da2
commit 6d9bcef
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 36 deletions.
diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinExtension.java
@@ -15,10 +15,8 @@
  */
 package com.diffplug.gradle.spotless;
 
-import static com.diffplug.spotless.FileSignature.signAsList;
 import static com.diffplug.spotless.kotlin.KotlinConstants.LICENSE_HEADER_DELIMITER;
 
-import java.io.File;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Map;
@@ -130,7 +128,7 @@ private FormatterStep createStep() {
 	/** Adds the specified version of [diktat](https://github.com/cqfn/diKTat). */
 	public DiktatFormatExtension diktat(String version) {
 		Objects.requireNonNull(version);
-		return new DiktatFormatExtension(version, null);
+		return new DiktatFormatExtension(version);
 	}
 
 	public DiktatFormatExtension diktat() {
@@ -142,16 +140,20 @@ public class DiktatFormatExtension {
 		private final String version;
 		private FileSignature config;
 
-		DiktatFormatExtension(String version, FileSignature config) {
+		DiktatFormatExtension(String version) {
 			this.version = version;
-			this.config = config;
 			addStep(createStep());
 		}
 
-		public void withConfig(String path) throws IOException {
+		public DiktatFormatExtension configFile(Object file) throws IOException {
 			// Specify the path to the configuration file
-			this.config = signAsList(new File(path));
+			if (file == null) {
+				this.config = null;
+			} else {
+				this.config = FileSignature.signAsList(getProject().file(file));
+			}
 			replaceStep(createStep());
+			return this;
 		}
 
 		private FormatterStep createStep() {

diff --git a/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java b/plugin-gradle/src/main/java/com/diffplug/gradle/spotless/KotlinGradleExtension.java
@@ -15,9 +15,6 @@
  */
 package com.diffplug.gradle.spotless;
 
-import static com.diffplug.spotless.FileSignature.signAsList;
-
-import java.io.File;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.Map;
@@ -113,7 +110,7 @@ private FormatterStep createStep() {
 	/** Adds the specified version of [diktat](https://github.com/cqfn/diKTat). */
 	public DiktatFormatExtension diktat(String version) {
 		Objects.requireNonNull(version, "version");
-		return new DiktatFormatExtension(version, null);
+		return new DiktatFormatExtension(version);
 	}
 
 	public DiktatFormatExtension diktat() {
@@ -125,16 +122,20 @@ public class DiktatFormatExtension {
 		private final String version;
 		private FileSignature config;
 
-		DiktatFormatExtension(String version, FileSignature config) {
+		DiktatFormatExtension(String version) {
 			this.version = version;
-			this.config = config;
 			addStep(createStep());
 		}
 
-		public void withConfig(String path) throws IOException {
+		public DiktatFormatExtension configFile(Object file) throws IOException {
 			// Specify the path to the configuration file
-			this.config = signAsList(new File(path));
+			if (file == null) {
+				this.config = null;
+			} else {
+				this.config = FileSignature.signAsList(getProject().file(file));
+			}
 			replaceStep(createStep());
+			return this;
 		}
 
 		private FormatterStep createStep() {

diff --git a/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Diktat.java b/plugin-maven/src/main/java/com/diffplug/spotless/maven/kotlin/Diktat.java
@@ -15,16 +15,13 @@
  */
 package com.diffplug.spotless.maven.kotlin;
 
-import static com.diffplug.spotless.FileSignature.signAsList;
-
-import java.io.File;
-import java.io.IOException;
 import java.util.Collections;
 
 import org.apache.maven.plugins.annotations.Parameter;
 
 import com.diffplug.spotless.FileSignature;
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.ThrowingEx;
 import com.diffplug.spotless.kotlin.DiktatStep;
 import com.diffplug.spotless.maven.FormatterStepConfig;
 import com.diffplug.spotless.maven.FormatterStepFactory;
@@ -35,25 +32,15 @@ public class Diktat implements FormatterStepFactory {
 	private String version;
 
 	@Parameter
-	private String configPath;
+	private String configFile;
 
 	@Override
-	public FormatterStep newFormatterStep(FormatterStepConfig config) {
-		String diktatConfigPath = configPath != null ? configPath : null;
-		FileSignature configFile = getConfigFile(diktatConfigPath);
-		String diktatVersion = version != null ? version : DiktatStep.defaultVersionDiktat();
-		return DiktatStep.create(diktatVersion, config.getProvisioner(), Collections.emptyMap(), configFile);
-	}
-
-	private FileSignature getConfigFile(String path) {
-		if (path != null) {
-			try {
-				return signAsList(new File(path));
-			} catch (IOException e) {
-				e.printStackTrace();
-			}
+	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
+		FileSignature config = null;
+		if (configFile != null) {
+			config = ThrowingEx.get(() -> FileSignature.signAsList(stepConfig.getFileLocator().locateFile(configFile)));
 		}
-		return null;
+		String diktatVersion = version != null ? version : DiktatStep.defaultVersionDiktat();
+		return DiktatStep.create(diktatVersion, stepConfig.getProvisioner(), Collections.emptyMap(), config);
 	}
-
 }