Remove extra indentation text nodes

When removing an element, extra text nodes may be still left over, this ensures these extra text nodes are removed

Author: gastaldi

src/main/java/io/fabric8/maven/MavenJDOMWriter.java

@@ -12,6 +12,7 @@
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.List;
 import java.util.ListIterator;
 import java.util.Properties;
 
@@ -224,6 +225,7 @@ protected void findAndReplaceSimpleLists(Counter counter, Element parent, Collec
                     elIt.next();
                     elIt.remove();
                 }
+                removeExtraTextNodes(element.getContent());
             }
         }
     }
@@ -321,6 +323,7 @@ protected void iterateContributor(Counter counter, Element parent, Collection<Co
                     elIt.next();
                     elIt.remove();
                 }
+                removeExtraTextNodes(element.getContent());
             }
         }
     }
@@ -360,9 +363,28 @@ protected void iterateDependency(Counter counter, Element parent, Collection<Dep
             }
             if (elIt != null) {
                 while (elIt.hasNext()) {
-                    elIt.next();
+                    Element toRemove = elIt.next();
                     elIt.remove();
                 }
+                removeExtraTextNodes(element.getContent());
+            }
+        }
+    }
+
+    /**
+     * Remove the extra text nodes
+     *
+     * @param content
+     */
+    private void removeExtraTextNodes(List<Content> content) {
+        // We don't want to remove the first or last text node
+        for (int i = content.size() - 2; i > 0; i--) {
+            Content current = content.get(i);
+            if (current instanceof Text) {
+                content.remove(i);
+            } else {
+                // If the current element is not a text node, we can stop
+                break;
             }
         }
     }
@@ -405,6 +427,7 @@ protected void iterateDeveloper(Counter counter, Element parent, Collection<Deve
                     elIt.next();
                     elIt.remove();
                 }
+                removeExtraTextNodes(element.getContent());
             }
         }
     }
@@ -447,6 +470,7 @@ protected void iterateExclusion(Counter counter, Element parent, Collection<Excl
                     elIt.next();
                     elIt.remove();
                 }
+                removeExtraTextNodes(element.getContent());
             }
         }
     }
@@ -489,6 +513,7 @@ protected void iterateExtension(Counter counter, Element parent, Collection<Exte
                     elIt.next();
                     elIt.remove();
                 }
+                removeExtraTextNodes(element.getContent());
             }
         }
     }
@@ -531,6 +556,7 @@ protected void iterateLicense(Counter counter, Element parent, Collection<Licens
                     elIt.next();
                     elIt.remove();
                 }
+                removeExtraTextNodes(element.getContent());
             }
         }
     }
@@ -573,6 +599,7 @@ protected void iterateMailingList(Counter counter, Element parent, Collection<Ma
                     elIt.next();
                     elIt.remove();
                 }
+                removeExtraTextNodes(element.getContent());
             }
         }
     }
@@ -615,6 +642,7 @@ protected void iterateNotifier(Counter counter, Element parent, Collection<Notif
                     elIt.next();
                     elIt.remove();
                 }
+                removeExtraTextNodes(element.getContent());
             }
         }
     }
@@ -657,6 +685,7 @@ protected void iteratePlugin(Counter counter, Element parent, Collection<Plugin>
                     elIt.next();
                     elIt.remove();
                 }
+                removeExtraTextNodes(element.getContent());
             }
         }
     }
@@ -699,6 +728,7 @@ protected void iteratePluginExecution(Counter counter, Element parent, Collectio
                     elIt.next();
                     elIt.remove();
                 }
+                removeExtraTextNodes(element.getContent());
             }
         }
     }
@@ -741,6 +771,7 @@ protected void iterateProfile(Counter counter, Element parent, Collection<Profil
                     elIt.next();
                     elIt.remove();
                 }
+                removeExtraTextNodes(element.getContent());
             }
         }
     }
@@ -783,6 +814,7 @@ protected void iterateReportPlugin(Counter counter, Element parent, Collection<R
                     elIt.next();
                     elIt.remove();
                 }
+                removeExtraTextNodes(element.getContent());
             }
         }
     }
@@ -825,6 +857,7 @@ protected void iterateReportSet(Counter counter, Element parent, Collection<Repo
                     elIt.next();
                     elIt.remove();
                 }
+                removeExtraTextNodes(element.getContent());
             }
         }
     }
@@ -870,6 +903,7 @@ protected void iterateRepository(Counter counter, Element parent, Collection<Rep
                     elIt.next();
                     elIt.remove();
                 }
+                removeExtraTextNodes(element.getContent());
             }
         }
     }
@@ -915,6 +949,7 @@ protected void iterateResource(Counter counter, Element parent, Collection<Resou
                     elIt.next();
                     elIt.remove();
                 }
+                removeExtraTextNodes(element.getContent());
             }
         }
     }

src/test/approvals/io/fabric8/maven/MavenTest.should_not_add_extra_line_break.approved.txt

@@ -15,29 +15,11 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.springdoc</groupId>
-                <artifactId>springdoc-openapi-ui</artifactId>
-                <version>${springdoc-openapi.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
                 <version>${spring-boot.version}</version>
-                <scope>import</scope>
                 <type>pom</type>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-dependencies</artifactId>
-                <version>${spring-boot.version}</version>
                 <scope>import</scope>
             </dependency>
         </dependencies>

src/test/java/io/fabric8/maven/MavenTest.java

@@ -17,7 +17,6 @@
 import java.util.stream.IntStream;
 
 import org.apache.maven.model.Dependency;
-import org.apache.maven.model.DependencyManagement;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.Scm;
 import org.approvaltests.Approvals;
@@ -338,25 +337,9 @@ void should_write_attributes() throws Exception {
     void should_not_add_extra_line_break() throws Exception {
         Path pom = Paths.get(getClass().getResource("extra-line-pom.xml").toURI());
         Model model = Maven.readModel(pom);
-        DependencyManagement dependencyManagement = model.getDependencyManagement();
-        Dependency dep = new Dependency();
-        dep.setGroupId("org.springframework.boot");
-        dep.setArtifactId("spring-boot-dependencies");
-        dep.setVersion("${spring-boot.version}");
-        dep.setScope("import");
-        dep.setType("pom");
-        dependencyManagement.addDependency(dep);
-
-        Dependency dep2 = new Dependency();
-        dep2.setGroupId("org.springframework.boot");
-        dep2.setArtifactId("spring-boot-dependencies");
-        dep2.setVersion("${spring-boot.version}");
-        dep2.setScope("import");
-        dependencyManagement.addDependency(dep2);
-
+        model.getDependencyManagement().getDependencies().remove(0);
         StringWriter sw = new StringWriter();
         Maven.writeModel(model, sw);
         Approvals.verify(sw.toString());
     }
-
 }