RemoveRedundantDependencyVersions recipe removes unused properties (#5645)

* RemoveRedundantDependencyVersions recipe removes unused properties if the recipe removes a version with said properties

* More test

* More test

* More test

* Parent pom test

* Add scanning phase for RemoveUnusedProperties

* Polish

* Polish

* Only replace properties for jar packaging

* Polish

* Support multiple properties removal

* Update rewrite-maven/src/main/java/org/openrewrite/maven/RemoveRedundantDependencyVersions.java

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update rewrite-core/src/main/java/org/openrewrite/internal/PropertyPlaceholderHelper.java

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Polish

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Author: jevanlingen

rewrite-core/src/main/java/org/openrewrite/internal/PropertyPlaceholderHelper.java

@@ -20,6 +20,10 @@
 
 import java.util.*;
 import java.util.function.Function;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static java.util.Collections.emptyList;
 
 /**
  * Simplified from Spring's PropertyPlaceholderHelper.
@@ -29,6 +33,7 @@
  */
 public class PropertyPlaceholderHelper {
     private static final Map<String, String> wellKnownSimplePrefixes = new HashMap<>(4);
+    private static final Pattern PROPERTY_PATTERN = Pattern.compile("\\$\\{([^}]+)}");
 
     static {
         wellKnownSimplePrefixes.put("}", "{");
@@ -66,6 +71,19 @@ public boolean hasPlaceholders(@Nullable String value) {
         return startIndex > -1 && value.indexOf(placeholderSuffix, startIndex) > startIndex;
     }
 
+    public List<String> getPlaceholders(@Nullable String value) {
+        if (value == null) {
+            return emptyList();
+        }
+
+        List<String> placeholders = new ArrayList<>();
+        Matcher matcher = PROPERTY_PATTERN.matcher(value);
+        while (matcher.find()) {
+            placeholders.add(matcher.group(1));
+        }
+        return placeholders;
+    }
+
     public String replacePlaceholders(String value, final Properties properties) {
         return replacePlaceholders(value, properties::getProperty);
     }

rewrite-maven/src/main/java/org/openrewrite/maven/MavenVisitor.java

@@ -335,7 +335,7 @@ protected Xml.Tag changeChildTagValue(Xml.Tag tag, String childTagName, @Nullabl
 
     @Contract("null -> false")
     protected boolean isProperty(@Nullable String value) {
-        return value != null && value.startsWith("${") && !IMPLICITLY_DEFINED_VERSION_PROPERTIES.contains(value);
+        return !IMPLICITLY_DEFINED_VERSION_PROPERTIES.contains(value) && ResolvedPom.placeholderHelper.hasPlaceholders(value);
     }
 
     public @Nullable ResolvedDependency findDependency(Xml.Tag tag) {

rewrite-maven/src/main/java/org/openrewrite/maven/RemoveRedundantDependencyVersions.java

@@ -28,6 +28,7 @@
 import org.openrewrite.semver.LatestIntegration;
 import org.openrewrite.semver.Semver;
 import org.openrewrite.semver.VersionComparator;
+import org.openrewrite.xml.tree.Content;
 import org.openrewrite.xml.tree.Xml;
 
 import java.util.*;
@@ -146,6 +147,7 @@ private Comparator determineComparator() {
 
     @Override
     public TreeVisitor<?, ExecutionContext> getVisitor() {
+        ArrayList<String> properties = new ArrayList<>();
         Comparator comparator = determineComparator();
         return new MavenIsoVisitor<ExecutionContext>() {
             @Override
@@ -154,6 +156,12 @@ public Xml.Document visitDocument(Xml.Document document, ExecutionContext ctx) {
                 if (d != document) {
                     d = (Xml.Document) new RemoveEmptyDependenciesTags().visitNonNull(d, ctx);
                     d = (Xml.Document) new RemoveEmptyPluginsTags().visitNonNull(d, ctx);
+                    if (!properties.isEmpty() && "jar".equals(getResolutionResult().getPom().getPackaging())) {
+                        RemoveUnusedProperties removeUnusedProperties = new RemoveUnusedProperties("(" + String.join("|", properties) + ")");
+                        RemoveUnusedProperties.Accumulator acc = removeUnusedProperties.getInitialValue(ctx);
+                        removeUnusedProperties.getScanner(acc).visit(d, ctx);
+                        d = (Xml.Document) removeUnusedProperties.getVisitor(acc).visitNonNull(d, ctx);
+                    }
                     if (comparator != Comparator.EQ) {
                         maybeUpdateModel();
                     }
@@ -171,7 +179,7 @@ public Xml.Document visitDocument(Xml.Document document, ExecutionContext ctx) {
                             matchesVersion(d) &&
                             isNotExcepted(d.getGroupId(), d.getArtifactId())) {
                         Xml.Tag version = tag.getChild("version").orElse(null);
-                        return tag.withContent(ListUtils.map(tag.getContent(), c -> c == version ? null : c));
+                        return tag.withContent(withoutVersion(tag, version));
                     }
                 } else if (isManagedDependencyTag()) {
                     ResolvedManagedDependency managed = findManagedDependency(tag);
@@ -200,19 +208,32 @@ public Xml.Document visitDocument(Xml.Document document, ExecutionContext ctx) {
                                 return null;
                             }
                             // some other element is also declared (executions, configuration, dependencies…), so just remove the version
-                            return tag.withContent(ListUtils.map(tag.getContent(), c -> c == version ? null : c));
+                            return tag.withContent(withoutVersion(tag, version));
                         }
                     } else {
                         Plugin p = findPlugin(tag);
                         if (p != null && matchesGroup(p) && matchesArtifact(p) && matchesVersion(p)) {
                             Xml.Tag version = tag.getChild("version").orElse(null);
-                            return tag.withContent(ListUtils.map(tag.getContent(), c -> c == version ? null : c));
+                            return tag.withContent(withoutVersion(tag, version));
                         }
                     }
                 }
                 return super.visitTag(tag, ctx);
             }
 
+            private @Nullable List<? extends Content> withoutVersion(Xml.Tag tag, Xml.@Nullable Tag version) {
+                return ListUtils.map(tag.getContent(), c -> {
+                    if (c == version) {
+                        Optional<String> value = ((Xml.Tag) c).getValue();
+                        if (value.isPresent() && isProperty(value.get())) {
+                            properties.addAll(ResolvedPom.placeholderHelper.getPlaceholders(value.get()));
+                        }
+                        return null;
+                    }
+                    return c;
+                });
+            }
+
             private boolean matchesGroup(ResolvedManagedDependency d) {
                 return StringUtils.isNullOrEmpty(groupPattern) || matchesGlob(d.getGroupId(), groupPattern);
             }