Skip to content

Disabled faulty empty element format preservation from POM operator #478

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

Closed
andrecsilva wants to merge 1 commit into from
Closed

Disabled faulty empty element format preservation from POM operator #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 15 additions & 15 deletions ...modder-plugin-maven/src/main/java/io/codemodder/plugins/maven/operator/FormatCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,21 +508,21 @@ private byte[] serializePomFile(POMDocument pom) throws XMLStreamException {

int lastIndex = 0;

singleElementsWithAttributes.sort(
Comparator.comparingInt(matchDataJ -> matchDataJ.getRange().getFirst()));

for (MatchData match : singleElementsWithAttributes) {
MatchResult representationMatch =
match.getModifiedContent().find(xmlRepresentation, lastIndex);

if (null == representationMatch) {
LOGGER.warn("Failure on quoting: {}", match);
} else {
xmlRepresentation =
replaceRange(xmlRepresentation, representationMatch.getRange(), match.getContent());
lastIndex = representationMatch.getRange().getFirst() + match.getContent().length();
}
}
// singleElementsWithAttributes.sort(
// Comparator.comparingInt(matchDataJ -> matchDataJ.getRange().getFirst()));

// for (MatchData match : singleElementsWithAttributes) {
// MatchResult representationMatch =
// match.getModifiedContent().find(xmlRepresentation, lastIndex);

// if (null == representationMatch) {
// LOGGER.warn("Failure on quoting: {}", match);
// } else {
// xmlRepresentation =
// replaceRange(xmlRepresentation, representationMatch.getRange(), match.getContent());
// lastIndex = representationMatch.getRange().getFirst() + match.getContent().length();
// }
// }

/**
* We might need to replace the beginning of the POM with the same content from the very
Expand Down
2 changes: 2 additions & 0 deletions ...dder-plugin-maven/src/test/java/io/codemodder/plugins/maven/operator/POMOperatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import org.dom4j.Document;
import org.dom4j.DocumentException;
import org.hamcrest.MatcherAssert;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -589,6 +590,7 @@ void modify_adds_dependency_to_file_with_tabs()
* validates the resulting POM structure.
*/
@Test
@Disabled
void modify_adds_dependency_to_pom_with_empty_elements_from_customer() throws Exception {
Dependency dependencyToUpgrade =
new Dependency("io.github.pixee", "java-security-toolkit", "1.0.2", null, null, null);
Expand Down
Loading