From 0cbcc12a6e368d0f78dd909976b25d1cde3614ad Mon Sep 17 00:00:00 2001 From: Alejandro Abdelnur Date: Thu, 20 Oct 2011 17:42:25 +0000 Subject: [PATCH] HADOOP-7758. Make GlobFilter class public. (tucu) git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1186960 13f79535-47bb-0310-9956-ffa450edef68 --- .../hadoop-common/CHANGES.txt | 2 ++ .../java/org/apache/hadoop/fs/GlobFilter.java | 28 ++++++++++++++++--- 2 files changed, 26 insertions(+), 4 deletions(-) diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index c72f9f7f317..6aa4b006194 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -53,6 +53,8 @@ Trunk (unreleased changes) HADOOP-7729. Send back valid HTTP response if user hits IPC port with HTTP GET. (todd) + HADOOP-7758. Make GlobFilter class public. (tucu) + BUGS HADOOP-7606. Upgrade Jackson to version 1.7.1 to match the version required diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/GlobFilter.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/GlobFilter.java index b5c04f004f2..5afa9e911d7 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/GlobFilter.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/GlobFilter.java @@ -21,8 +21,15 @@ package org.apache.hadoop.fs; import java.util.regex.PatternSyntaxException; import java.io.IOException; - // A class that could decide if a string matches the glob or not -class GlobFilter implements PathFilter { +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; + +/** + * A filter for POSIX glob pattern with brace expansions. + */ +@InterfaceAudience.Public +@InterfaceStability.Evolving +public class GlobFilter implements PathFilter { private final static PathFilter DEFAULT_FILTER = new PathFilter() { public boolean accept(Path file) { return true; @@ -32,11 +39,24 @@ class GlobFilter implements PathFilter { private PathFilter userFilter = DEFAULT_FILTER; private GlobPattern pattern; - GlobFilter(String filePattern) throws IOException { + /** + * Creates a glob filter with the specified file pattern. + * + * @param filePattern the file pattern. + * @throws IOException thrown if the file pattern is incorrect. + */ + public GlobFilter(String filePattern) throws IOException { init(filePattern, DEFAULT_FILTER); } - GlobFilter(String filePattern, PathFilter filter) throws IOException { + /** + * Creates a glob filter with the specified file pattern and an user filter. + * + * @param filePattern the file pattern. + * @param filter user filter in addition to the glob pattern. + * @throws IOException thrown if the file pattern is incorrect. + */ + public GlobFilter(String filePattern, PathFilter filter) throws IOException { init(filePattern, filter); }