Merge NormalizeMavenVariables into PrefixlessExpressions (#3600)

Due to overlap, and the latter replacing more instances.
openrewrite · Oct 3, 2023 · 5675dd6 · 5675dd6
1 parent b0eddd0
commit 5675dd6
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 137 deletions.
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/NormalizeMavenVariables.java b/rewrite-maven/src/main/java/org/openrewrite/maven/NormalizeMavenVariables.java
diff --git a/rewrite-maven/src/main/java/org/openrewrite/maven/RenamePropertyKey.java b/rewrite-maven/src/main/java/org/openrewrite/maven/RenamePropertyKey.java
@@ -50,13 +50,7 @@ public String getDescription() {
 
     @Override
     public TreeVisitor<?, ExecutionContext> getVisitor() {
-        return Preconditions.check(new MavenVisitor<ExecutionContext>() {
-            @Override
-            public Xml visitDocument(Xml.Document document, ExecutionContext executionContext) {
-                // Scanning every tag's value is not an efficient applicable test, so just accept all maven files
-                return SearchResult.found(document);
-            }
-        }, new MavenIsoVisitor<ExecutionContext>() {
+        return new MavenIsoVisitor<ExecutionContext>() {
             final String oldKeyAsProperty = "${" + oldKey + "}";
             final String newKeyAsProperty = "${" + newKey + "}";
 
@@ -76,6 +70,6 @@ public Xml.Tag visitTag(Xml.Tag tag, ExecutionContext ctx) {
                 }
                 return t;
             }
-        });
+        };
     }
 }
diff --git a/rewrite-maven/src/main/resources/META-INF/rewrite/maven.yml b/rewrite-maven/src/main/resources/META-INF/rewrite/maven.yml
@@ -28,6 +28,18 @@ name: org.openrewrite.maven.cleanup.PrefixlessExpressions
 displayName: Drop prefixless expressions in POM
 description: MNG-7404 drops support for prefixless in POMs. This recipe will add the `project.` prefix where missing.
 recipeList:
+  - org.openrewrite.maven.RenamePropertyKey:
+      oldKey: basedir
+      newKey: project.basedir
+  - org.openrewrite.maven.RenamePropertyKey:
+      oldKey: build.timestamp
+      newKey: project.build.timestamp
+  - org.openrewrite.maven.RenamePropertyKey:
+      oldKey: groupId
+      newKey: project.groupId
+  - org.openrewrite.maven.RenamePropertyKey:
+      oldKey: artifactId
+      newKey: project.artifactId
   - org.openrewrite.maven.RenamePropertyKey:
       oldKey: version
       newKey: project.version

diff --git a/rewrite-maven/src/test/java/org/openrewrite/maven/NormalizeMavenVariablesTest.java b/rewrite-maven/src/test/java/org/openrewrite/maven/NormalizeMavenVariablesTest.java