Standardize on 2 * indent as the continuation indent (#414)

* Standardize on 2 * indent as the continuation indent * Fix integration test
Ekryd · Apr 19, 2024 · 1bbe4f4 · 1bbe4f4
1 parent cd9b103
commit 1bbe4f4
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 11 deletions.
diff --git a/maven-plugin/src/it/four-spaces-indent/expected_pom.xml b/maven-plugin/src/it/four-spaces-indent/expected_pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/maven-plugin/src/it/mojo-description/expected_description.txt b/maven-plugin/src/it/mojo-description/expected_description.txt
@@ -73,7 +73,7 @@ sortpom:sort
       User property: sort.indentSchemaLocation
       Should the schema location attribute of project (top level xml element)
       be placed on a new line. The attribute will be indented (2 *
-      nrOfIndentSpace + 1 space) characters.
+      nrOfIndentSpace) characters.
 
     keepBlankLines (Default: true)
       User property: sort.keepBlankLines
@@ -203,7 +203,7 @@ sortpom:verify
       User property: sort.indentSchemaLocation
       Should the schema location attribute of project (top level xml element)
       be placed on a new line. The attribute will be indented (2 *
-      nrOfIndentSpace + 1 space) characters.
+      nrOfIndentSpace) characters.
 
     keepBlankLines (Default: true)
       User property: sort.keepBlankLines

diff --git a/maven-plugin/src/main/java/sortpom/AbstractParentMojo.java b/maven-plugin/src/main/java/sortpom/AbstractParentMojo.java
@@ -69,7 +69,7 @@ abstract class AbstractParentMojo extends AbstractMojo {
 
   /**
    * Should the schema location attribute of project (top level xml element) be placed on a new
-   * line. The attribute will be indented (2 * nrOfIndentSpace + 1 space) characters.
+   * line. The attribute will be indented (2 * nrOfIndentSpace) characters.
    */
   @Parameter(property = "sort.indentSchemaLocation", defaultValue = "false")
   boolean indentSchemaLocation;

diff --git a/sorter/src/main/java/sortpom/output/PatchedXMLWriter.java b/sorter/src/main/java/sortpom/output/PatchedXMLWriter.java
@@ -123,8 +123,9 @@ protected void writeAttribute(Attribute attribute) throws IOException {
       writePrintln();
       writeString(format.getIndent());
       writeString(format.getIndent());
+    } else {
+      writer.write(" ");
     }
-    writer.write(" ");
     writer.write(qualifiedName);
     writer.write("=");
 

diff --git a/sorter/src/test/java/sortpom/sort/IndentationTest.java b/sorter/src/test/java/sortpom/sort/IndentationTest.java
@@ -73,7 +73,7 @@ void indentSchemaLocationShouldAddNewlineAndIndentation(int indent) {
             + lineSeparator
             + indentChars
             + indentChars
-            + " xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd\">"
+            + "xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd\">"
             + lineSeparator
             + indentChars
             + "<Gurka xmlns=\"\"></Gurka>"
@@ -106,7 +106,7 @@ void otherAttributeShouldNotBeIndented() {
             + lineSeparator
             + indentChars
             + indentChars
-            + " xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd\">"
+            + "xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 https://maven.apache.org/maven-v4_0_0.xsd\">"
             + lineSeparator
             + indentChars
             + "<Gurka xmlns=\"\" key=\"value\"></Gurka>"

diff --git a/sorter/src/test/resources/SortModules_expectedSchemaIndent-1.xml b/sorter/src/test/resources/SortModules_expectedSchemaIndent-1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+		xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>sortpom</groupId>
 	<artifactId>sortpom</artifactId>

diff --git a/sorter/src/test/resources/SortModules_expectedSchemaIndent0.xml b/sorter/src/test/resources/SortModules_expectedSchemaIndent0.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 <modelVersion>4.0.0</modelVersion>
 <groupId>sortpom</groupId>
 <artifactId>sortpom</artifactId>

diff --git a/sorter/src/test/resources/SortModules_expectedSchemaIndent1.xml b/sorter/src/test/resources/SortModules_expectedSchemaIndent1.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <modelVersion>4.0.0</modelVersion>
  <groupId>sortpom</groupId>
  <artifactId>sortpom</artifactId>

diff --git a/sorter/src/test/resources/SortModules_expectedSchemaIndent4.xml b/sorter/src/test/resources/SortModules_expectedSchemaIndent4.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>sortpom</groupId>
     <artifactId>sortpom</artifactId>