Skip to content

Add null check for artifact parameter in evaluateFileNameMapping #72

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

Open
elharo wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −0
Open

Add null check for artifact parameter in evaluateFileNameMapping #72

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
3 changes: 3 additions & 0 deletions src/main/java/org/apache/maven/shared/mapping/MappingUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,9 @@ private MappingUtils() {
* @return expression the expression to be evaluated
*/
public static String evaluateFileNameMapping(String expression, Artifact artifact) throws InterpolationException {
if (artifact == null) {
throw new IllegalArgumentException("artifact cannot be null");
}

RegexBasedInterpolator interpolator = new RegexBasedInterpolator("\\@\\{(", ")?([^}]+)\\}@");
interpolator.addValueSource(new ObjectBasedValueSource(artifact));
Expand Down
8 changes: 8 additions & 0 deletions src/test/java/org/apache/maven/shared/mapping/MappingUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;

/**
* Tests the mapping of file names.
Expand Down Expand Up @@ -117,4 +118,11 @@ void mappingWithOptionalClassifier() throws Exception {
"maven-test-lib-1.0-classifier.jar",
MappingUtils.evaluateFileNameMapping(mappingWithOptionalClassifier2, jar));
}

@Test
void mappingWithNullArtifact() {
assertThrows(
IllegalArgumentException.class,
() -> MappingUtils.evaluateFileNameMapping("@{artifactId}@.@{extension}@", null));
}
}