Skip to content

Avoid triggering full transitive resolution from GradleDependencyConfiguration.findResolvedDependency #7455

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
steve-aom-elliott wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −3
Open

Avoid triggering full transitive resolution from GradleDependencyConfiguration.findResolvedDependency #7455

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
7 changes: 6 additions & 1 deletion ...ite-gradle/src/main/java/org/openrewrite/gradle/marker/GradleDependencyConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,8 +439,13 @@ public List<GradleDependencyConfiguration> allExtendsFrom() {
return null;
}

/**
* Find a direct dependency of this configuration matching the given coordinates. This does not walk into the
* transitive closure of each direct dependency; use {@link #getResolved()} and iterate there if you need to
* match a transitive. Uses {@link #getDirectResolvedShallow()} so it does not trigger a full transitive download.
*/
public @Nullable ResolvedDependency findResolvedDependency(@Nullable String groupId, String artifactId) {
for (ResolvedDependency d : getDirectResolved()) {
for (ResolvedDependency d : getDirectResolvedShallow()) {
ResolvedDependency dependency = d.findDependency(groupId == null ? "" : groupId, artifactId);
if (dependency != null) {
return dependency;
Expand Down
10 changes: 8 additions & 2 deletions rewrite-gradle/src/test/java/org/openrewrite/gradle/marker/GradleProjectTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -554,10 +554,16 @@ void changeConstraint() {
.extracting(GradleDependencyConstraint::getRequiredVersion)
.isEqualTo("2.19.2");

// Verify the runtimeClasspath has the updated resolved version
// Verify the runtimeClasspath has the updated resolved version. jackson-databind is a transitive
// of rewrite-core, so search the flat resolved list rather than findResolvedDependency (which is
// direct-only).
GradleDependencyConfiguration runtimeClasspath = updated.getConfiguration("runtimeClasspath");
assertThat(runtimeClasspath).isNotNull();
ResolvedDependency resolvedJackson = runtimeClasspath.findResolvedDependency("com.fasterxml.jackson.core", "jackson-databind");
ResolvedDependency resolvedJackson = runtimeClasspath.getResolved().stream()
.filter(d -> "com.fasterxml.jackson.core".equals(d.getGroupId()) &&
"jackson-databind".equals(d.getArtifactId()))
.findFirst()
.orElse(null);
assertThat(resolvedJackson).isNotNull()
.extracting(ResolvedDependency::getVersion)
.as("jackson-databind should be resolved to the constrained version")
Expand Down
⚡