8000 Fix `FindDependency` to exclude constraints by knutwannheden · Pull Request #5663 · openrewrite/rewrite · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix FindDependency to exclude constraints #5663

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

Open
wants to merge 13 commits into
base: main
Choose a base branch
from
Open

Fix FindDependency to exclude constraints #5663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6401d2c
Fix `FindDependency` to exclude constraints
knutwannheden Jun 24, 2025
fd1874b
Apply suggestions from code review
knutwannheden Jun 24, 2025
6866c09
Adopt `GradleDependency.Matcher` in `FindDependency`
timtebeek Jun 25, 2025
e94389a
Merge branch 'main' into issue-5599
timtebeek Jun 25, 2025
3782df6
Add `withToolingApi` for .kts test
timtebeek Jun 25, 2025
6d69bec
Merge branch 'main' into issue-5599
timtebeek Jun 25, 2025
03d646f
Use backticks as suggested
timtebeek Jun 27, 2025
8cd114b
Merge branch 'main' into issue-5599
timtebeek Jun 27, 2025
71ace0f
Guard against regressions in detecting older Gradle dependency methods
timtebeek Jun 27, 2025
e89a971
Use Gradle 7.6.5 for the older dependency methods
timtebeek Jun 27, 2025
f112ab7
Use Gradle 6.9.4 for the deprecated dependency methods
timtebeek Jun 27, 2025
d8c2ffa
Merge branch 'main' into issue-5599
timtebeek Jun 27, 2025
66d4b9b
Merge branch 'main' into issue-5599
timtebeek Jun 27, 2025
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
69 changes: 10 additions & 59 deletions rewrite-gradle/src/main/java/org/openrewrite/gradle/search/FindDependency.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,13 @@
import lombok.EqualsAndHashCode;
import lombok.Value;
import org.jspecify.annotations.Nullable;
import org.openrewrite.*;
import org.openrewrite.gradle.IsBuildGradle;
import org.openrewrite.groovy.tree.G;
import org.openrewrite.internal.StringUtils;
import org.openrewrite.java.JavaIsoVisitor;
import org.openrewrite.java.tree.Expression;
import org.openrewrite.java.tree.J;
import org.openrewrite.ExecutionContext;
import org.openrewrite.Option;
import org.openrewrite.Recipe;
import org.openrewrite.TreeVisitor;
import org.openrewrite.gradle.trait.GradleDependency;
import org.openrewrite.marker.SearchResult;

import java.util.Arrays;
import java.util.List;

@Value
@EqualsAndHashCode(callSuper = false)
public class FindDependency extends Recipe {
Expand Down Expand Up @@ -67,56 +62,12 @@ public String getDescription() {
"A project's test classpath is based on these configurations.\n\n<img alt=\"Gradle test classpath\" src=\"https://docs.gradle.org/current/userguide/img/java-library-ignore-deprecated-test.png\" width=\"200px\"/>.";
}

private static final List<String> DEPENDENCY_MANAGEMENT_METHODS = Arrays.asList(
"api",
"implementation",
"compileOnly",
"runtimeOnly",
"testImplementation",
"testCompileOnly",
"testRuntimeOnly",
"debugImplementation",
"releaseImplementation",
"androidTestImplementation",
"featureImplementation",
"annotationProcessor",
"kapt",
"ksp",
"compile", // deprecated
"runtime", // deprecated
"testCompile", // deprecated
"testRuntime" // deprecated
);

@Override
public TreeVisitor<?, ExecutionContext> getVisitor() {
return Preconditions.check(new IsBuildGradle<>(), new JavaIsoVisitor<ExecutionContext>() {
@Override
public J.MethodInvocation visitMethodInvocation(J.MethodInvocation method, ExecutionContext ctx) {
if (DEPENDENCY_MANAGEMENT_METHODS.contains(method.getSimpleName())) {
if (StringUtils.isBlank(configuration) || method.getSimpleName().equals(configuration)) {
List<Expression> depArgs = method.getArguments();
if (depArgs.get(0) instanceof J.Literal &&
groupArtifactMatches((J.Literal) depArgs.get(0))) {
return SearchResult.found(method);
} else if (depArgs.get(0) instanceof G.GString &&
groupArtifactMatches((J.Literal) ((G.GString) depArgs.get(0)).getStrings().get(0))) {
return SearchResult.found(method);
}
}
}
return super.visitMethodInvocation(method, ctx);
}

boolean groupArtifactMatches(J.Literal gavValue) {
String gav = (String) gavValue.getValue();
assert gav != null;
String[] parts = gav.split(":");
if (parts.length >= 2) {
return StringUtils.matchesGlob(parts[0], groupId) && StringUtils.matchesGlob(parts[1], artifactId);
}
return false;
}
});
return new GradleDependency.Matcher()
.groupId(groupId)
.artifactId(artifactId)
.configuration(configuration)
.asVisitor(gd -> SearchResult.found(gd.getTree()));
}
}
Loading
Loading
0