From 6816a660ec7a1c36f482f80156b282c78f8db691 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Fri, 28 Mar 2025 08:30:20 -0400 Subject: [PATCH 1/2] minor cleanups --- .../repository/MetadataResolutionResult.java | 9 ----- .../model/building/DefaultModelBuilder.java | 35 +++++++++---------- .../internal/DefaultMavenPluginManager.java | 26 +------------- .../org/apache/maven/impl/VersionTest.java | 2 +- 4 files changed, 19 insertions(+), 53 deletions(-) diff --git a/compat/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java b/compat/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java index 6f9ff2943799..1ef5827810c8 100644 --- a/compat/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java +++ b/compat/maven-compat/src/main/java/org/apache/maven/repository/MetadataResolutionResult.java @@ -30,11 +30,6 @@ import org.apache.maven.artifact.resolver.CyclicDependencyException; import org.apache.maven.artifact.versioning.OverConstrainedVersionException; -/** - * - * - * - */ @Deprecated public class MetadataResolutionResult { private Artifact originatingArtifact; @@ -61,12 +56,8 @@ public class MetadataResolutionResult { private Set artifacts; - private MetadataGraph dirtyTree; - private MetadataGraph resolvedTree; - private MetadataGraph resolvedGraph; - public Artifact getOriginatingArtifact() { return originatingArtifact; } diff --git a/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java index c9285c32c294..bd541a1b9cee 100644 --- a/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java +++ b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java @@ -247,7 +247,7 @@ public DefaultModelBuilder setProfileActivationFilePathInterpolator( @SuppressWarnings("checkstyle:methodlength") @Override public ModelBuildingResult build(ModelBuildingRequest request) throws ModelBuildingException { - return build(request, new LinkedHashSet()); + return build(request, new LinkedHashSet<>()); } @SuppressWarnings("checkstyle:methodlength") @@ -358,14 +358,15 @@ protected ModelBuildingResult build(ModelBuildingRequest request, Collection "; + message.append(modelId); + message.append(" -> "); } - message += parentData.getId(); + message.append(parentData.getId()); problems.add(new ModelProblemCollectorRequest(ModelProblem.Severity.FATAL, ModelProblem.Version.BASE) - .setMessage(message)); + .setMessage(message.toString())); throw problems.newModelBuildingException(); } else { @@ -431,7 +432,7 @@ private interface InterpolateString { private List getInterpolatedProfiles( Model rawModel, DefaultProfileActivationContext context, DefaultModelProblemCollector problems) { - List interpolatedActivations = getProfiles(rawModel, true); + List interpolatedActivations = getProfiles(rawModel); if (interpolatedActivations.isEmpty()) { return Collections.emptyList(); @@ -496,7 +497,7 @@ void performFor(String value, String locationKey, Consumer mutator) { @Override public ModelBuildingResult build(ModelBuildingRequest request, ModelBuildingResult result) throws ModelBuildingException { - return build(request, result, new LinkedHashSet()); + return build(request, result, new LinkedHashSet()); } private ModelBuildingResult build( @@ -754,12 +755,10 @@ private void assembleInheritance( } } - private List getProfiles(Model model, boolean clone) { + private List getProfiles(Model model) { ArrayList profiles = new ArrayList<>(); for (Profile profile : model.getProfiles()) { - if (clone) { - profile = profile.clone(); - } + profile = profile.clone(); profiles.add(profile); } return profiles; @@ -767,7 +766,7 @@ private List getProfiles(Model model, boolean clone) { private Model interpolateModel(Model model, ModelBuildingRequest request, ModelProblemCollector problems) { // save profile activations before interpolation, since they are evaluated with limited scope - List originalProfiles = getProfiles(model, true); + List originalProfiles = getProfiles(model); Model interpolatedModel = modelInterpolator.interpolateModel(model, model.getProjectDirectory(), request, problems); @@ -1166,12 +1165,13 @@ private void importDependencyManagement( String imported = groupId + ':' + artifactId + ':' + version; if (importIds.contains(imported)) { - String message = "The dependencies of type=pom and with scope=import form a cycle: "; + StringBuilder message = new StringBuilder("The dependencies of type=pom and with scope=import form a cycle: "); for (String modelId : importIds) { - message += modelId + " -> "; + message.append(modelId); + message.append(" -> "); } - message += imported; - problems.add(new ModelProblemCollectorRequest(Severity.ERROR, Version.BASE).setMessage(message)); + message.append(imported); + problems.add(new ModelProblemCollectorRequest(Severity.ERROR, Version.BASE).setMessage(message.toString())); continue; } @@ -1288,8 +1288,7 @@ private void fireEvent( Model model, ModelBuildingRequest request, ModelProblemCollector problems, - ModelBuildingEventCatapult catapult) - throws ModelBuildingException { + ModelBuildingEventCatapult catapult) { ModelBuildingListener listener = request.getModelBuildingListener(); if (listener != null) { diff --git a/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java index 530bca711657..57596e585b44 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java +++ b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java @@ -464,7 +464,7 @@ private List toMavenArtifacts(DependencyResult dependencyResult) { return dependencyResult.getDependencyNodeResults().stream() .filter(n -> n.getArtifact().getPath() != null) .map(n -> RepositoryUtils.toArtifact(n.getDependency())) - .collect(Collectors.toUnmodifiableList()); + .toList(); } private Map calcImports( @@ -1024,28 +1024,4 @@ private List resolveExtensionArtifacts( pluginDependenciesResolver.resolvePlugin(extensionPlugin, null, null, repositories, session); return toMavenArtifacts(root); } - - static class NamedImpl implements Named { - private final String value; - - NamedImpl(String value) { - this.value = value; - } - - public String value() { - return this.value; - } - - public int hashCode() { - return 127 * "value".hashCode() ^ this.value.hashCode(); - } - - public boolean equals(Object o) { - return o instanceof Named named && this.value.equals(named.value()); - } - - public Class annotationType() { - return Named.class; - } - } } diff --git a/impl/maven-impl/src/test/java/org/apache/maven/impl/VersionTest.java b/impl/maven-impl/src/test/java/org/apache/maven/impl/VersionTest.java index 379efabf7b5a..27ad33272838 100644 --- a/impl/maven-impl/src/test/java/org/apache/maven/impl/VersionTest.java +++ b/impl/maven-impl/src/test/java/org/apache/maven/impl/VersionTest.java @@ -134,7 +134,7 @@ void testUnlimitedNumberOfDigitsInNumericComponent() { } @Test - void testTransitionFromDigitToLetterAndViceVersaIsEqualivantToDelimiter() { + void testTransitionFromDigitToLetterAndViceVersaIsEquivalentToDelimiter() { assertOrder(AbstractVersionTest.X_EQ_Y, "1alpha10", "1.alpha.10"); assertOrder(AbstractVersionTest.X_EQ_Y, "1alpha10", "1-alpha-10"); From de71fb3effa76ba97675b20eefb612c244a4e012 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Fri, 28 Mar 2025 08:52:41 -0400 Subject: [PATCH 2/2] spotless --- .../apache/maven/model/building/DefaultModelBuilder.java | 6 ++++-- .../maven/plugin/internal/DefaultMavenPluginManager.java | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java index bd541a1b9cee..9a372628aa79 100644 --- a/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java +++ b/compat/maven-model-builder/src/main/java/org/apache/maven/model/building/DefaultModelBuilder.java @@ -1165,13 +1165,15 @@ private void importDependencyManagement( String imported = groupId + ':' + artifactId + ':' + version; if (importIds.contains(imported)) { - StringBuilder message = new StringBuilder("The dependencies of type=pom and with scope=import form a cycle: "); + StringBuilder message = + new StringBuilder("The dependencies of type=pom and with scope=import form a cycle: "); for (String modelId : importIds) { message.append(modelId); message.append(" -> "); } message.append(imported); - problems.add(new ModelProblemCollectorRequest(Severity.ERROR, Version.BASE).setMessage(message.toString())); + problems.add( + new ModelProblemCollectorRequest(Severity.ERROR, Version.BASE).setMessage(message.toString())); continue; } diff --git a/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java index 57596e585b44..1f969db53072 100644 --- a/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java +++ b/impl/maven-core/src/main/java/org/apache/maven/plugin/internal/DefaultMavenPluginManager.java @@ -26,7 +26,6 @@ import java.io.File; import java.io.IOException; import java.io.PrintStream; -import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type;