Skip to content
Open
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
0973eaa
Add RemoveUnusedParams recipe
iddeepak May 16, 2025
d93a14c
Apply suggestions from code review
timtebeek May 16, 2025
84d8671
Updated review comments
iddeepak May 16, 2025
6365a31
Updated review comments
iddeepak May 16, 2025
e718033
Update src/main/java/org/openrewrite/staticanalysis/RemoveUnusedParam…
iddeepak May 16, 2025
c735b6e
Updated review comments
iddeepak May 16, 2025
afff3de
Merge branch 'main' into feature/RemoveUnusedParams
timtebeek May 17, 2025
e6a633b
Update src/main/java/org/openrewrite/staticanalysis/RemoveUnusedParam…
iddeepak May 17, 2025
674a465
Update src/main/java/org/openrewrite/staticanalysis/RemoveUnusedParam…
iddeepak May 17, 2025
e656fa2
Updated review comments
iddeepak May 18, 2025
11ef2ac
Updated review comments
iddeepak May 18, 2025
f88dd77
Updated review comments
iddeepak May 18, 2025
6d989cc
Updated review comments
iddeepak May 19, 2025
80b57e8
Apply suggestions from code review
timtebeek May 19, 2025
95628c3
Updated review comments
iddeepak May 19, 2025
a6acdef
Added Test for nested inheritance override chain
iddeepak May 19, 2025
a4e7e3d
Update src/main/java/org/openrewrite/staticanalysis/RemoveUnusedParam…
iddeepak May 19, 2025
8e8953f
Update src/main/java/org/openrewrite/staticanalysis/RemoveUnusedParam…
iddeepak May 19, 2025
e03e540
Merge branch 'main' into feature/RemoveUnusedParams
timtebeek Jun 1, 2025
328984d
Merge branch 'openrewrite:main' into feature/RemoveUnusedParams
iddeepak Jun 6, 2025
c306682
Merge branch 'main' into feature/RemoveUnusedParams
timtebeek Jun 14, 2025
298ee1f
Show two cases missed with conflicts after removal
timtebeek Jun 14, 2025
9f689ab
Show another case missed: callers should be updated too
timtebeek Jun 14, 2025
28beff4
Remove unnecessary `final` to make intentional ones stand out
timtebeek Jun 14, 2025
0b77aa9
Inline `collectOverrideSignature` only used once
timtebeek Jun 14, 2025
c9c21ca
Move methods into named visitor for logical grouping
timtebeek Jun 14, 2025
d1bf138
Add missing braces
timtebeek Jun 14, 2025
25ece10
Use `reduce` in `collectUsedParameters`
timtebeek Jun 14, 2025
6bd0405
use ListUtils for referential comparison
iddeepak Jun 17, 2025
459d327
use SemanticallyEqual comparison
iddeepak Jun 17, 2025
12ccb6c
fix avoidDirectConflict and avoidInheritedConflict
iddeepak Jun 18, 2025
c527506
fix avoidDirectConflict
iddeepak Jun 18, 2025
dd23526
fix avoidInheritiedConflict
iddeepak Jun 18, 2025
03056a5
clean up
iddeepak Jun 18, 2025
f4a0ac0
clean up
iddeepak Jun 18, 2025
e1f414a
Update src/main/java/org/openrewrite/staticanalysis/RemoveUnusedParam…
iddeepak Jun 18, 2025
2cdeff6
fix cascadeRemove
iddeepak Jun 18, 2025
4f6b346
Update src/main/java/org/openrewrite/staticanalysis/RemoveUnusedParam…
iddeepak Jun 18, 2025
5e8d863
Merge branch 'main' into feature/RemoveUnusedParams
iddeepak Jun 18, 2025
ec388d6
fix build
iddeepak Jun 18, 2025
00817b3
Merge branch 'main' into feature/RemoveUnusedParams
timtebeek Jun 24, 2025
83157dc
Merge branch 'main' into feature/RemoveUnusedParams
timtebeek Jul 26, 2025
5be9333
Update src/main/java/org/openrewrite/staticanalysis/RemoveUnusedParam…
timtebeek Jul 27, 2025
1ee3249
Reduce warnings
timtebeek Aug 4, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
211 changes: 211 additions & 0 deletions src/main/java/org/openrewrite/staticanalysis/RemoveUnusedParams.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,211 @@
/*
* Copyright 2025 the original author or authors.
* <p>
* Licensed under the Moderne Source Available License (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
* <p>
* https://docs.moderne.io/licensing/moderne-source-available-license
* <p>
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.openrewrite.staticanalysis;

import org.openrewrite.ExecutionContext;
import org.openrewrite.java.JavaIsoVisitor;
import org.openrewrite.java.NoMissingTypes;
import org.openrewrite.java.tree.J;
import org.openrewrite.java.tree.Statement;
import org.openrewrite.Preconditions;
import org.openrewrite.Repeat;
import org.openrewrite.ScanningRecipe;
import org.openrewrite.TreeVisitor;

import java.util.ArrayDeque;
import java.util.Deque;
import java.time.Duration;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;

public class RemoveUnusedParams extends ScanningRecipe<RemoveUnusedParams.Accumulator> {
static class Accumulator {
/**
* Signatures of all methods that override or implement a supertype method.
* Each entry is a string of the form
* <code>"fully.qualified.ClassName#methodName(paramType1,paramType2,...)"</code>.
* Parameters of these methods are considered part of the public API
* and will not be removed even if they appear unused.
*/
private final Set<String> overrideSignatures = new HashSet<>();

void add(final String signature) {
overrideSignatures.add(signature);
}

boolean contains(final String signature) {
return overrideSignatures.contains(signature);
}
}

private static final String OVERRIDE_ANNOTATION = "Override";
private static final int MAX_ATTEMPTS = 5;

@Override
public String getDisplayName() {
return "Remove obsolete constructor and method parameters";
}

@Override
public String getDescription() {
return "Removes obsolete method parameters from signature, not used in body.";
}

@Override
public Duration getEstimatedEffortPerOccurrence() {
return Duration.ofMinutes(MAX_ATTEMPTS);
}

@Override
public Accumulator getInitialValue(final ExecutionContext ctx) {
return new Accumulator();
}

@Override
public TreeVisitor<?, ExecutionContext> getScanner(final Accumulator acc) {
return new JavaIsoVisitor<ExecutionContext>() {
@Override
public J.MethodDeclaration visitMethodDeclaration(final J.MethodDeclaration method, final ExecutionContext ctx) {
J.MethodDeclaration m = super.visitMethodDeclaration(method, ctx);
collectOverrideSignature(m, acc);
return m;
}
};
}

private void collectOverrideSignature(final J.MethodDeclaration m, final Accumulator acc) {
m.getLeadingAnnotations().stream()
.map(J.Annotation::getSimpleName)
.filter(OVERRIDE_ANNOTATION::equals)
.findAny()
.ifPresent(annotationName -> acc.add(buildSignature(m)));
}

@Override
public TreeVisitor<?, ExecutionContext> getVisitor(final Accumulator acc) {
return Preconditions.check(new NoMissingTypes(),
Repeat.repeatUntilStable(new JavaIsoVisitor<ExecutionContext>() {

@Override
public J.MethodDeclaration visitMethodDeclaration(final J.MethodDeclaration method, final ExecutionContext ctx) {
J.MethodDeclaration m = super.visitMethodDeclaration(method, ctx);
if (shouldPruneParameters(m, acc)) {
Set<String> usedParams = collectUsedParameters(m);
List<Statement> prunedParams = filterUnusedParameters(m, usedParams);
if (!prunedParams.equals(m.getParameters())) {
return m.withParameters(prunedParams);
}
}
return m;
}
})
);
}

private boolean shouldPruneParameters(final J.MethodDeclaration m, final Accumulator acc) {
return m.getBody() != null
&& !m.hasModifier(J.Modifier.Type.Native)
&& m.getLeadingAnnotations().isEmpty()
&& !acc.contains(buildSignature(m));
}

private String buildSignature(final J.MethodDeclaration m) {
return m.getSimpleName() + "#"
+ m.getMethodType().getParameterTypes().stream()
.map(Object::toString)
.collect(Collectors.joining(","));
}

private Set<String> collectUsedParameters(final J.MethodDeclaration m) {
Set<String> used = new HashSet<>();
Deque<Set<String>> shadowStack = new ArrayDeque<>();

new JavaIsoVisitor<Set<String>>() {
@Override
public J.Block visitBlock(final J.Block block, final Set<String> u) {
shadowStack.push(new HashSet<>());
try {
return super.visitBlock(block, u);
} finally {
shadowStack.pop();
}
}

@Override
public J.VariableDeclarations visitVariableDeclarations(final J.VariableDeclarations decl, final Set<String> u) {
decl.getVariables().forEach(v -> shadowStack.peek().add(v.getSimpleName()));
return super.visitVariableDeclarations(decl, u);
}

@Override
public J.Identifier visitIdentifier(final J.Identifier id, final Set<String> u) {
if (isVisibleParameter(id, m, shadowStack)) {
u.add(id.getSimpleName());
}
return id;
}
}.visit(m.getBody(), used);

return used;
}

private boolean isVisibleParameter(final J.Identifier id, final J.MethodDeclaration m, final Deque<Set<String>> shadowStack) {
return !isShadowed(id.getSimpleName(), shadowStack) &&
isDeclaredAsParameter(id.getSimpleName(), m);
}

private boolean isShadowed(final String name, final Deque<Set<String>> shadowStack) {
return shadowStack.stream().anyMatch(scope -> scope.contains(name));
}

private boolean isDeclaredAsParameter(final String name, final J.MethodDeclaration m) {
return m.getParameters().stream()
.filter(p -> p instanceof J.VariableDeclarations)
.flatMap(p -> ((J.VariableDeclarations) p).getVariables().stream())
.anyMatch(v -> v.getSimpleName().equals(name));
}

private List<Statement> filterUnusedParameters(final J.MethodDeclaration m, final Set<String> usedParams) {
return m.getParameters().stream()
.flatMap(param -> {
if (param instanceof J.VariableDeclarations) {
J.VariableDeclarations decl = (J.VariableDeclarations) param;
return filterDeclaration(decl, usedParams);
}
return Stream.of(param);
})
.collect(Collectors.toList());
}


private Stream<Statement> filterDeclaration(final J.VariableDeclarations decl, final Set<String> usedParams) {
if (!decl.getLeadingAnnotations().isEmpty()) {
return Stream.of(decl);
}
List<J.VariableDeclarations.NamedVariable> kept =
decl.getVariables().stream()
.filter(v -> usedParams.contains(v.getSimpleName()))
.collect(Collectors.toList());

return kept.isEmpty() ?
Stream.empty() :
Stream.of(decl.withVariables(kept));
}

}
Loading