Skip to content

fix: emptyControlStatement in DefaultModelInterpolator #2373

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

Closed
Pankraz76 wants to merge 1 commit into from
Closed

fix: emptyControlStatement in DefaultModelInterpolator #2373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 1 addition & 14 deletions impl/maven-impl/src/main/java/org/apache/maven/impl/model/DefaultModelInterpolator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ private InnerInterpolator createInterpolator(

Map<String, Optional<String>> cache = new HashMap<>();
Comment thread
Pankraz76 marked this conversation as resolved.
Function<String, Optional<String>> ucb =
v -> Optional.ofNullable(callback(model, projectDir, request, problems, v));
v -> Optional.ofNullable(doCallback(model, projectDir, request, problems, v));
UnaryOperator<String> cb = v -> cache.computeIfAbsent(v, ucb).orElse(null);
BinaryOperator<String> postprocessor = (e, v) -> postProcess(projectDir, request, e, v);
return value -> {
Expand All @@ -129,19 +129,6 @@ protected List<String> getProjectPrefixes(ModelBuilderRequest request) {
: PROJECT_PREFIXES_3_1;
}

String callback(
Model model,
Path projectDir,
ModelBuilderRequest request,
ModelProblemCollector problems,
Comment thread
Pankraz76 marked this conversation as resolved.
String expression) {
String value = doCallback(model, projectDir, request, problems, expression);
if (value != null) {
// value = postProcess(projectDir, request, expression, value);
Comment thread
Pankraz76 marked this conversation as resolved.
}
return value;
}

private String postProcess(Path projectDir, ModelBuilderRequest request, String expression, String value) {
// path translation
String exp = unprefix(expression, getProjectPrefixes(request));
Expand Down
Loading