diff --git a/src/main/java/org/codehaus/plexus/util/MatchPattern.java b/src/main/java/org/codehaus/plexus/util/MatchPattern.java index 4dc757e3..93381c51 100644 --- a/src/main/java/org/codehaus/plexus/util/MatchPattern.java +++ b/src/main/java/org/codehaus/plexus/util/MatchPattern.java @@ -58,6 +58,14 @@ private MatchPattern(String source, String separator) { } } + /** + * Gets the source pattern for this match pattern. + * @return the source string without Ant or Regex pattern markers. + */ + public String getSource() { + return regexPattern == null ? source : regexPattern; + } + public boolean matchPath(String str, boolean isCaseSensitive) { if (regexPattern != null) { return str.matches(regexPattern); @@ -99,7 +107,7 @@ public boolean startsWith(String string) { return source.startsWith(string); } - static String[] tokenizePathToString(String path, String separator) { + public static String[] tokenizePathToString(String path, String separator) { List ret = new ArrayList(); StringTokenizer st = new StringTokenizer(path, separator); while (st.hasMoreTokens()) { diff --git a/src/main/java/org/codehaus/plexus/util/MatchPatterns.java b/src/main/java/org/codehaus/plexus/util/MatchPatterns.java index fd36a9d8..9c14bf00 100644 --- a/src/main/java/org/codehaus/plexus/util/MatchPatterns.java +++ b/src/main/java/org/codehaus/plexus/util/MatchPatterns.java @@ -16,6 +16,18 @@ private MatchPatterns(MatchPattern[] patterns) { this.patterns = patterns; } + /** + * Gets a list of enclosed MatchPattern sources. + * @return A list of enclosed MatchPattern sources. + */ + public List getSources() { + List sources = new ArrayList<>(); + for (MatchPattern pattern : patterns) { + sources.add(pattern.getSource()); + } + return sources; + } + /** *

Checks these MatchPatterns against a specified string.

* diff --git a/src/main/java/org/codehaus/plexus/util/SelectorUtils.java b/src/main/java/org/codehaus/plexus/util/SelectorUtils.java index f5122c78..571bc002 100644 --- a/src/main/java/org/codehaus/plexus/util/SelectorUtils.java +++ b/src/main/java/org/codehaus/plexus/util/SelectorUtils.java @@ -139,8 +139,8 @@ public static boolean matchPatternStart(String pattern, String str, boolean isCa } } - static boolean isAntPrefixedPattern(String pattern) { - return pattern.length() > (ANT_HANDLER_PREFIX.length() + PATTERN_HANDLER_SUFFIX.length() + 1) + public static boolean isAntPrefixedPattern(String pattern) { + return pattern.length() > (ANT_HANDLER_PREFIX.length() + PATTERN_HANDLER_SUFFIX.length()) && pattern.startsWith(ANT_HANDLER_PREFIX) && pattern.endsWith(PATTERN_HANDLER_SUFFIX); } @@ -253,8 +253,8 @@ private static String toOSRelatedPath(String pattern, String separator) { return pattern; } - static boolean isRegexPrefixedPattern(String pattern) { - return pattern.length() > (REGEX_HANDLER_PREFIX.length() + PATTERN_HANDLER_SUFFIX.length() + 1) + public static boolean isRegexPrefixedPattern(String pattern) { + return pattern.length() > (REGEX_HANDLER_PREFIX.length() + PATTERN_HANDLER_SUFFIX.length()) && pattern.startsWith(REGEX_HANDLER_PREFIX) && pattern.endsWith(PATTERN_HANDLER_SUFFIX); } @@ -708,4 +708,22 @@ public static String removeWhitespace(String input) { } return result.toString(); } + + /** + * Extract the pattern without the Regex or Ant prefix. In the case of Ant style matches ensure + * that the path uses specified separator. + * @param pattern the pattern to extract from. + * @param separator the system file name separator in the pattern. + * @return The pattern without the Regex or Ant prefix. + */ + public static String extractPattern(final String pattern, final String separator) { + if (isRegexPrefixedPattern(pattern)) { + return pattern.substring(REGEX_HANDLER_PREFIX.length(), pattern.length() - PATTERN_HANDLER_SUFFIX.length()); + } else { + String localPattern = isAntPrefixedPattern(pattern) + ? pattern.substring(ANT_HANDLER_PREFIX.length(), pattern.length() - PATTERN_HANDLER_SUFFIX.length()) + : pattern; + return toOSRelatedPath(localPattern, separator); + } + } } diff --git a/src/test/java/org/codehaus/plexus/util/MatchPatternTest.java b/src/test/java/org/codehaus/plexus/util/MatchPatternTest.java index 7dbef6b3..809b8ad4 100644 --- a/src/test/java/org/codehaus/plexus/util/MatchPatternTest.java +++ b/src/test/java/org/codehaus/plexus/util/MatchPatternTest.java @@ -18,6 +18,8 @@ import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -29,6 +31,20 @@ * @since 3.4.0 */ public class MatchPatternTest { + + /** + *

testGetSource

+ */ + @Test + public void testGetSource() { + MatchPattern mp = MatchPattern.fromString("ABC*"); + assertEquals("ABC*", mp.getSource()); + mp = MatchPattern.fromString("%ant[some/ABC*]"); + assertEquals("some/ABC*", mp.getSource()); + mp = MatchPattern.fromString("%regex[[ABC].*]"); + assertEquals("[ABC].*", mp.getSource()); + } + /** *

testMatchPath.

* @@ -58,4 +74,20 @@ public void testMatchPatternStart() { assertFalse(mp.matchPatternStart("XXXX", true)); assertFalse(mp.matchPatternStart("XXXX", false)); } + + /** + *

testTokenizePathToString.

+ */ + @Test + public void testTokenizePathToString() { + String[] expected = {"hello", "world"}; + String[] actual = MatchPattern.tokenizePathToString("hello/world", "/"); + assertArrayEquals(expected, actual); + + actual = MatchPattern.tokenizePathToString("/hello/world", "/"); + assertArrayEquals(expected, actual); + + actual = MatchPattern.tokenizePathToString("/hello/world/", "/"); + assertArrayEquals(expected, actual); + } } diff --git a/src/test/java/org/codehaus/plexus/util/MatchPatternsTest.java b/src/test/java/org/codehaus/plexus/util/MatchPatternsTest.java index 47074f8f..b31b5b2f 100644 --- a/src/test/java/org/codehaus/plexus/util/MatchPatternsTest.java +++ b/src/test/java/org/codehaus/plexus/util/MatchPatternsTest.java @@ -16,8 +16,12 @@ * limitations under the License. */ +import java.util.Arrays; +import java.util.List; + import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -29,6 +33,17 @@ * @since 3.4.0 */ public class MatchPatternsTest { + /** + *

testGetSource

+ */ + @Test + public void testGetSources() { + List expected = Arrays.asList("ABC**", "some/ABC*", "[ABC].*"); + MatchPatterns from = MatchPatterns.from("ABC**", "%ant[some/ABC*]", "%regex[[ABC].*]"); + List actual = from.getSources(); + assertEquals(expected, actual); + } + /** *

testMatches.

* diff --git a/src/test/java/org/codehaus/plexus/util/SelectorUtilsTest.java b/src/test/java/org/codehaus/plexus/util/SelectorUtilsTest.java index 21a10e2f..0cb98efe 100644 --- a/src/test/java/org/codehaus/plexus/util/SelectorUtilsTest.java +++ b/src/test/java/org/codehaus/plexus/util/SelectorUtilsTest.java @@ -20,6 +20,7 @@ import org.junit.jupiter.api.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; @@ -30,6 +31,41 @@ * @since 3.4.0 */ public class SelectorUtilsTest { + /** + *

testExtractPattern.

+ */ + @Test + public void testExtractPattern() { + assertEquals("[A-Z].*", SelectorUtils.extractPattern("%regex[[A-Z].*]", "/")); + assertEquals("ABC*", SelectorUtils.extractPattern("%ant[ABC*]", "/")); + assertEquals("some/ABC*", SelectorUtils.extractPattern("%ant[some/ABC*]", "/")); + assertEquals("some\\ABC*", SelectorUtils.extractPattern("%ant[some\\ABC*]", "\\")); + assertEquals("some/ABC*", SelectorUtils.extractPattern("%ant[some\\ABC*]", "/")); + assertEquals("some\\ABC*", SelectorUtils.extractPattern("%ant[some/ABC*]", "\\")); + } + + /** + *

testIsAntPrefixedPattern.

+ */ + @Test + public void testIsAntPrefixedPattern() { + assertTrue(SelectorUtils.isAntPrefixedPattern("%ant[A]")); // single char not allowed + assertTrue(SelectorUtils.isAntPrefixedPattern("%ant[AB]")); + assertFalse(SelectorUtils.isAntPrefixedPattern("%ant[]")); + assertFalse(SelectorUtils.isAntPrefixedPattern("*")); + } + + /** + *

testIsRegexPrefixedPattern.

+ */ + @Test + public void testIsRegexPrefixedPattern() { + assertTrue(SelectorUtils.isRegexPrefixedPattern("%regex[A]")); // single char not allowed + assertTrue(SelectorUtils.isRegexPrefixedPattern("%regex[.*]")); + assertFalse(SelectorUtils.isRegexPrefixedPattern("%regex[]")); + assertFalse(SelectorUtils.isRegexPrefixedPattern("*")); + } + /** *

testMatchPath_DefaultFileSeparator.

*/