Skip to content

Remove extra variable #2398

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 6, 2025
Merged

Remove extra variable #2398

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6f41990
Reapply "remove extra variable"
elharo May 28, 2025
35c9b13
spotless
elharo May 28, 2025
45b726e
fix
elharo May 28, 2025
2bbaf16
finalize argument
elharo May 28, 2025
d8b0edf
remove final
elharo Jun 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
12 changes: 5 additions & 7 deletions impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultInterpolator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,10 +263,9 @@ private static String doSubstVars(
// Using the start and stop delimiter indices, extract
// the first, deepest nested variable placeholder.
String variable = val.substring(startDelim + DELIM_START.length(), stopDelim);
String org = variable;

String substValue = processSubstitution(
variable, org, cycleMap, configProps, callback, postprocessor, defaultsToEmptyString);
Copy link
Contributor

@Pankraz76 Pankraz76 May 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, should be covered by https://pmd.github.io/pmd/pmd_rules_java_bestpractices.html#unusedassignment

Copy link
Contributor

@Pankraz76 Pankraz76 May 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems its currently renaming not removal.

String substValue =
processSubstitution(variable, cycleMap, configProps, callback, postprocessor, defaultsToEmptyString);

// Append the leading characters, the substituted value of
// the variable, and the trailing characters to get the new
Expand All @@ -285,7 +284,6 @@ private static String doSubstVars(

private static String processSubstitution(
String variable,
String org,
Set<String> cycleMap,
Map<String, String> configProps,
UnaryOperator<String> callback,
Expand Down Expand Up @@ -327,8 +325,8 @@ private static String processSubstitution(
String opValue = variable.substring(idx + 2, nextIdx >= 0 ? nextIdx : variable.length());

// Process the operator value through substitution if it contains variables
String processedOpValue =
doSubstVars(opValue, org, cycleMap, configProps, callback, postprocessor, defaultsToEmptyString);
String processedOpValue = doSubstVars(
opValue, variable, cycleMap, configProps, callback, postprocessor, defaultsToEmptyString);

// Apply the operator
if (":+".equals(op)) {
Expand All @@ -344,7 +342,7 @@ private static String processSubstitution(
break;
}
} else {
throw new InterpolatorException("Bad substitution operator in: ${" + org + "}");
throw new InterpolatorException("Bad substitution operator in: ${" + variable + "}");
}

startIdx = nextIdx >= 0 ? nextIdx : variable.length();
Expand Down