commit acee2ce78b9126afd47dca23ef5fe9e0364c7815
author Gary Gregory <garydgregory@gmail.com> Tue Jul 14 11:06:47 2020 -0400
committer Gary Gregory <garydgregory@gmail.com> Tue Jul 14 11:06:47 2020 -0400
tree 23d6560c1eace4a89d5dcd86dba4a613a6c70e34
parent f2af242ba04917c08385b4587072983166cbcf5e

Create the best kind of matcher.

src/main/java/org/apache/commons/text/matcher/StringMatcherFactory.java

diff --git a/src/main/java/org/apache/commons/text/matcher/StringMatcherFactory.java b/src/main/java/org/apache/commons/text/matcher/StringMatcherFactory.java
index b539a0b..c08b795 100644
--- a/src/main/java/org/apache/commons/text/matcher/StringMatcherFactory.java
+++ b/src/main/java/org/apache/commons/text/matcher/StringMatcherFactory.java
@@ -96,6 +96,13 @@
      * @since 1.9
      */
     public StringMatcher andMatcher(final StringMatcher... stringMatchers) {
+        final int len = ArrayUtils.getLength(stringMatchers);
+        if (len == 0) {
+            return NONE_MATCHER;
+        }
+        if (len == 1) {
+            return stringMatchers[0];
+        }
         return new AbstractStringMatcher.AndStringMatcher(stringMatchers);
     }
 
@@ -116,10 +123,11 @@
      * @return a new matcher for the given char[]
      */
     public StringMatcher charSetMatcher(final char... chars) {
-        if (ArrayUtils.isEmpty(chars)) {
+        final int len = ArrayUtils.getLength(chars);
+        if (len == 0) {
             return NONE_MATCHER;
         }
-        if (chars.length == 1) {
+        if (len == 1) {
             return new AbstractStringMatcher.CharMatcher(chars[0]);
         }
         return new AbstractStringMatcher.CharSetMatcher(chars);
@@ -132,10 +140,11 @@
      * @return a new Matcher for the given characters
      */
     public StringMatcher charSetMatcher(final String chars) {
-        if (StringUtils.isEmpty(chars)) {
+        final int len = StringUtils.length(chars);
+        if (len == 0) {
             return NONE_MATCHER;
         }
-        if (chars.length() == 1) {
+        if (len == 1) {
             return new AbstractStringMatcher.CharMatcher(chars.charAt(0));
         }
         return new AbstractStringMatcher.CharSetMatcher(chars.toCharArray());
@@ -225,7 +234,7 @@
      * @return a new Matcher for the given String
      */
     public StringMatcher stringMatcher(final String str) {
-        return str == null ? NONE_MATCHER : stringMatcher(str.toCharArray());
+        return StringUtils.isEmpty(str) ? NONE_MATCHER : stringMatcher(str.toCharArray());
     }
 
     /**