Repository: hadoop Updated Branches: refs/heads/trunk c918f7be5 -> 7136e8c55
http://git-wip-us.apache.org/repos/asf/hadoop/blob/7136e8c5/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/Param.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/Param.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/Param.java index 279a50c..77ed948 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/Param.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/Param.java @@ -47,16 +47,16 @@ public abstract class Param<T, D extends Param.Domain<T>> { try { for(Param<?, ?> p : parameters) { if (p.getValue() != null) { - b.append(separator).append( - URLEncoder.encode(p.getName(), "UTF-8") - + "=" - + URLEncoder.encode(p.getValueString(), "UTF-8")); + b.append(separator) + .append(URLEncoder.encode(p.getName(), "UTF-8")) + .append("=") + .append(URLEncoder.encode(p.getValueString(), "UTF-8")); } } - } catch (UnsupportedEncodingException e) { - // Sane systems know about UTF-8, so this should never happen. - throw new RuntimeException(e); - } + } catch (UnsupportedEncodingException e) { + // Sane systems know about UTF-8, so this should never happen. + throw new RuntimeException(e); + } return b.toString(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/7136e8c5/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/PermissionParam.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/PermissionParam.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/PermissionParam.java index ac6f097..530fd3f 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/PermissionParam.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/PermissionParam.java @@ -61,4 +61,4 @@ public class PermissionParam extends ShortParam { final Short v = getValue(); return new FsPermission(v != null? v: DEFAULT_PERMISSION); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hadoop/blob/7136e8c5/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/PostOpParam.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/PostOpParam.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/PostOpParam.java index e0178d5..4719bf3 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/PostOpParam.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/PostOpParam.java @@ -22,7 +22,7 @@ import java.net.HttpURLConnection; /** Http POST operation parameter. */ public class PostOpParam extends HttpOpParam<PostOpParam.Op> { /** Post operations. */ - public static enum Op implements HttpOpParam.Op { + public enum Op implements HttpOpParam.Op { APPEND(true, HttpURLConnection.HTTP_OK), CONCAT(false, HttpURLConnection.HTTP_OK), @@ -71,7 +71,7 @@ public class PostOpParam extends HttpOpParam<PostOpParam.Op> { } } - private static final Domain<Op> DOMAIN = new Domain<PostOpParam.Op>(NAME, Op.class); + private static final Domain<Op> DOMAIN = new Domain<>(NAME, Op.class); /** * Constructor. @@ -85,4 +85,4 @@ public class PostOpParam extends HttpOpParam<PostOpParam.Op> { public String getName() { return NAME; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hadoop/blob/7136e8c5/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/PutOpParam.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/PutOpParam.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/PutOpParam.java index dede6a5..d1e08fd 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/PutOpParam.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/PutOpParam.java @@ -22,7 +22,7 @@ import java.net.HttpURLConnection; /** Http POST operation parameter. */ public class PutOpParam extends HttpOpParam<PutOpParam.Op> { /** Put operations. */ - public static enum Op implements HttpOpParam.Op { + public enum Op implements HttpOpParam.Op { CREATE(true, HttpURLConnection.HTTP_CREATED), MKDIRS(false, HttpURLConnection.HTTP_OK), @@ -60,7 +60,7 @@ public class PutOpParam extends HttpOpParam<PutOpParam.Op> { } Op(final boolean doOutputAndRedirect, final int expectedHttpResponseCode, - final boolean requireAuth) { + final boolean requireAuth) { this.doOutputAndRedirect = doOutputAndRedirect; this.expectedHttpResponseCode = expectedHttpResponseCode; this.requireAuth = requireAuth; @@ -97,7 +97,7 @@ public class PutOpParam extends HttpOpParam<PutOpParam.Op> { } } - private static final Domain<Op> DOMAIN = new Domain<Op>(NAME, Op.class); + private static final Domain<Op> DOMAIN = new Domain<>(NAME, Op.class); /** * Constructor. @@ -111,4 +111,4 @@ public class PutOpParam extends HttpOpParam<PutOpParam.Op> { public String getName() { return NAME; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hadoop/blob/7136e8c5/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/RecursiveParam.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/RecursiveParam.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/RecursiveParam.java index 4890a61..d3231ac 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/RecursiveParam.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/RecursiveParam.java @@ -46,4 +46,4 @@ public class RecursiveParam extends BooleanParam { public String getName() { return NAME; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hadoop/blob/7136e8c5/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/RenameOptionSetParam.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/RenameOptionSetParam.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/RenameOptionSetParam.java index d7c157d..c30999a 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/RenameOptionSetParam.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/RenameOptionSetParam.java @@ -26,7 +26,7 @@ public class RenameOptionSetParam extends EnumSetParam<Options.Rename> { /** Default parameter value. */ public static final String DEFAULT = ""; - private static final Domain<Options.Rename> DOMAIN = new Domain<Options.Rename>( + private static final Domain<Options.Rename> DOMAIN = new Domain<>( NAME, Options.Rename.class); /** @@ -49,4 +49,4 @@ public class RenameOptionSetParam extends EnumSetParam<Options.Rename> { public String getName() { return NAME; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hadoop/blob/7136e8c5/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/RenewerParam.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/RenewerParam.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/RenewerParam.java index 750e8bc..599e2e8 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/RenewerParam.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/RenewerParam.java @@ -38,4 +38,4 @@ public class RenewerParam extends StringParam { public String getName() { return NAME; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hadoop/blob/7136e8c5/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/ReplicationParam.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/ReplicationParam.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/ReplicationParam.java index af2ca23..c47e6f1 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/ReplicationParam.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/ReplicationParam.java @@ -57,4 +57,4 @@ public class ReplicationParam extends ShortParam { return getValue() != null? getValue() : (short)conf.getInt(DFS_REPLICATION_KEY, DFS_REPLICATION_DEFAULT); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/hadoop/blob/7136e8c5/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/UserParam.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/UserParam.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/UserParam.java index 46402fd..19efb9d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/UserParam.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/UserParam.java @@ -31,7 +31,8 @@ public class UserParam extends StringParam { /** Default parameter value. */ public static final String DEFAULT = ""; - private static Domain domain = new Domain(NAME, Pattern.compile(DFS_WEBHDFS_USER_PATTERN_DEFAULT)); + private static Domain domain = new Domain(NAME, + Pattern.compile(DFS_WEBHDFS_USER_PATTERN_DEFAULT)); @VisibleForTesting public static Domain getUserPatternDomain() { @@ -65,7 +66,8 @@ public class UserParam extends StringParam { * @param str a string representation of the parameter value. */ public UserParam(final String str) { - super(domain, str == null || str.equals(DEFAULT)? null : validateLength(str)); + super(domain, str == null || + str.equals(DEFAULT) ? null : validateLength(str)); } /** http://git-wip-us.apache.org/repos/asf/hadoop/blob/7136e8c5/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/XAttrEncodingParam.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/XAttrEncodingParam.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/XAttrEncodingParam.java index dd6eda1..15f2bc5 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/XAttrEncodingParam.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/XAttrEncodingParam.java @@ -26,7 +26,7 @@ public class XAttrEncodingParam extends EnumParam<XAttrCodec> { public static final String DEFAULT = ""; private static final Domain<XAttrCodec> DOMAIN = - new Domain<XAttrCodec>(NAME, XAttrCodec.class); + new Domain<>(NAME, XAttrCodec.class); public XAttrEncodingParam(final XAttrCodec encoding) { super(DOMAIN, encoding); http://git-wip-us.apache.org/repos/asf/hadoop/blob/7136e8c5/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/XAttrNameParam.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/XAttrNameParam.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/XAttrNameParam.java index b64666a..47a1b0e 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/XAttrNameParam.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/XAttrNameParam.java @@ -25,8 +25,7 @@ public class XAttrNameParam extends StringParam { /** Default parameter value. **/ public static final String DEFAULT = ""; - private static Domain DOMAIN = new Domain(NAME, - Pattern.compile(".*")); + private static Domain DOMAIN = new Domain(NAME, Pattern.compile(".*")); public XAttrNameParam(final String str) { super(DOMAIN, str == null || str.equals(DEFAULT) ? null : str); @@ -38,7 +37,6 @@ public class XAttrNameParam extends StringParam { } public String getXAttrName() { - final String v = getValue(); - return v; + return getValue(); } } http://git-wip-us.apache.org/repos/asf/hadoop/blob/7136e8c5/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/XAttrSetFlagParam.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/XAttrSetFlagParam.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/XAttrSetFlagParam.java index 7cd5419..e042bf4 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/XAttrSetFlagParam.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/web/resources/XAttrSetFlagParam.java @@ -27,7 +27,7 @@ public class XAttrSetFlagParam extends EnumSetParam<XAttrSetFlag> { /** Default parameter value. */ public static final String DEFAULT = ""; - private static final Domain<XAttrSetFlag> DOMAIN = new Domain<XAttrSetFlag>( + private static final Domain<XAttrSetFlag> DOMAIN = new Domain<>( NAME, XAttrSetFlag.class); public XAttrSetFlagParam(final EnumSet<XAttrSetFlag> flag) { http://git-wip-us.apache.org/repos/asf/hadoop/blob/7136e8c5/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 34595a1..3861673 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1010,6 +1010,9 @@ Release 2.8.0 - UNRELEASED HDFS-9015. Refactor TestReplicationPolicy to test different block placement policies. (Ming Ma via lei) + HDFS-8979. Clean up checkstyle warnings in hadoop-hdfs-client module. + (Mingliang Liu via wheat9) + OPTIMIZATIONS HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than
