Polish string matcher and path matcher

Author: robinshine

commons-utils/src/main/java/io/onedev/commons/utils/PathUtils.java

@@ -9,13 +9,8 @@
 
 import com.google.common.base.Splitter;
 
-import io.onedev.commons.utils.stringmatch.ChildAwareMatcher;
-import io.onedev.commons.utils.stringmatch.Matcher;
-
 public class PathUtils {
 
-	private static final Matcher CHILDAWARE_MATCHER = new ChildAwareMatcher();
-
     /**
      * Match specified path against a collection of base paths to find out the longest match.
      * For instance, if collection contains /path1/path2/path3 and /path1/path2, the eager
@@ -102,10 +97,6 @@ public static String parseRelative(String longPath, String shortPath) {
     	return null;
     }
 
-	public static boolean matchChildAware(String pattern, String value) {
-		return CHILDAWARE_MATCHER.matches(pattern, value);
-	}
-
     /**
 	 * Normalize a path separated with forward slash to remove single and double dots. 
 	 * Adapted from FilenameUtils.normalize(filename)

commons-utils/src/main/java/io/onedev/commons/utils/stringmatch/Matcher.java renamed to commons-utils/src/main/java/io/onedev/commons/utils/match/Matcher.java

@@ -1,4 +1,4 @@
-package io.onedev.commons.utils.stringmatch;
+package io.onedev.commons.utils.match;
 
 public interface Matcher {
 	boolean matches(String pattern, String value);

commons-utils/src/main/java/io/onedev/commons/utils/stringmatch/WildcardPathMatcher.java renamed to commons-utils/src/main/java/io/onedev/commons/utils/match/PathMatcher.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package io.onedev.commons.utils.stringmatch;
+package io.onedev.commons.utils.match;
 
 import io.onedev.commons.utils.StringUtils;
 
@@ -59,9 +59,9 @@
  *
  * @since 16.07.2003
  */
-public class WildcardPathMatcher implements Matcher {
+public class PathMatcher implements Matcher {
 
-	private static final Matcher STRING_MATCHER = new WildcardStringMatcher();
+	private static final Matcher STRING_MATCHER = new StringMatcher();
 
     //TODO - complete JavaDoc
 
@@ -86,7 +86,10 @@ public boolean isPattern(String path) {
         return (path.indexOf('*') != -1 || path.indexOf('?') != -1);
     }
 
+    @Override
     public boolean matches(String pattern, String str) {
+    	if (pattern.endsWith("/"))
+    		pattern += "**";
         return doMatch(pattern, str, true);
     }
 

commons-utils/src/main/java/io/onedev/commons/utils/stringmatch/PatternApplied.java renamed to commons-utils/src/main/java/io/onedev/commons/utils/match/PatternApplied.java

@@ -1,4 +1,4 @@
-package io.onedev.commons.utils.stringmatch;
+package io.onedev.commons.utils.match;
 
 import java.io.Serializable;
 

commons-utils/src/main/java/io/onedev/commons/utils/stringmatch/WildcardStringMatcher.java renamed to commons-utils/src/main/java/io/onedev/commons/utils/match/StringMatcher.java

@@ -1,6 +1,6 @@
-package io.onedev.commons.utils.stringmatch;
+package io.onedev.commons.utils.match;
 
-public class WildcardStringMatcher implements Matcher {
+public class StringMatcher implements Matcher {
 
 	@Override
 	public boolean matches(String pattern, String str) {

commons-utils/src/main/java/io/onedev/commons/utils/stringmatch/WildcardUtils.java renamed to commons-utils/src/main/java/io/onedev/commons/utils/match/WildcardUtils.java

@@ -1,4 +1,4 @@
-package io.onedev.commons.utils.stringmatch;
+package io.onedev.commons.utils.match;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -9,9 +9,9 @@
 
 public class WildcardUtils {
 
-	private static final Matcher PATH_MATCHER = new WildcardPathMatcher();
+	private static final Matcher PATH_MATCHER = new PathMatcher();
 
-	private static final Matcher STRING_MATCHER = new WildcardStringMatcher();
+	private static final Matcher STRING_MATCHER = new StringMatcher();
 
 	/**
      * Tests whether or not a given path matches a given pattern using of 
@@ -47,10 +47,6 @@ public static boolean matchString(String pattern, String str) {
     	return STRING_MATCHER.matches(pattern, str);
     }
 
-    public static boolean hasWildcards(String str) {
-    	return (str.indexOf('*') != -1 || str.indexOf('?') != -1);
-    }
-    
     private static int indexOf(String str, String substr, int index) {
         if (index >= str.length()) {
             return (substr.length() == 0 ? str.length(): -1);

commons-utils/src/main/java/io/onedev/commons/utils/stringmatch/ChildAwareMatcher.java

@@ -1,6 +1,6 @@
 package io.onedev.commons.utils.stringmatch;
 
-import static io.onedev.commons.utils.stringmatch.WildcardUtils.*;
+import static io.onedev.commons.utils.match.WildcardUtils.*;
 import static org.junit.Assert.*;
 
 import org.junit.Test;