Skip to content

Speed up ModuleHasDependency and RepositoryHasDependency by removing DependencyInsight #176

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
+78 −13
Open

Speed up ModuleHasDependency and RepositoryHasDependency by removing DependencyInsight #176

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
43 changes: 38 additions & 5 deletions src/main/java/org/openrewrite/java/dependencies/search/ModuleHasDependency.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,18 @@
import lombok.Value;
import org.jspecify.annotations.Nullable;
import org.openrewrite.*;
import org.openrewrite.java.dependencies.DependencyInsight;
import org.openrewrite.gradle.marker.GradleDependencyConfiguration;
import org.openrewrite.gradle.marker.GradleProject;
import org.openrewrite.java.marker.JavaProject;
import org.openrewrite.marker.SearchResult;
import org.openrewrite.maven.tree.MavenResolutionResult;
import org.openrewrite.maven.tree.ResolvedDependency;
import org.openrewrite.maven.tree.Scope;
import org.openrewrite.semver.Semver;
import org.openrewrite.semver.VersionComparator;

import java.util.HashSet;
import java.util.List;
import java.util.Optional;
import java.util.Set;

Expand Down Expand Up @@ -87,10 +94,7 @@ public Tree visit(@Nullable Tree tree, ExecutionContext ctx) {
tree.getMarkers()
.findFirst(JavaProject.class)
.ifPresent(jp -> {
Tree t = new DependencyInsight(groupIdPattern, artifactIdPattern, version, scope)
.getVisitor()
.visit(tree, ctx);
if (t != tree) {
if (hasDependency(tree)) {
acc.add(jp);
}
});
Expand All @@ -99,6 +103,35 @@ public Tree visit(@Nullable Tree tree, ExecutionContext ctx) {
};
}

private boolean hasDependency(Tree tree) {
VersionComparator versionComparator = version != null ? Semver.validate(version, null).getValue() : null;

MavenResolutionResult mavenResult = tree.getMarkers().findFirst(MavenResolutionResult.class).orElse(null);
if (mavenResult != null) {
Scope requestedScope = scope == null ? null : Scope.fromName(scope);
List<ResolvedDependency> dependencies = mavenResult.findDependencies(groupIdPattern, artifactIdPattern, requestedScope);
for (ResolvedDependency dependency : dependencies) {
if (versionComparator == null || versionComparator.isValid(null, dependency.getVersion())) {
return true;
}
}
return false;
}

GradleProject gp = tree.getMarkers().findFirst(GradleProject.class).orElse(null);
if (gp != null) {
for (GradleDependencyConfiguration c : gp.getConfigurations()) {
for (ResolvedDependency resolvedDependency : c.getDirectResolved()) {
ResolvedDependency found = resolvedDependency.findDependency(groupIdPattern, artifactIdPattern);
if (found != null && (versionComparator == null || versionComparator.isValid(null, found.getVersion()))) {
return true;
}
}
}
}
return false;
}

@Override
public TreeVisitor<?, ExecutionContext> getVisitor(Set<JavaProject> acc) {
return new TreeVisitor<Tree, ExecutionContext>() {
Expand Down
48 changes: 40 additions & 8 deletions src/main/java/org/openrewrite/java/dependencies/search/RepositoryHasDependency.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,17 @@
import lombok.Value;
import org.jspecify.annotations.Nullable;
import org.openrewrite.*;
import org.openrewrite.java.dependencies.DependencyInsight;
import org.openrewrite.gradle.marker.GradleDependencyConfiguration;
import org.openrewrite.gradle.marker.GradleProject;
import org.openrewrite.java.marker.JavaProject;
import org.openrewrite.marker.SearchResult;
import org.openrewrite.maven.tree.MavenResolutionResult;
import org.openrewrite.maven.tree.ResolvedDependency;
import org.openrewrite.maven.tree.Scope;
import org.openrewrite.semver.Semver;
import org.openrewrite.semver.VersionComparator;

import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;

@EqualsAndHashCode(callSuper = false)
Expand Down Expand Up @@ -75,18 +82,14 @@ public TreeVisitor<?, ExecutionContext> getScanner(AtomicBoolean acc) {
return new TreeVisitor<Tree, ExecutionContext>() {
@Override
public Tree visit(@Nullable Tree tree, ExecutionContext ctx) {
if(acc.get()) {
assert tree != null;
assert tree != null;
if (acc.get()) {
return tree;
}
assert tree != null;
tree.getMarkers()
.findFirst(JavaProject.class)
.ifPresent(jp -> {
Tree t = new DependencyInsight(groupIdPattern, artifactIdPattern, scope, version)
.getVisitor()
.visit(tree, ctx);
if (t != tree) {
if (hasDependency(tree)) {
acc.set(true);
}
});
Expand All @@ -95,6 +98,35 @@ public Tree visit(@Nullable Tree tree, ExecutionContext ctx) {
};
}

private boolean hasDependency(Tree tree) {
VersionComparator versionComparator = version != null ? Semver.validate(version, null).getValue() : null;

MavenResolutionResult mavenResult = tree.getMarkers().findFirst(MavenResolutionResult.class).orElse(null);
if (mavenResult != null) {
Scope requestedScope = scope == null ? null : Scope.fromName(scope);
List<ResolvedDependency> dependencies = mavenResult.findDependencies(groupIdPattern, artifactIdPattern, requestedScope);
for (ResolvedDependency dependency : dependencies) {
if (versionComparator == null || versionComparator.isValid(null, dependency.getVersion())) {
return true;
}
}
return false;
}

GradleProject gp = tree.getMarkers().findFirst(GradleProject.class).orElse(null);
if (gp != null) {
for (GradleDependencyConfiguration c : gp.getConfigurations()) {
for (ResolvedDependency resolvedDependency : c.getDirectResolved()) {
ResolvedDependency found = resolvedDependency.findDependency(groupIdPattern, artifactIdPattern);
if (found != null && (versionComparator == null || versionComparator.isValid(null, found.getVersion()))) {
return true;
}
}
}
}
return false;
}

@Override
public TreeVisitor<?, ExecutionContext> getVisitor(AtomicBoolean acc) {
if (acc.get()) {
Expand Down
Loading