HBASE-14902 Revert some of the stringency recently introduced by checkstyle tightening
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/998b9371 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/998b9371 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/998b9371 Branch: refs/heads/trunk Commit: 998b9371c9d9a6fe4a93e734ba0055c3e20e0b3e Parents: 0065668 Author: stack <st...@apache.org> Authored: Mon Jan 4 14:21:59 2016 -0800 Committer: stack <st...@apache.org> Committed: Mon Jan 4 14:22:12 2016 -0800 ---------------------------------------------------------------------- hbase-checkstyle/src/main/resources/hbase/checkstyle.xml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/998b9371/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 e7272c5..6670182 100644 --- a/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml +++ b/hbase-checkstyle/src/main/resources/hbase/checkstyle.xml @@ -41,7 +41,9 @@ http://checkstyle.sourceforge.net/config_blocks.html --> <module name="EmptyBlock"/> <module name="LeftCurly"/> - <module name="NeedBraces"/> + <module name="NeedBraces"> + <property name="allowSingleLineStatement" value="true"/> + </module> <!-- Class Design Checks http://checkstyle.sourceforge.net/config_design.html --> @@ -77,7 +79,9 @@ <!-- Javadoc Checks http://checkstyle.sourceforge.net/config_javadoc.html --> - <module name="JavadocTagContinuationIndentation"/> + <module name="JavadocTagContinuationIndentation"> + <property name="offset" value="2"/> + </module> <module name="NonEmptyAtclauseDescription"/> <!-- Miscellaneous Checks