From 623e03b9b557b24304641e6f2a73907622738c3d Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Mon, 27 Mar 2017 23:08:03 +0100 Subject: Replace null check with isNull --- .../org/zwobble/mammoth/internal/styles/parsing/RegexTokeniser.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/main/java/org') diff --git a/src/main/java/org/zwobble/mammoth/internal/styles/parsing/RegexTokeniser.java b/src/main/java/org/zwobble/mammoth/internal/styles/parsing/RegexTokeniser.java index 7ae24c0..4386e0a 100644 --- a/src/main/java/org/zwobble/mammoth/internal/styles/parsing/RegexTokeniser.java +++ b/src/main/java/org/zwobble/mammoth/internal/styles/parsing/RegexTokeniser.java @@ -6,6 +6,7 @@ import java.util.Optional; import java.util.regex.Matcher; import java.util.regex.Pattern; +import static java.util.Objects.isNull; import static org.zwobble.mammoth.internal.util.Iterables.*; import static org.zwobble.mammoth.internal.util.Lists.eagerMap; @@ -42,7 +43,7 @@ public class RegexTokeniser { Matcher matcher = pattern.matcher(value); List> tokens = new ArrayList<>(); while (matcher.lookingAt()) { - Optional groupIndex = tryFind(intRange(0, this.rules.size()), index -> matcher.group(index + 1) != null); + Optional groupIndex = tryFind(intRange(0, this.rules.size()), index -> !isNull(matcher.group(index + 1))); if (groupIndex.isPresent()) { T tokenType = this.rules.get(groupIndex.get()); tokens.add(new Token<>(matcher.regionStart(), tokenType, matcher.group())); -- cgit v1.2.3