hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndimi...@apache.org
Subject hbase git commit: Revert "HBASE-15693 Reconsider the ImportOrder rule of checkstyle"
Date Mon, 09 May 2016 03:05:59 GMT
Repository: hbase
Updated Branches:
  refs/heads/branch-1.1 a557c8452 -> 239b80456


Revert "HBASE-15693 Reconsider the ImportOrder rule of checkstyle"

This reverts commit 4b11e3203f7b8c84bef1d9361c144a4f3b81edc3.


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/239b8045
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/239b8045
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/239b8045

Branch: refs/heads/branch-1.1
Commit: 239b80456118175b340b2e562a5568b5c744252e
Parents: a557c84
Author: Nick Dimiduk <ndimiduk@apache.org>
Authored: Sun May 8 20:05:45 2016 -0700
Committer: Nick Dimiduk <ndimiduk@apache.org>
Committed: Sun May 8 20:05:45 2016 -0700

----------------------------------------------------------------------
 CHANGES.txt                                     |  1 -
 .../src/main/resources/hbase/checkstyle.xml     | 82 ++++----------------
 2 files changed, 16 insertions(+), 67 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/239b8045/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 69d2c3c..9b55945 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -29,7 +29,6 @@ Release Notes - HBase - Version 1.1.5 05/08/2016
     * [HBASE-15670] - Add missing Snapshot.proto to the maven profile for compiling protobuf
     * [HBASE-15674] - HRegionLocator#getAllRegionLocations should put the results in cache
     * [HBASE-15676] - FuzzyRowFilter fails and matches all the rows in the table if the mask
consists of all 0s
-    * [HBASE-15693] - Reconsider the ImportOrder rule of checkstyle
     * [HBASE-15738] - Ensure artifacts in project dist area include required md5 file
     * [HBASE-15742] - Reduce allocation of objects in metrics
     * [HBASE-15755] - SnapshotDescriptionUtils and SnapshotTestingUtils do not have any Interface
audience marked

http://git-wip-us.apache.org/repos/asf/hbase/blob/239b8045/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
----------------------------------------------------------------------
diff --git a/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml b/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
index b423095..34fe5ec 100644
--- a/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
+++ b/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml
@@ -32,79 +32,29 @@
 <module name="Checker">
   <module name="FileTabCharacter"/>
   <module name="TreeWalker">
-
-    <!-- Annotations Checks
-    http://checkstyle.sourceforge.net/config_annotation.html -->
-    <module name="MissingDeprecated"/>
-
-    <!-- Block Checks
-    http://checkstyle.sourceforge.net/config_blocks.html -->
-    <module name="EmptyBlock"/>
-    <module name="LeftCurly"/>
-    <module name="NeedBraces"/>
-
-    <!-- Class Design Checks
-    http://checkstyle.sourceforge.net/config_design.html -->
-    <module name="FinalClass"/>
-    <module name="HideUtilityClassConstructor"/>
-    <module name="InterfaceIsType"/>
-    <module name="VisibilityModifier">
-      <property name="packageAllowed" value="true"/>
-      <property name="protectedAllowed" value="true"/>
-    </module>
-
-    <!-- Coding Checks
-    http://checkstyle.sourceforge.net/config_coding.html -->
-    <module name="ArrayTypeStyle"/>
-    <module name="EmptyStatement"/>
-    <module name="EqualsHashCode"/>
-    <module name="IllegalInstantiation"/>
-    <module name="InnerAssignment"/>
-    <module name="MissingSwitchDefault"/>
-    <module name="NoFinalizer"/>
-
-    <!-- Import Checks
-    http://checkstyle.sourceforge.net/config_imports.html -->
     <module name="AvoidStarImport"/>
-    <module name="ImportOrder">
-      <property name="option" value="top" />
-      <property name="ordered" value="true"/>
-      <property name="sortStaticImportsAlphabetically" value="true"/>
-    </module>
     <module name="RedundantImport"/>
-    <module name="UnusedImports">
-      <property name="processJavadoc" value="true"/>
-    </module>
-
-    <!-- Javadoc Checks
-    http://checkstyle.sourceforge.net/config_javadoc.html -->
-    <module name="JavadocTagContinuationIndentation">
-      <property name="offset" value="2"/>
-    </module>
-    <module name="NonEmptyAtclauseDescription"/>
-
-    <!-- Miscellaneous Checks
-    http://checkstyle.sourceforge.net/config_misc.html -->
-    <module name="UpperEll"/>
-    <module name="Indentation">
-      <property name="basicOffset" value="2"/>
-      <property name="caseIndent" value="2"/>
-      <property name="throwsIndent" value="2"/>
-      <property name="arrayInitIndent" value="2"/>
-      <property name="lineWrappingIndentation" value="2"/>
-    </module>
-
-    <!-- Size Violation Checks
-    http://checkstyle.sourceforge.net/config_sizes.html -->
+    <module name="UnusedImports"/>
     <module name="LineLength">
       <property name="max" value="100"/>
-      <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://|org.apache.thrift.|com.google.protobuf.|hbase.protobuf.generated"/>
+      <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
     </module>
     <module name="MethodLength"/>
-
-    <!-- Whitespace Checks
-    http://checkstyle.sourceforge.net/config_whitespace.html -->
     <module name="MethodParamPad"/>
     <module name="ParenPad"/>
+    <module name="EmptyStatement"/>
+    <module name="EmptyBlock"/>
+    <module name="EqualsHashCode"/>
+    <module name="IllegalInstantiation"/>
+    <module name="InnerAssignment"/>
+    <module name="MissingSwitchDefault"/>
+    <module name="FinalClass"/>
+    <module name="HideUtilityClassConstructor"/>
+    <module name="InterfaceIsType"/>
+    <module name="VisibilityModifier"/>
+    <module name="ArrayTypeStyle"/>
+    <module name="UpperEll"/>
+    <module name="NoFinalizer"/>
+    <module name="MissingDeprecated"/>
   </module>
 </module>


Mime
View raw message