Small fixes

Author: blacelle

plugin-maven/README.md

@@ -768,9 +768,8 @@ for details.
 ```xml
 <configuration>
   <yaml>
-    <includes>   <!-- These are the default includes -->
-      <include>**/*.yaml</include>
-      <include>**/*.yml</include>
+    <includes>     <!-- You have to set the target manually -->
+      <include>src/**/*.yaml</include>
     </includes>
 
     <jackson />    <!-- has its own section below -->
@@ -785,11 +784,11 @@ Uses Jackson and YAMLFactory to pretty print objects:
 ```xml
 <jackson>
   <version>2.13.4</version>    <!-- optional: The version of 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml' to be used -->
-  <enabledFeatures>    <!-- optional: Customize the set of enabled features -->
+  <enabledFeatures>            <!-- optional: Customize the set of enabled features -->
     <enabledFeature>INDENT_OUTPUT<enabledFeature/>
   </enabledFeatures>
-  <disabledFeatures>    <!-- optional: Customize the set of disabled features -->
-    <disabledFeature>DEFAULT_HAS_TO_DISABLED_FEATURE<disabledFeature/>
+  <disabledFeatures>           <!-- optional: Customize the set of disabled features -->
+    <disabledFeature>DEFAULT_HAS_NO_DISABLED_FEATURE<disabledFeature/>
   </disabledFeatures>
 </jackson>
 ```

plugin-maven/src/main/java/com/diffplug/spotless/maven/AbstractSpotlessMojo.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 DiffPlug
+ * Copyright 2016-2023 DiffPlug
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -64,13 +64,15 @@
 import com.diffplug.spotless.maven.incremental.UpToDateChecker;
 import com.diffplug.spotless.maven.incremental.UpToDateChecking;
 import com.diffplug.spotless.maven.java.Java;
+import com.diffplug.spotless.maven.json.Json;
 import com.diffplug.spotless.maven.kotlin.Kotlin;
 import com.diffplug.spotless.maven.markdown.Markdown;
 import com.diffplug.spotless.maven.pom.Pom;
 import com.diffplug.spotless.maven.python.Python;
 import com.diffplug.spotless.maven.scala.Scala;
 import com.diffplug.spotless.maven.sql.Sql;
 import com.diffplug.spotless.maven.typescript.Typescript;
+import com.diffplug.spotless.maven.yaml.Yaml;
 
 public abstract class AbstractSpotlessMojo extends AbstractMojo {
 	private static final String DEFAULT_INDEX_FILE_NAME = "spotless-index";
@@ -167,6 +169,12 @@ public abstract class AbstractSpotlessMojo extends AbstractMojo {
 	@Parameter
 	private Markdown markdown;
 
+	@Parameter
+	private Json json;
+
+	@Parameter
+	private Yaml yaml;
+
 	@Parameter(property = "spotlessFiles")
 	private String filePatterns;
 
@@ -331,7 +339,7 @@ private FileLocator getFileLocator() {
 	}
 
 	private List<FormatterFactory> getFormatterFactories() {
-		return Stream.concat(formats.stream(), Stream.of(groovy, java, scala, kotlin, cpp, typescript, antlr4, pom, sql, python, markdown))
+		return Stream.concat(formats.stream(), Stream.of(groovy, java, scala, kotlin, cpp, typescript, antlr4, pom, sql, python, markdown, json, yaml))
 				.filter(Objects::nonNull)
 				.collect(toList());
 	}

plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/JacksonYaml.java renamed to plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Jackson.java

@@ -25,7 +25,7 @@
 import com.diffplug.spotless.maven.FormatterStepFactory;
 import com.diffplug.spotless.yaml.YamlJacksonStep;
 
-public class JacksonYaml implements FormatterStepFactory {
+public class Jackson implements FormatterStepFactory {
 
 	@Parameter
 	private String version = YamlJacksonStep.defaultVersion();

plugin-maven/src/main/java/com/diffplug/spotless/maven/yaml/Yaml.java

@@ -15,9 +15,9 @@
  */
 package com.diffplug.spotless.maven.yaml;
 
+import java.util.Collections;
 import java.util.Set;
 
-import com.diffplug.common.collect.Sets;
 import com.diffplug.spotless.maven.FormatterFactory;
 
 /**
@@ -26,15 +26,15 @@
 public class Yaml extends FormatterFactory {
 	@Override
 	public Set<String> defaultIncludes() {
-		return Sets.newHashSet("**/*.yaml", "**/*.yml");
+		return Collections.emptySet();
 	}
 
 	@Override
 	public String licenseHeaderDelimiter() {
 		return null;
 	}
 
-	public void addJackson(JacksonYaml jackson) {
+	public void addJackson(Jackson jackson) {
 		addStepFactory(jackson);
 	}
 

plugin-maven/src/test/java/com/diffplug/spotless/maven/MavenIntegrationHarness.java

@@ -161,7 +161,7 @@ protected void writePomWithJsonSteps(String... steps) throws IOException {
 	}
 
 	protected void writePomWithYamlSteps(String... steps) throws IOException {
-		writePom(groupWithSteps("yaml", steps));
+		writePom(groupWithSteps("yaml", including("**/*.yaml"), steps));
 	}
 
 	protected void writePom(String... configuration) throws IOException {

plugin-maven/src/test/java/com/diffplug/spotless/maven/json/JsonTest.java

@@ -22,7 +22,7 @@
 public class JsonTest extends MavenIntegrationHarness {
 	@Test
 	public void testFormatJson_WithSimple_defaultConfig() throws Exception {
-		writePomWithJsonSteps("<json><simple/></json>");
+		writePomWithJsonSteps("<simple/>");
 
 		setFile("json_test.json").toResource("json/sortByKeysBefore.json");
 		mavenRunner().withArguments("spotless:apply").runNoError().error();
@@ -31,7 +31,7 @@ public void testFormatJson_WithSimple_defaultConfig() throws Exception {
 
 	@Test
 	public void testFormatJson_WithGson_defaultConfig() throws Exception {
-		writePomWithJsonSteps("<json><gson/></json>");
+		writePomWithJsonSteps("<gson/>");
 
 		setFile("json_test.json").toResource("json/sortByKeysBefore.json");
 		mavenRunner().withArguments("spotless:apply").runNoError().error();

plugin-maven/src/test/java/com/diffplug/spotless/maven/yaml/YamlTest.java

@@ -22,28 +22,28 @@
 public class YamlTest extends MavenIntegrationHarness {
 	@Test
 	public void testFormatYaml_WithJackson_defaultConfig_separatorComments() throws Exception {
-		writePomWithJsonSteps("<yaml><jackson/></yaml>");
+		writePomWithYamlSteps("<jackson/>");
 
-		setFile("yaml_test.json").toResource("yaml/separator_comments.yaml");
+		setFile("yaml_test.yaml").toResource("yaml/separator_comments.yaml");
 		mavenRunner().withArguments("spotless:apply").runNoError().error();
-		assertFile("yaml_test.json").sameAsResource("yaml/separator_comments.clean.yaml");
+		assertFile("yaml_test.yaml").sameAsResource("yaml/separator_comments.clean.yaml");
 	}
 
 	@Test
 	public void testFormatYaml_WithJackson_defaultConfig_arrayBrackets() throws Exception {
-		writePomWithJsonSteps("<yaml><jackson/></yaml>");
+		writePomWithYamlSteps("<jackson/>");
 
-		setFile("yaml_test.json").toResource("yaml/array_with_bracket.yaml");
+		setFile("yaml_test.yaml").toResource("yaml/array_with_bracket.yaml");
 		mavenRunner().withArguments("spotless:apply").runNoError().error();
-		assertFile("yaml_test.json").sameAsResource("yaml/array_with_bracket.clean.yaml");
+		assertFile("yaml_test.yaml").sameAsResource("yaml/array_with_bracket.clean.yaml");
 	}
 
 	@Test
-	public void testFormatYaml_WithJackson_defaultConfig_multipleComments() throws Exception {
-		writePomWithJsonSteps("<yaml><jackson/></yaml>");
+	public void testFormatYaml_WithJackson_defaultConfig_multipleDocuments() throws Exception {
+		writePomWithYamlSteps("<jackson/>");
 
-		setFile("yaml_test.json").toResource("yaml/multiple_documents.yaml");
+		setFile("yaml_test.yaml").toResource("yaml/multiple_documents.yaml");
 		mavenRunner().withArguments("spotless:apply").runNoError().error();
-		assertFile("yaml_test.json").sameAsResource("yaml/multiple_documents.clean.yaml");
+		assertFile("yaml_test.yaml").sameAsResource("yaml/multiple_documents.clean.yaml");
 	}
 }

testlib/src/main/resources/yaml/multiple_document.clean.yaml

@@ -0,0 +1,8 @@
+document: this is document 1
+---
+
+document: this is document 2
+
+---
+
+document: this is document 3