Change from includeManaged to onlyManaged to not apply twice

openrewrite · Dec 16, 2023 · b7d777d · b7d777d
1 parent 8ba4024
commit b7d777d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/ChangeDependencyClassifier.java b/rewrite-maven/src/main/java/org/openrewrite/maven/ChangeDependencyClassifier.java
@@ -54,12 +54,12 @@ public class ChangeDependencyClassifier extends Recipe {
     @Nullable
     String newClassifier;
 
-    @Option(displayName = "Include managed dependencies",
-            description = "Whether to include managed dependencies in the search. Defaults to false.",
+    @Option(displayName = "Only on managed dependencies",
+            description = "Whether to only consider managed dependencies in the search. Defaults to false.",
             example = "true",
             required = false)
     @Nullable
-    Boolean includeManaged;
+    Boolean onlyManaged;
 
     @Override
     public String getDisplayName() {
@@ -76,7 +76,9 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
         return new MavenVisitor<ExecutionContext>() {
             @Override
             public Xml visitTag(Xml.Tag tag, ExecutionContext ctx) {
-                if (isDependencyTag(groupId, artifactId) || (includeManaged != null && includeManaged && isManagedDependencyTag(groupId, artifactId))) {
+                boolean managedOnly = onlyManaged != null && onlyManaged;
+                if ((!managedOnly && isDependencyTag(groupId, artifactId)) ||
+                    (managedOnly && isManagedDependencyTag(groupId, artifactId))) {
                     Optional<Xml.Tag> scope = tag.getChild("classifier");
                     if (scope.isPresent()) {
                         if (newClassifier == null) {

diff --git a/rewrite-maven/src/test/java/org/openrewrite/maven/ChangeDependencyClassifierTest.java b/rewrite-maven/src/test/java/org/openrewrite/maven/ChangeDependencyClassifierTest.java
@@ -128,7 +128,6 @@ void noManagedClassifierToClassifier() {
                   <dependency>
                     <groupId>org.ehcache</groupId>
                     <artifactId>ehcache</artifactId>
-                    <classifier>jakarta</classifier>
                   </dependency>
                 </dependencies>
               </project>