-
Notifications
You must be signed in to change notification settings - Fork 23
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[MINVOKER-307] Support
@{..} syntax in mavenOpts
- Loading branch information
1 parent
e4dea9d
commit d3b07d0
Showing
5 changed files
with
165 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
src/main/java/org/apache/maven/plugins/invoker/InterpolatorUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * 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.apache.maven.plugins.invoker; | ||
|
|
||
| import javax.inject.Inject; | ||
| import javax.inject.Named; | ||
|
|
||
| import org.apache.maven.plugin.MojoExecutionException; | ||
| import org.apache.maven.project.MavenProject; | ||
| import org.codehaus.plexus.interpolation.InterpolationException; | ||
| import org.codehaus.plexus.interpolation.Interpolator; | ||
| import org.codehaus.plexus.interpolation.MapBasedValueSource; | ||
| import org.codehaus.plexus.interpolation.RegexBasedInterpolator; | ||
|
|
||
| /** | ||
| * Helper component for interpolating values. | ||
| */ | ||
| @Named | ||
| class InterpolatorUtils { | ||
|
|
||
| private final Interpolator atInterpolator; | ||
|
|
||
| /** | ||
| * A default constructor. | ||
| * | ||
| * @param mavenProject a MavenProject | ||
| */ | ||
| @Inject | ||
| InterpolatorUtils(MavenProject mavenProject) { | ||
| atInterpolator = new RegexBasedInterpolator("[@\\$]\\{(.+?)", "}"); | ||
| atInterpolator.addValueSource(new MapBasedValueSource(mavenProject.getProperties())); | ||
| } | ||
|
|
||
| public String interpolateAtPattern(String value) throws MojoExecutionException { | ||
|
|
||
| if (value == null || !(value.contains("@{") || value.contains("${"))) { | ||
| return value; | ||
| } | ||
|
|
||
| try { | ||
| return atInterpolator.interpolate(value); | ||
| } catch (InterpolationException e) { | ||
| throw new MojoExecutionException(e.getMessage(), e); | ||
| } | ||
| } | ||
| } |
71 changes: 71 additions & 0 deletions
71
src/test/java/org/apache/maven/plugins/invoker/InterpolatorUtilsTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * 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.apache.maven.plugins.invoker; | ||
|
|
||
| import java.util.Properties; | ||
| import java.util.stream.Stream; | ||
|
|
||
| import org.apache.maven.project.MavenProject; | ||
| import org.junit.jupiter.api.extension.ExtendWith; | ||
| import org.junit.jupiter.params.ParameterizedTest; | ||
| import org.junit.jupiter.params.provider.Arguments; | ||
| import org.junit.jupiter.params.provider.MethodSource; | ||
| import org.mockito.Mock; | ||
| import org.mockito.junit.jupiter.MockitoExtension; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| @ExtendWith(MockitoExtension.class) | ||
| class InterpolatorUtilsTest { | ||
|
|
||
| @Mock | ||
| private MavenProject mavenProject; | ||
|
|
||
| static Stream<Arguments> testAtInterpolate() { | ||
| return Stream.of( | ||
| Arguments.of(null, null), | ||
| Arguments.of("test", "test"), | ||
| Arguments.of("test@test", "test@test"), | ||
| Arguments.of("test$test", "test$test"), | ||
| Arguments.of("@{test}", "testInProps"), | ||
| Arguments.of("${test}", "testInProps"), | ||
| Arguments.of("test @{test} test", "test testInProps test"), | ||
| Arguments.of("test ${test} test", "test testInProps test"), | ||
| Arguments.of("@{test} @{test}", "testInProps testInProps"), | ||
| Arguments.of("${test} ${test}", "testInProps testInProps"), | ||
| Arguments.of("@{test} ${test}", "testInProps testInProps")); | ||
| } | ||
|
|
||
| @ParameterizedTest | ||
| @MethodSource | ||
| void testAtInterpolate(String input, String expected) throws Exception { | ||
| // given | ||
| Properties properties = new Properties(); | ||
| properties.put("test", "testInProps"); | ||
| when(mavenProject.getProperties()).thenReturn(properties); | ||
| InterpolatorUtils interpolatorUtils = new InterpolatorUtils(mavenProject); | ||
|
|
||
| // when | ||
| String output = interpolatorUtils.interpolateAtPattern(input); | ||
|
|
||
| // then | ||
| assertThat(output).isEqualTo(expected); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters