Further tweaks because Shannon keeps pointing out small improvements …

…to me
openrewrite · Jan 29, 2025 · ee348a0 · ee348a0
1 parent 9022048
commit ee348a0
Showing 1 changed file with 15 additions and 18 deletions.
diff --git a/rewrite-gradle/src/main/java/org/openrewrite/gradle/RemoveRedundantDependencyVersions.java b/rewrite-gradle/src/main/java/org/openrewrite/gradle/RemoveRedundantDependencyVersions.java
@@ -247,35 +247,32 @@ public J.Return visitReturn(J.Return _return, ExecutionContext executionContext)
                             }
 
                             boolean shouldRemoveRedundantConstraint(String dependencyNotation, String configurationName) {
-                                GradleDependencyConfiguration c = gp.getConfiguration(configurationName);
-                                if (c == null) {
+                                return shouldRemoveRedundantConstraint(
+                                        DependencyStringNotationConverter.parse(dependencyNotation),
+                                        gp.getConfiguration(configurationName));
+                            }
+
+                            boolean shouldRemoveRedundantConstraint(@Nullable Dependency constraint, @Nullable GradleDependencyConfiguration c) {
+                                if (c == null || constraint == null || constraint.getVersion() == null) {
                                     return false;
                                 }
-                                Dependency constraint = DependencyStringNotationConverter.parse(dependencyNotation);
-                                if (constraint == null || constraint.getVersion() == null || constraint.getVersion().contains("[") || constraint.getVersion().contains("!!")) {
+                                if(constraint.getVersion().contains("[") || constraint.getVersion().contains("!!")) {
                                     // https://docs.gradle.org/current/userguide/dependency_versions.html#sec:strict-version
                                     return false;
                                 }
                                 if ((groupPattern != null && !StringUtils.matchesGlob(constraint.getGroupId(), groupPattern))
                                     || (artifactPattern != null && !StringUtils.matchesGlob(constraint.getArtifactId(), artifactPattern))) {
                                     return false;
                                 }
-                                return shouldRemoveRedundantConstraint(constraint, c);
-                            }
-
-                            boolean shouldRemoveRedundantConstraint(Dependency constraint, GradleDependencyConfiguration c) {
-                                if (c.isCanBeResolved()) {
-                                    ResolvedDependency resolvedDependency = c.findResolvedDependency(requireNonNull(constraint.getGroupId()), constraint.getArtifactId());
-                                    if (resolvedDependency == null || constraint.getVersion() == null) {
-                                        return false;
-                                    }
-                                    return VERSION_COMPARATOR.compare(null, resolvedDependency.getVersion(), constraint.getVersion()) > 0;
-                                }
-                                return gp.configurationsExtendingFrom(c, true)
-                                        .stream()
+                                return Stream.concat(
+                                                Stream.of(c),
+                                                gp.configurationsExtendingFrom(c, true).stream()
+                                        )
                                         .filter(GradleDependencyConfiguration::isCanBeResolved)
                                         .distinct()
-                                        .anyMatch(conf -> shouldRemoveRedundantConstraint(constraint, conf));
+                                        .map(conf -> conf.findResolvedDependency(requireNonNull(constraint.getGroupId()), constraint.getArtifactId()))
+                                        .filter(Objects::nonNull)
+                                        .anyMatch(resolvedDependency -> VERSION_COMPARATOR.compare(null, resolvedDependency.getVersion(), constraint.getVersion()) > 0);
                             }
                         }.visitNonNull(cu, ctx);