eslint: adapt maven code to match documentation

Author: simschla

plugin-maven/src/main/java/com/diffplug/spotless/maven/generic/Prettier.java

@@ -61,7 +61,7 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		if (prettierVersion != null && !prettierVersion.isEmpty()) {
 			this.devDependencies = PrettierFormatterStep.defaultDevDependenciesWithPrettier(prettierVersion);
 		} else if (devDependencyProperties != null) {
-			this.devDependencies = dependencyPropertiesAsMap();
+			this.devDependencies = propertiesAsMap(this.devDependencyProperties);
 		}
 
 		// process config file or inline config
@@ -100,20 +100,6 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		return PrettierFormatterStep.create(devDependencies, stepConfig.getProvisioner(), baseDir, buildDir, npmPathResolver, prettierConfig);
 	}
 
-	private boolean moreThanOneNonNull(Object... objects) {
-		return Arrays.stream(objects)
-				.filter(Objects::nonNull)
-				.filter(o -> !(o instanceof String) || !((String) o).isEmpty()) // if it is a string, it should not be empty
-				.count() > 1;
-	}
-
-	private Map<String, String> dependencyPropertiesAsMap() {
-		return this.devDependencyProperties.stringPropertyNames()
-				.stream()
-				.map(name -> new AbstractMap.SimpleEntry<>(name, this.devDependencyProperties.getProperty(name)))
-				.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
-	}
-
 	private static IllegalArgumentException onlyOneConfig() {
 		return new IllegalArgumentException(ERROR_MESSAGE_ONLY_ONE_CONFIG);
 	}

plugin-maven/src/main/java/com/diffplug/spotless/maven/javascript/AbstractEslint.java

@@ -17,6 +17,7 @@
 
 import java.io.File;
 import java.util.Map;
+import java.util.Properties;
 import java.util.TreeMap;
 
 import org.apache.maven.plugins.annotations.Parameter;
@@ -30,6 +31,8 @@
 
 public abstract class AbstractEslint extends AbstractNpmFormatterStepFactory {
 
+	public static final String ERROR_MESSAGE_ONLY_ONE_CONFIG = "must specify exactly one eslintVersion, devDependencies or devDependencyProperties";
+
 	@Parameter
 	protected String configFile;
 
@@ -45,11 +48,21 @@ public abstract class AbstractEslint extends AbstractNpmFormatterStepFactory {
 	@Parameter
 	protected Map<String, String> devDependencies;
 
+	@Parameter
+	protected Properties devDependencyProperties;
+
 	@Override
 	public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
+		// check if config is only setup in one way
+		if (moreThanOneNonNull(this.eslintVersion, this.devDependencies, this.devDependencyProperties)) {
+			throw onlyOneConfig();
+		}
+
 		Map<String, String> devDependencies = new TreeMap<>();
 		if (this.devDependencies != null) {
 			devDependencies.putAll(this.devDependencies);
+		} else if (this.devDependencyProperties != null) {
+			devDependencies.putAll(propertiesAsMap(this.devDependencyProperties));
 		} else {
 			Map<String, String> defaultDependencies = createDefaultDependencies();
 			devDependencies.putAll(defaultDependencies);
@@ -63,6 +76,10 @@ public FormatterStep newFormatterStep(FormatterStepConfig stepConfig) {
 		return EslintFormatterStep.create(devDependencies, stepConfig.getProvisioner(), baseDir, buildDir, npmPathResolver, eslintConfig(stepConfig));
 	}
 
+	private static IllegalArgumentException onlyOneConfig() {
+		return new IllegalArgumentException(ERROR_MESSAGE_ONLY_ONE_CONFIG);
+	}
+
 	protected abstract EslintConfig eslintConfig(FormatterStepConfig stepConfig);
 
 	private void addStyleGuideDevDependencies(Map<String, String> devDependencies) {

plugin-maven/src/main/java/com/diffplug/spotless/maven/npm/AbstractNpmFormatterStepFactory.java

@@ -16,6 +16,12 @@
 package com.diffplug.spotless.maven.npm;
 
 import java.io.File;
+import java.util.AbstractMap;
+import java.util.Arrays;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Properties;
+import java.util.stream.Collectors;
 
 import org.apache.maven.plugins.annotations.Parameter;
 
@@ -52,4 +58,18 @@ protected File baseDir(FormatterStepConfig stepConfig) {
 	protected NpmPathResolver npmPathResolver(FormatterStepConfig stepConfig) {
 		return new NpmPathResolver(npm(stepConfig), npmrc(stepConfig), baseDir(stepConfig));
 	}
+
+	protected boolean moreThanOneNonNull(Object... objects) {
+		return Arrays.stream(objects)
+				.filter(Objects::nonNull)
+				.filter(o -> !(o instanceof String) || !((String) o).isEmpty()) // if it is a string, it should not be empty
+				.count() > 1;
+	}
+
+	protected Map<String, String> propertiesAsMap(Properties devDependencyProperties) {
+		return devDependencyProperties.stringPropertyNames()
+				.stream()
+				.map(name -> new AbstractMap.SimpleEntry<>(name, devDependencyProperties.getProperty(name)))
+				.collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+	}
 }

testlib/src/test/java/com/diffplug/spotless/npm/EslintFormatterStepTest.java

@@ -19,15 +19,14 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-import com.diffplug.spotless.ResourceHarness;
-
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
 
 import com.diffplug.common.collect.ImmutableMap;
 import com.diffplug.spotless.FormatterStep;
+import com.diffplug.spotless.ResourceHarness;
 import com.diffplug.spotless.StepHarnessWithFile;
 import com.diffplug.spotless.TestProvisioner;
 import com.diffplug.spotless.tag.NpmTest;