Skip to content

(fix) Element was inserted at the wrong location #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 26, 2024
Merged

(fix) Element was inserted at the wrong location #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
200ae76
(fix) Element was inserted at the wrong location
murdos Feb 24, 2024
b69a27f
Add minor enhancements
gastaldi Feb 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 8 additions & 12 deletions src/main/java/io/fabric8/maven/MavenJDOMWriter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,12 @@ class MavenJDOMWriter {
/**
* Field factory.
*/
private DefaultJDOMFactory factory;
private final DefaultJDOMFactory factory;

/**
* Field lineSeparator.
*/
private String lineSeparator;
private final String lineSeparator;

// ----------------/
// - Constructors -/
Expand Down Expand Up @@ -175,7 +175,7 @@ protected Element findAndReplaceSimpleElement(Counter counter, Element parent, S
}
}

boolean shouldExist = (text != null) && (text.trim().length() > 0);
boolean shouldExist = (text != null) && (!text.trim().isEmpty());
Element element = updateElement(counter, parent, name, shouldExist);
if (shouldExist) {
element.setText(text);
Expand Down Expand Up @@ -262,7 +262,7 @@ protected void insertAtPreferredLocation(Element parent, Element child, Counter
Iterator it = parent.getContent().iterator();
Text lastText = null;
int offset = 0;
while (it.hasNext() && (elementCounter <= counter.getCurrentIndex())) {
while (it.hasNext() && (elementCounter < counter.getCurrentIndex())) {
Object next = it.next();
offset = offset + 1;
if (next instanceof Element) {
Expand All @@ -274,17 +274,13 @@ protected void insertAtPreferredLocation(Element parent, Element child, Counter
lastText = (Text) next;
}
}
if ((lastText != null) && (lastText.getTextTrim().length() == 0)) {
lastText = (Text) lastText.clone();
if ((lastText != null) && (lastText.getTextTrim().isEmpty())) {
lastText = lastText.clone();
} else {
StringBuilder starter = new StringBuilder(lineSeparator);
for (int i = 0; i < counter.getDepth(); i++) {
starter.append(" ");
}
lastText = factory.text(starter.toString());
lastText = factory.text(lineSeparator + " ".repeat(Math.max(0, counter.getDepth())));
}
if (parent.getContentSize() == 0) {
Text finalText = (Text) lastText.clone();
Text finalText = lastText.clone();
finalText.setText(finalText.getText().substring(0, finalText.getText().length() - " ".length()));
parent.addContent(contentIndex, finalText);
}
Expand Down
24 changes: 24 additions & 0 deletions src/test/java/io/fabric8/maven/MavenTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
import java.util.Collections;
import java.util.Properties;

import org.apache.maven.model.Dependency;
import org.apache.maven.model.Model;
import org.apache.maven.model.Scm;
import org.assertj.core.api.Assertions;
Expand Down Expand Up @@ -147,4 +148,27 @@ void should_write_scm_tag(@TempDir Path tempDir) throws Exception {

}

@Test
void should_respect_insertion_order(@TempDir Path tempDir) throws Exception {
URL resource = getClass().getResource("parent/parent-pom.xml");
Path basePom = Paths.get(resource.toURI());
Model model = Maven.readModel(basePom);

Path updatedPom = tempDir.resolve("updated-pom.xml");
Files.copy(basePom, updatedPom);

Dependency dependency = model.getDependencies().stream().filter(d -> d.getArtifactId().equals("quarkus-junit5-internal")).findFirst().orElseThrow();
dependency.setVersion("1.0.0");
dependency.setOptional("true");
Maven.writeModel(model, updatedPom);

assertThat(Files.readString(updatedPom))
.contains("<dependency>\n" +
" <groupId>io.quarkus</groupId>\n" +
" <artifactId>quarkus-junit5-internal</artifactId>\n" +
" <version>1.0.0</version>\n" +
" <scope>test</scope>\n" +
" <optional>true</optional>\n" +
" </dependency>");
}
}