From c0df5bd042f4f7d61973464d10dd16a9f58d3d99 Mon Sep 17 00:00:00 2001
From: Sergiu Dumitriu <sergiu@phenotips.org>
Date: Fri, 12 Sep 2014 12:05:25 -0400
Subject: [PATCH] [misc] Added new checkstyle rules introduced in recent
 versions of the Checkstyle tool

---
 .../src/main/resources/checkstyle.xml         | 51 +++++++++++++++++--
 1 file changed, 46 insertions(+), 5 deletions(-)

diff --git a/xwiki-commons-tools/xwiki-commons-tool-verification-resources/src/main/resources/checkstyle.xml b/xwiki-commons-tools/xwiki-commons-tool-verification-resources/src/main/resources/checkstyle.xml
index 5d3e8b0e6c..02b3f75b6a 100644
--- a/xwiki-commons-tools/xwiki-commons-tool-verification-resources/src/main/resources/checkstyle.xml
+++ b/xwiki-commons-tools/xwiki-commons-tool-verification-resources/src/main/resources/checkstyle.xml
@@ -48,6 +48,10 @@
     <property name="message" value="No @author tag allowed"/>
   </module>
 
+  <module name="RegexpSingleline">
+    <property name="format" value="\s+$"/>
+  </module>
+
   <!-- We cannot use this rule as it fails on our license headers, considering them as copy-pastes!
   <module name="StrictDuplicateCode"/>
   -->
@@ -87,10 +91,14 @@
 
     <module name="BooleanExpressionComplexity"/>
 
-    <!-- This is a good metric but checkstyle doesn't allow to remove JDK's base classes
-         from the new count thus making this check unusable IMO
-    <module name="ClassDataAbstractionCoupling"/>
-    -->
+    <module name="ClassDataAbstractionCoupling">
+      <property name="excludedClasses" value="boolean, byte, char, double, float, int, long, short, void,
+        Boolean, Byte, Character, Double, Float, Integer, Long, Short, Void,
+        Object, Class, String, StringBuffer, StringBuilder,
+        ArrayIndexOutOfBoundsException, Exception, RuntimeException, IllegalArgumentException, IllegalStateException, IndexOutOfBoundsException, NullPointerException, Throwable, SecurityException, UnsupportedOperationException,
+        List, ArrayList, Deque, Queue, LinkedList, Set, HashSet, SortedSet, TreeSet, Map, HashMap, SortedMap, TreeMap,
+        ConcurrentHashMap, ConcurrentLinkedDeque, ConcurrentLinkedQueue, DelayQueue, FutureTask, LinkedBlockinDeque, LinkedBlockinQueue, Phaser, PriorityBlockingQueue, RejectedExecutionException, SynchronousQueue"/>
+    </module>
 
     <module name="ClassFanOutComplexity">
       <property name="excludedClasses" value="boolean, byte, char, double, float, int, long, short, void,
@@ -131,6 +139,8 @@
 
     <module name="EmptyStatement"/>
 
+    <module name="EqualsAvoidNull"/>
+
     <module name="EqualsHashCode"/>
 
     <module name="ExecutableStatementCount"/>
@@ -145,6 +155,8 @@
 
     <!--module name="FinalParameters"/-->
 
+    <module name="GenericWhitespace"/>
+
     <!-- Avoid finalizers (this will not find violations that contain linebreaks) -->
     <module name="RegexpSinglelineJava">
       <property name="format" value="((public)|(protected))\s+void\s+finalize\(\s*\)"/>
@@ -176,7 +188,12 @@
 
     <!--module name="ImportControl"/-->
 
-    <!--module name="ImportOrder"/-->
+    <module name="ImportOrder">
+      <property name="groups" value="java,javax,org,com"/>
+      <property name="ordered" value="true"/>
+      <property name="separated" value="true"/>
+      <property name="option" value="bottom"/>
+    </module>
 
     <module name="Indentation"/>
 
@@ -223,6 +240,8 @@
 
     <module name="MemberName"/>
 
+    <module name="MethodCount"/>
+
     <module name="MethodLength"/>
 
     <!-- Allow for UI methods generated by idea -->
@@ -232,8 +251,14 @@
 
     <module name="MethodParamPad"/>
 
+    <module name="MethodTypeParameterName"/>
+
     <!--module name="MissingCtor"/-->
 
+    <!--module name="MissingDeprecated"/-->
+
+    <module name="MissingOverride"/>
+
     <module name="MissingSwitchDefault"/>
 
     <module name="ModifiedControlVariable"/>
@@ -250,12 +275,20 @@
 
     <module name="NeedBraces"/>
 
+    <module name="NestedForDepth">
+      <property name="max" value="2"/>
+    </module>
+
     <module name="NestedIfDepth">
       <property name="max" value="2"/>
     </module>
 
     <module name="NestedTryDepth"/>
 
+    <!--module name="NoClone"/-->
+
+    <!--module name="NoFinalizer"/-->
+
     <module name="NoWhitespaceAfter">
       <property name="tokens" value="BNOT, DEC, DOT, INC, LNOT, UNARY_MINUS, UNARY_PLUS"/>
     </module>
@@ -264,8 +297,16 @@
 
     <module name="NPathComplexity"/>
 
+    <module name="OneStatementPerLine"/>
+
     <module name="OperatorWrap"/>
 
+    <module name="OuterTypeFilename"/>
+
+    <module name="OuterTypeNumber"/>
+
+    <module name="PackageAnnotation"/>
+
     <module name="PackageDeclaration"/>
 
     <module name="PackageName"/>