Skip to content
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

Jump to bottom

EntityExtractFilter match multiline entity #37

Merged
merged 2 commits into from
Jun 28, 2022
Merged

EntityExtractFilter match multiline entity #37

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8dfed40
allow regexp match multiline entity
maximthomas Jun 27, 2022
ca6b212
Merge remote-tracking branch 'origin/master' into issues/entityextrac…
maximthomas Jun 27, 2022
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
10 changes: 4 additions & 6 deletions openig-core/src/main/java/org/forgerock/openig/regex/StreamPatternMatches.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.util.NoSuchElementException;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.util.stream.Collectors;

/**
* Iterates through multiple regular expression matches within a character stream.
Expand Down Expand Up @@ -119,12 +120,9 @@ private void notClosed() throws IOException {

private void readahead() throws IOException {
notClosed();
while (matches == null || !matches.hasNext()) {
String line = input.readLine();
if (line == null) {
break;
}
matches = new StringPatternMatches(line, Arrays.asList(patterns), discard);
if (matches == null || !matches.hasNext()) {
String body = input.lines().collect(Collectors.joining("\n"));
matches = new StringPatternMatches(body, Arrays.asList(patterns), discard);
}
}
}