Skip to content

fix: raw exception catch in DefaultModelInterpolator #2445

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: raw exception catch in DefaultModelInterpolator #2445

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
64 changes: 18 additions & 46 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 @@ -23,12 +23,8 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.function.BinaryOperator;
import java.util.function.Function;
import java.util.function.UnaryOperator;

import org.apache.maven.api.di.Inject;
import org.apache.maven.api.di.Named;
Expand All @@ -44,6 +40,7 @@
import org.apache.maven.api.services.model.PathTranslator;
import org.apache.maven.api.services.model.RootLocator;
import org.apache.maven.api.services.model.UrlNormalizer;
import org.apache.maven.impl.model.reflection.IntrospectionException;
import org.apache.maven.impl.model.reflection.ReflectionValueExtractor;
import org.apache.maven.model.v4.MavenTransformer;

Expand Down Expand Up @@ -101,21 +98,21 @@ interface InnerInterpolator {
@Override
public Model interpolateModel(
Model model, Path projectDir, ModelBuilderRequest request, ModelProblemCollector problems) {
InnerInterpolator innerInterpolator = createInterpolator(model, projectDir, request, problems);
return new MavenTransformer(innerInterpolator::interpolate).visit(model);
return new MavenTransformer(createInterpolator(model, projectDir, request, problems)::interpolate).visit(model);
}

private InnerInterpolator createInterpolator(
Model model, Path projectDir, ModelBuilderRequest request, ModelProblemCollector problems) {

Map<String, Optional<String>> cache = new HashMap<>();
Function<String, Optional<String>> ucb =
v -> Optional.ofNullable(callback(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 -> {
try {
return interpolator.interpolate(value, cb, postprocessor, false);
return interpolator.interpolate(
value,
v -> new HashMap<String, Optional<String>>()
.computeIfAbsent(
v, v2 -> Optional.ofNullable(doCallback(model, projectDir, request, v2)))
.orElse(null),
(e, v1) -> postProcess(projectDir, request, e, v1),
false);
} catch (InterpolatorException e) {
problems.add(BuilderProblem.Severity.ERROR, ModelProblem.Version.BASE, e.getMessage(), e);
return null;
Expand All @@ -129,23 +126,9 @@ protected List<String> getProjectPrefixes(ModelBuilderRequest request) {
: PROJECT_PREFIXES_3_1;
}

String callback(
Model model,
Path projectDir,
ModelBuilderRequest request,
ModelProblemCollector problems,
String expression) {
String value = doCallback(model, projectDir, request, problems, expression);
if (value != null) {
// value = postProcess(projectDir, request, expression, value);
}
return value;
}

private String postProcess(Path projectDir, ModelBuilderRequest request, String expression, String value) {
// path translation
String exp = unprefix(expression, getProjectPrefixes(request));
if (TRANSLATED_PATH_EXPRESSIONS.contains(exp)) {
if (TRANSLATED_PATH_EXPRESSIONS.contains(unprefix(expression, getProjectPrefixes(request)))) {
value = pathTranslator.alignToBaseDirectory(value, projectDir);
}
// normalize url
Expand All @@ -164,12 +147,7 @@ private String unprefix(String expression, List<String> prefixes) {
return expression;
}

String doCallback(
Model model,
Path projectDir,
ModelBuilderRequest request,
ModelProblemCollector problems,
String expression) {
String doCallback(Model model, Path projectDir, ModelBuilderRequest request, String expression) {
// basedir (the prefixed combos are handled below)
if ("basedir".equals(expression)) {
return projectProperty(model, projectDir, expression, false);
Expand Down Expand Up @@ -220,8 +198,7 @@ String projectProperty(Model model, Path projectDir, String subExpr, boolean pre
if (value != null) {
return value.toString();
}
} catch (Exception e) {
// addFeedback("Failed to extract \'" + expression + "\' from: " + root, e);
} catch (IntrospectionException ignored) {
}
} else if (prefixed && subExpr.equals("baseUri")) {
return projectDir.toAbsolutePath().toUri().toASCIIString();
Expand All @@ -232,8 +209,7 @@ String projectProperty(Model model, Path projectDir, String subExpr, boolean pre
if (value != null) {
return value.toString();
}
} catch (Exception e) {
// addFeedback("Failed to extract \'" + expression + "\' from: " + root, e);
} catch (IntrospectionException ignored) {
}
} else if (prefixed && subExpr.equals("rootDirectory")) {
return rootLocator.findMandatoryRoot(projectDir).toString();
Expand All @@ -244,19 +220,15 @@ String projectProperty(Model model, Path projectDir, String subExpr, boolean pre
if (value != null) {
return value.toString();
}
} catch (Exception e) {
// addFeedback("Failed to extract \'" + expression + "\' from: " + root, e);
} catch (IntrospectionException ignored) {
}
}
}
try {
Object value = ReflectionValueExtractor.evaluate(subExpr, model, false);
if (value != null) {
return value.toString();
}
} catch (Exception e) {
// addFeedback("Failed to extract \'" + expression + "\' from: " + root, e);
return value != null ? value.toString() : null;
} catch (IntrospectionException ignored) {
return null;
}
return null;
}
}
Loading