Skip to content

Fix WordUtils.containsAllWords missing words across line breaks #754

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

Merged
garydgregory merged 1 commit into from
Jun 26, 2026
+9 −1
Merged

Fix WordUtils.containsAllWords missing words across line breaks #754

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
2 changes: 1 addition & 1 deletion src/main/java/org/apache/commons/text/WordUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ public static boolean containsAllWords(final CharSequence word, final CharSequen
if (StringUtils.isBlank(w)) {
return false;
}
final Pattern p = Pattern.compile(".*\\b" + Pattern.quote(w.toString()) + "\\b.*");
final Pattern p = Pattern.compile(".*\\b" + Pattern.quote(w.toString()) + "\\b.*", Pattern.DOTALL);
if (!p.matcher(word).matches()) {
return false;
}
Expand Down
8 changes: 8 additions & 0 deletions src/test/java/org/apache/commons/text/WordUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,14 @@ void testContainsAllWords_StringString() {
assertTrue(WordUtils.containsAllWords("ab x", "ab", "x"));
}

@Test
void testContainsAllWordsWithNewline() {
assertTrue(WordUtils.containsAllWords("foo\nbar", "bar"));
assertTrue(WordUtils.containsAllWords("foo\nbar", "foo"));
assertTrue(WordUtils.containsAllWords("lorem ipsum\ndolor sit\namet", "ipsum", "amet", "lorem"));
assertFalse(WordUtils.containsAllWords("foo\nbar", "baz"));
}

@Test
void testContainsAllWordsWithNull() {
assertFalse(WordUtils.containsAllWords("M", (CharSequence) null));
Expand Down
Loading