From 955538f2af2aca108a3467f560d825a17af519e1 Mon Sep 17 00:00:00 2001 From: andrecs <12188364+andrecsilva@users.noreply.github.com> Date: Wed, 27 Nov 2024 08:01:45 -0300 Subject: [PATCH] Disabled faulty empty element format preservation from POM operator --- .../plugins/maven/operator/FormatCommand.java | 30 +++++++++---------- .../maven/operator/POMOperatorTest.java | 2 ++ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/plugins/codemodder-plugin-maven/src/main/java/io/codemodder/plugins/maven/operator/FormatCommand.java b/plugins/codemodder-plugin-maven/src/main/java/io/codemodder/plugins/maven/operator/FormatCommand.java index 511ceebc6..5a375f7cd 100644 --- a/plugins/codemodder-plugin-maven/src/main/java/io/codemodder/plugins/maven/operator/FormatCommand.java +++ b/plugins/codemodder-plugin-maven/src/main/java/io/codemodder/plugins/maven/operator/FormatCommand.java @@ -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 diff --git a/plugins/codemodder-plugin-maven/src/test/java/io/codemodder/plugins/maven/operator/POMOperatorTest.java b/plugins/codemodder-plugin-maven/src/test/java/io/codemodder/plugins/maven/operator/POMOperatorTest.java index a49b90793..d725a4cf9 100644 --- a/plugins/codemodder-plugin-maven/src/test/java/io/codemodder/plugins/maven/operator/POMOperatorTest.java +++ b/plugins/codemodder-plugin-maven/src/test/java/io/codemodder/plugins/maven/operator/POMOperatorTest.java @@ -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; @@ -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);