Skip to content

Bump domtripVersion from 0.4.1 to 0.6.0 #11784

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
gnodet wants to merge 1 commit into from
Closed

Bump domtripVersion from 0.4.1 to 0.6.0 #11784

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
2 changes: 1 addition & 1 deletion ...cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/AbstractUpgradeStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public static Coordinates extractArtifactCoordinatesWithParentResolution(

// If groupId or version is missing, try to get from parent
if (groupId == null || version == null) {
Element parentElement = root.child(PARENT).orElse(null);
Element parentElement = root.childElement(PARENT).orElse(null);
if (parentElement != null) {
if (groupId == null) {
groupId = parentElement.childTextTrimmed(MavenPomElements.Elements.GROUP_ID);
Expand Down
65 changes: 37 additions & 28 deletions ...li/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/CompatibilityFixStrategy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,22 +205,25 @@ private boolean fixDuplicateDependencies(Document pomDocument, UpgradeContext co
Stream<DependencyContainer> dependencyContainers = Stream.concat(
// Root level dependencies
Stream.of(
new DependencyContainer(root.child(DEPENDENCIES).orElse(null), DEPENDENCIES),
new DependencyContainer(
root.child(DEPENDENCY_MANAGEMENT)
.flatMap(dm -> dm.child(DEPENDENCIES))
root.childElement(DEPENDENCIES).orElse(null), DEPENDENCIES),
new DependencyContainer(
root.childElement(DEPENDENCY_MANAGEMENT)
.flatMap(dm -> dm.childElement(DEPENDENCIES))
.orElse(null),
DEPENDENCY_MANAGEMENT))
.filter(container -> container.element != null),
// Profile dependencies
root.child(PROFILES).stream()
.flatMap(profiles -> profiles.children(PROFILE))
root.childElement(PROFILES).stream()
.flatMap(profiles -> profiles.childElements(PROFILE))
.flatMap(profile -> Stream.of(
new DependencyContainer(
profile.child(DEPENDENCIES).orElse(null), "profile dependencies"),
profile.childElement(DEPENDENCIES)
.orElse(null),
"profile dependencies"),
new DependencyContainer(
profile.child(DEPENDENCY_MANAGEMENT)
.flatMap(dm -> dm.child(DEPENDENCIES))
profile.childElement(DEPENDENCY_MANAGEMENT)
.flatMap(dm -> dm.childElement(DEPENDENCIES))
.orElse(null),
"profile dependencyManagement"))
.filter(container -> container.element != null)));
Expand Down Expand Up @@ -249,12 +252,13 @@ private boolean fixDuplicatePlugins(Document pomDocument, UpgradeContext context
// Collect all build elements to process
Stream<BuildContainer> buildContainers = Stream.concat(
// Root level build
Stream.of(new BuildContainer(root.child(BUILD).orElse(null), BUILD))
Stream.of(new BuildContainer(root.childElement(BUILD).orElse(null), BUILD))
.filter(container -> container.element != null),
// Profile builds
root.child(PROFILES).stream()
.flatMap(profiles -> profiles.children(PROFILE))
.map(profile -> new BuildContainer(profile.child(BUILD).orElse(null), "profile build"))
root.childElement(PROFILES).stream()
.flatMap(profiles -> profiles.childElements(PROFILE))
.map(profile ->
new BuildContainer(profile.childElement(BUILD).orElse(null), "profile build"))
.filter(container -> container.element != null));

return buildContainers
Expand Down Expand Up @@ -282,15 +286,16 @@ private boolean fixUnsupportedRepositoryExpressions(Document pomDocument, Upgrad
Stream<Element> repositoryContainers = Stream.concat(
// Root level repositories
Stream.of(
root.child(REPOSITORIES).orElse(null),
root.child(PLUGIN_REPOSITORIES).orElse(null))
root.childElement(REPOSITORIES).orElse(null),
root.childElement(PLUGIN_REPOSITORIES).orElse(null))
.filter(Objects::nonNull),
// Profile repositories
root.child(PROFILES).stream()
.flatMap(profiles -> profiles.children(PROFILE))
root.childElement(PROFILES).stream()
.flatMap(profiles -> profiles.childElements(PROFILE))
.flatMap(profile -> Stream.of(
profile.child(REPOSITORIES).orElse(null),
profile.child(PLUGIN_REPOSITORIES).orElse(null))
profile.childElement(REPOSITORIES).orElse(null),
profile.childElement(PLUGIN_REPOSITORIES)
.orElse(null))
.filter(Objects::nonNull)));

return repositoryContainers
Expand All @@ -305,12 +310,12 @@ private boolean fixIncorrectParentRelativePaths(
Document pomDocument, Path pomPath, Map<Path, Document> pomMap, UpgradeContext context) {
Element root = pomDocument.root();

Element parentElement = root.child(PARENT).orElse(null);
Element parentElement = root.childElement(PARENT).orElse(null);
if (parentElement == null) {
return false; // No parent to fix
}

Element relativePathElement = parentElement.child(RELATIVE_PATH).orElse(null);
Element relativePathElement = parentElement.childElement(RELATIVE_PATH).orElse(null);
String currentRelativePath =
relativePathElement != null ? relativePathElement.textContent().trim() : DEFAULT_PARENT_RELATIVE_PATH;

Expand Down Expand Up @@ -351,15 +356,17 @@ private Stream<Element> findElementsWithAttribute(Element element, String attrib
return attr != null && attributeValue.equals(attr);
}),
// Recursively check children
element.children().flatMap(child -> findElementsWithAttribute(child, attributeName, attributeValue)));
element.childElements()
.flatMap(child -> findElementsWithAttribute(child, attributeName, attributeValue)));
}

/**
* Helper methods extracted from BaseUpgradeGoal for compatibility fixes.
*/
private boolean fixDuplicateDependenciesInSection(
Element dependenciesElement, UpgradeContext context, String sectionName) {
List<Element> dependencies = dependenciesElement.children(DEPENDENCY).toList();
List<Element> dependencies =
dependenciesElement.childElements(DEPENDENCY).toList();
Map<String, Element> seenDependencies = new HashMap<>();

List<Element> duplicates = dependencies.stream()
Expand Down Expand Up @@ -394,15 +401,16 @@ private String createDependencyKey(Element dependency) {
private boolean fixPluginsInBuildElement(Element buildElement, UpgradeContext context, String sectionName) {
boolean fixed = false;

Element pluginsElement = buildElement.child(PLUGINS).orElse(null);
Element pluginsElement = buildElement.childElement(PLUGINS).orElse(null);
if (pluginsElement != null) {
fixed |= fixDuplicatePluginsInSection(pluginsElement, context, sectionName + "/" + PLUGINS);
}

Element pluginManagementElement = buildElement.child(PLUGIN_MANAGEMENT).orElse(null);
Element pluginManagementElement =
buildElement.childElement(PLUGIN_MANAGEMENT).orElse(null);
if (pluginManagementElement != null) {
Element managedPluginsElement =
pluginManagementElement.child(PLUGINS).orElse(null);
pluginManagementElement.childElement(PLUGINS).orElse(null);
if (managedPluginsElement != null) {
fixed |= fixDuplicatePluginsInSection(
managedPluginsElement, context, sectionName + "/" + PLUGIN_MANAGEMENT + "/" + PLUGINS);
Expand All @@ -416,7 +424,7 @@ private boolean fixPluginsInBuildElement(Element buildElement, UpgradeContext co
* Fixes duplicate plugins within a specific plugins section.
*/
private boolean fixDuplicatePluginsInSection(Element pluginsElement, UpgradeContext context, String sectionName) {
List<Element> plugins = pluginsElement.children(PLUGIN).toList();
List<Element> plugins = pluginsElement.childElements(PLUGIN).toList();
Map<String, Element> seenPlugins = new HashMap<>();

List<Element> duplicates = plugins.stream()
Expand Down Expand Up @@ -460,10 +468,11 @@ private boolean fixRepositoryExpressions(

boolean fixed = false;
String elementType = repositoriesElement.name().equals(REPOSITORIES) ? REPOSITORY : PLUGIN_REPOSITORY;
List<Element> repositories = repositoriesElement.children(elementType).toList();
List<Element> repositories =
repositoriesElement.childElements(elementType).toList();

for (Element repository : repositories) {
Element urlElement = repository.child("url").orElse(null);
Element urlElement = repository.childElement("url").orElse(null);
if (urlElement != null) {
String url = urlElement.textContent().trim();
if (url.contains("${")) {
Expand Down
10 changes: 5 additions & 5 deletions impl/maven-cli/src/main/java/org/apache/maven/cling/invoker/mvnup/goals/DomUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,18 @@
* <p>Many operations can be performed directly using DomTrip's Element API:
* <pre>{@code
* // Find child element
* Element child = parent.child("version").orElse(null);
* Element child = parent.childElement("version").orElse(null);
*
* // Check if child exists
* boolean hasVersion = parent.child("version").isPresent();
* boolean hasVersion = parent.childElement("version").isPresent();
*
* // Get child text content
* String version = parent.child("version")
* String version = parent.childElement("version")
* .map(Element::textContent)
* .orElse(null);
*
* // Get trimmed text content
* String trimmedVersion = parent.child("version")
* String trimmedVersion = parent.childElement("version")
* .map(Element::textContentTrimmed)
* .orElse(null);
*
Expand Down Expand Up @@ -119,7 +119,7 @@ public static Element insertContentElement(Element parent, String name, String c
*
*/
public static Element findChildElement(Element parent, String name) {
return parent.child(name).orElse(null);
return parent.childElement(name).orElse(null);
}

/**
Expand Down
Loading