Add StringUtils.startsWithFpathChar(String)

Author: idodeclare

src/org/opensolaris/opengrok/util/StringUtils.java

@@ -68,12 +68,24 @@ public final class StringUtils {
     private static final String FNAME_CHARS_PAT =
         "[a-zA-Z0-9_\\-\\.]";
 
-    private static final Pattern FNAME_CHARS_ANYMATCH =
-        Pattern.compile(FNAME_CHARS_PAT);
-
     private static final Pattern FNAME_CHARS_STARTSMATCH =
         Pattern.compile("^" + FNAME_CHARS_PAT);
 
+    /**
+     * Matches one of the same possible characters as CommonPath.lexh's {FPath}:
+     * <pre>
+     * {@code
+     * [a-zA-Z0-9_\-\./]
+     * }
+     * </pre>
+     * (Edit above and paste below [in NetBeans] for easy String escaping.)
+     */
+    private static final String FPATH_CHAR_PAT =
+        "[a-zA-Z0-9_\\-\\./]";
+
+    private static final Pattern FPATH_CHAR_STARTSMATCH =
+        Pattern.compile("^" + FPATH_CHAR_PAT);
+
     /**
      * Matches one of the same¹ possible characters as Common.lexh's {URIChar}:
      * <pre>
@@ -89,14 +101,11 @@ public final class StringUtils {
     private static final String URI_CHARS_PAT =
         "[a-zA-Z0-9\\-\\._~%:/\\?\\#\\[\\]@!\\$&\\'\\(\\)\\*\\+,;=]";
 
-    private static final Pattern URI_CHARS_ANYMATCH =
-        Pattern.compile(URI_CHARS_PAT);
-
     private static final Pattern URI_CHARS_STARTSMATCH =
         Pattern.compile("^" + URI_CHARS_PAT);
 
+    /** Private to enforce singleton */
     private StringUtils() {
-        // Only static utility methods
     }
 
     /**
@@ -195,39 +204,19 @@ public static int nthIndexOf(String str, String substr, int n) {
         return pos;
     }
 
-    /**
-     * Determines if the {@code value} contains characters matching
-     * Common.lexh's {FNameChar}.
-     * @param value the input to test
-     * @return true if {@code value} matches anywhere
-     */
-    public static boolean containsFnameChars(String value) {
-        return FNAME_CHARS_ANYMATCH.matcher(value).matches();
-    }
-
     /**
      * Determines if the {@code value} starts with characters matching
-     * Common.lexh's {FNameChar}.
+     * CommonPath.lexh's {FNameChar}.
      * @param value the input to test
      * @return true if {@code value} matches at its start
      */
     public static boolean startsWithFnameChars(String value) {
         return FNAME_CHARS_STARTSMATCH.matcher(value).matches();
     }
 
-    /**
-     * Determines if the {@code value} contains characters matching
-     * RFC-3986 and Common.lexh's definitions for allowable URI characters.
-     * @param value the input to test
-     * @return true if {@code value} matches anywhere
-     */
-    public static boolean containsURIChars(String value) {
-        return URI_CHARS_ANYMATCH.matcher(value).matches();
-    }
-
     /**
      * Determines if the {@code value} starts with characters matching
-     * RFC-3986 and Common.lexh's definitions for allowable URI characters.
+     * RFC-3986 and CommonPath.lexh's definitions for allowable URI characters.
      * @param value the input to test
      * @return true if {@code value} matches at its start
      */
@@ -288,4 +277,14 @@ public static int patindexOf(String value, Pattern pattern) {
         if (!m.find()) return -1;
         return m.start();
     }
+
+    /**
+     * Determines if the {@code value} starts with a character in
+     * CommonPath.lexh's {FPath}.
+     * @param value the input to test
+     * @return true if {@code value} matches at its start
+     */
+    public static boolean startsWithFpathChar(String value) {
+        return FPATH_CHAR_STARTSMATCH.matcher(value).matches();
+    }
 }