Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HADOOP-11632. Cleanup Find.java to remove SupressWarnings annotations. Contributed by Akira AJISAKA.

This commit is contained in:
Tsuyoshi Ozawa 2015-02-25 16:25:04 +09:00
parent 6cbd9f1113
commit ad8ed3e802
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -628,6 +628,9 @@ Release 2.7.0 - UNRELEASED
HADOOP-11495. Convert site documentation from apt to markdown HADOOP-11495. Convert site documentation from apt to markdown
(Masatake Iwasaki via aw) (Masatake Iwasaki via aw)
HADOOP-11632. Cleanup Find.java to remove SupressWarnings annotations.
(Akira Ajisaka via ozawa)
OPTIMIZATIONS OPTIMIZATIONS
HADOOP-11323. WritableComparator#compare keeps reference to byte array. HADOOP-11323. WritableComparator#compare keeps reference to byte array.

29
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/find/Find.java
View File

@ -25,6 +25,7 @@ import java.util.Deque;
import java.util.HashSet; import java.util.HashSet;
import java.util.Iterator; import java.util.Iterator;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.Set;
import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.classification.InterfaceStability;
@ -63,19 +64,25 @@ public class Find extends FsCommand {
private static final String OPTION_FOLLOW_ARG_LINK = "H"; private static final String OPTION_FOLLOW_ARG_LINK = "H";
/** List of expressions recognized by this command. */ /** List of expressions recognized by this command. */
@SuppressWarnings("rawtypes") private static final Set<Class<? extends Expression>> EXPRESSIONS =
private static final Class[] EXPRESSIONS; new HashSet<>();
private static void addExpression(Class<?> clazz) {
EXPRESSIONS.add(clazz.asSubclass(Expression.class));
}
static { static {
// Initialize the static variables. // Initialize the static variables.
EXPRESSIONS = new Class[] { // Operator Expressions
// Operator Expressions addExpression(And.class);
And.class,
// Action Expressions // Action Expressions
Print.class, addExpression(Print.class);
// Navigation Expressions
// Matcher Expressions // Navigation Expressions
Name.class }; // Matcher Expressions
addExpression(Name.class);
DESCRIPTION = buildDescription(ExpressionFactory.getExpressionFactory()); DESCRIPTION = buildDescription(ExpressionFactory.getExpressionFactory());
// Register the expressions with the expression factory. // Register the expressions with the expression factory.
@ -92,7 +99,6 @@ public class Find extends FsCommand {
private HashSet<Path> stopPaths = new HashSet<Path>(); private HashSet<Path> stopPaths = new HashSet<Path>();
/** Register the expressions with the expression factory. */ /** Register the expressions with the expression factory. */
@SuppressWarnings("unchecked")
private static void registerExpressions(ExpressionFactory factory) { private static void registerExpressions(ExpressionFactory factory) {
for (Class<? extends Expression> exprClass : EXPRESSIONS) { for (Class<? extends Expression> exprClass : EXPRESSIONS) {
factory.registerExpression(exprClass); factory.registerExpression(exprClass);
@ -100,7 +106,6 @@ public class Find extends FsCommand {
} }
/** Build the description used by the help command. */ /** Build the description used by the help command. */
@SuppressWarnings("unchecked")
private static String buildDescription(ExpressionFactory factory) { private static String buildDescription(ExpressionFactory factory) {
ArrayList<Expression> operators = new ArrayList<Expression>(); ArrayList<Expression> operators = new ArrayList<Expression>();
ArrayList<Expression> primaries = new ArrayList<Expression>(); ArrayList<Expression> primaries = new ArrayList<Expression>();