Add version paramater to DependencyInsight

openrewrite · Nov 9, 2023 · 3840fdb · 3840fdb
1 parent c9e7157
commit 3840fdb
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/src/main/java/org/openrewrite/java/dependencies/DependencyInsight.java b/src/main/java/org/openrewrite/java/dependencies/DependencyInsight.java
@@ -44,12 +44,21 @@ public String getDescription() {
             example = "jackson-module-*")
     String artifactIdPattern;
 
+    @Option(displayName = "Version",
+            description = "Match only dependencies with the specified version. " +
+                          "Node-style [version selectors](https://docs.openrewrite.org/reference/dependency-version-selectors) may be used." +
+                          "All versions are searched by default.",
+            example = "1.x",
+            required = false)
+    @Nullable
+    String version;
+
     @Override
     public TreeVisitor<?, ExecutionContext> getVisitor() {
         return new TreeVisitor<Tree, ExecutionContext>() {
-            final TreeVisitor<?, ExecutionContext> gdi = new org.openrewrite.gradle.search.DependencyInsight(groupIdPattern, artifactIdPattern, null)
+            final TreeVisitor<?, ExecutionContext> gdi = new org.openrewrite.gradle.search.DependencyInsight(groupIdPattern, artifactIdPattern,  version,null)
                     .getVisitor();
-            final TreeVisitor<?, ExecutionContext> mdi = new org.openrewrite.maven.search.DependencyInsight(groupIdPattern, artifactIdPattern, null, false)
+            final TreeVisitor<?, ExecutionContext> mdi = new org.openrewrite.maven.search.DependencyInsight(groupIdPattern, artifactIdPattern, null, version, false)
                     .getVisitor();
             @Override
             public @Nullable Tree visit(@Nullable Tree tree, ExecutionContext ctx) {

diff --git a/src/test/java/org/openrewrite/java/dependencies/DependencyInsightTest.java b/src/test/java/org/openrewrite/java/dependencies/DependencyInsightTest.java
@@ -16,7 +16,6 @@
 package org.openrewrite.java.dependencies;
 
 import org.junit.jupiter.api.Test;
-import org.openrewrite.maven.Assertions;
 import org.openrewrite.test.RecipeSpec;
 import org.openrewrite.test.RewriteTest;
 
@@ -26,7 +25,7 @@ public class DependencyInsightTest implements RewriteTest {
 
     @Override
     public void defaults(RecipeSpec spec) {
-        spec.recipe(new DependencyInsight("org.springframework*", "*"));
+        spec.recipe(new DependencyInsight("org.springframework*", "*", null));
     }
 
     @Test
@@ -35,9 +34,9 @@ void maven() {
           //language=xml
           pomXml("""
               <project>
-                <groupId></groupId>
-                <artifactId></artifactId>
-                <version></version>
+                <groupId>com.example</groupId>
+                <artifactId>foo</artifactId>
+                <version>1.0.0</version>
                 
                 <dependencies>
                   <dependency>
@@ -50,9 +49,9 @@ void maven() {
               """,
             """
               <project>
-                <groupId></groupId>
-                <artifactId></artifactId>
-                <version></version>
+                <groupId>com.example</groupId>
+                <artifactId>foo</artifactId>
+                <version>1.0.0</version>
                 
                 <dependencies>
                   <!--~~>--><dependency>

diff --git a/src/test/java/org/openrewrite/java/dependencies/DependencyResolutionDiagnosticTest.java b/src/test/java/org/openrewrite/java/dependencies/DependencyResolutionDiagnosticTest.java
@@ -55,8 +55,6 @@ void gradle() {
                 id("java")
             }
             repositories {
-                mavenLocal()
-                mavenCentral()
                 maven {
                     url "https://nonexistent.moderne.io/maven2"
                 }