DependencyInsight also search maven files

openrewrite · Nov 9, 2023 · b079b23 · b079b23
1 parent bc35536
commit b079b23
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 3 deletions.
diff --git a/src/main/java/org/openrewrite/java/dependencies/DependencyInsight.java b/src/main/java/org/openrewrite/java/dependencies/DependencyInsight.java
@@ -59,7 +59,8 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
                 SourceFile s = (SourceFile) tree;
                 if(gdi.isAcceptable(s, ctx)) {
                     s = (SourceFile) gdi.visitNonNull(s, ctx);
-                } else if(mdi.isAcceptable(s, ctx)) {
+                }
+                if(mdi.isAcceptable(s, ctx)) {
                     s = (SourceFile) mdi.visitNonNull(s, ctx);
                 }
                 return s;

diff --git a/src/main/java/org/openrewrite/java/dependencies/DependencyResolutionDiagnostic.java b/src/main/java/org/openrewrite/java/dependencies/DependencyResolutionDiagnostic.java
@@ -53,8 +53,8 @@ public String getDescription() {
         return "Recipes which manipulate dependencies must be able to successfully access the artifact repositories " +
                "and resolve dependencies from them. This recipe produces two data tables used to understand the state " +
                "of dependency resolution. \n\n" +
-               "The Repository accessibility report lists all the artifact repositories known to the project and whether" +
-               "they respond to network access. The network access is attempted while the recipe is run and so is " +
+               "The Repository accessibility report lists all the artifact repositories known to the project and whether " +
+               "respond to network access. The network access is attempted while the recipe is run and so is " +
                "representative of current conditions. \n\n" +
                "The Gradle dependency configuration errors lists all the dependency configurations that failed to " +
                "resolve one or more dependencies when the project was parsed. This is representative of conditions at " +

diff --git a/src/test/java/org/openrewrite/java/dependencies/DependencyInsightTest.java b/src/test/java/org/openrewrite/java/dependencies/DependencyInsightTest.java
@@ -0,0 +1,53 @@
+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;
+
+import static org.openrewrite.maven.Assertions.pomXml;
+
+public class DependencyInsightTest implements RewriteTest {
+
+    @Override
+    public void defaults(RecipeSpec spec) {
+        spec.recipe(new DependencyInsight("org.springframework*", "*"));
+    }
+
+    @Test
+    void maven() {
+        rewriteRun(
+          //language=xml
+          pomXml("""
+              <project>
+                <groupId></groupId>
+                <artifactId></artifactId>
+                <version></version>
+                
+                <dependencies>
+                  <dependency>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
+                    <version>5.2.6.RELEASE</version>
+                  </dependency>
+                </dependencies>
+              </project>
+              """,
+            """
+              <project>
+                <groupId></groupId>
+                <artifactId></artifactId>
+                <version></version>
+                
+                <dependencies>
+                  <!--~~>--><dependency>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
+                    <version>5.2.6.RELEASE</version>
+                  </dependency>
+                </dependencies>
+              </project>
+              """)
+        );
+    }
+}