modify checkstyle rules

diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
index f1500fa..dcb855d 100644 (file)
--- a/checkstyle-suppressions.xml
+++ b/checkstyle-suppressions.xml
@@ -5,8 +5,8 @@
     "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
 
 <!--
-    Checkstyle用警告抑止設定
-    ※ SuppressionFilter モジュール用
+    Checkstyle suppressions
+    for Checkstyle 6.19(7.4) or later
 
     [ http://checkstyle.sourceforge.net/ ]
 
@@ -29,14 +29,14 @@
 
     <!-- Javadoc Comments -->
     <suppress files="" checks="SummaryJavadocCheck" />
-        <!-- 句読点対応待ち -->
-    <suppress files="" checks="SingleLineJavadoc" />
-        <!-- ignoredTagsプロパティ対応待ち -->
 
     <!-- Miscellaneous -->
     <suppress files="" checks="FinalParameters" />
     <suppress files="" checks="TrailingComment" />
 
+    <!-- Whitespace -->
+    <suppress files="" checks="SingleSpaceSeparator" />
+
 </suppressions>
 
 

diff --git a/pmdrules.xml b/pmdrules.xml
index 9c10f91..8388a54 100644 (file)
--- a/pmdrules.xml
+++ b/pmdrules.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <!--
-    PMD用ルールセット定義
-
-    PMD [ https://pmd.github.io/ ] 5.3 以降用に記述されています。
+    Custom rule set
+    for PMD [ https://pmd.github.io/ ] 5.5.2 or later
 
     Copyright(c) 2016 olyutorskii
 -->
@@ -17,12 +16,10 @@
 >
 
     <description>
-        custom rulesets for project
+        custom rulesets
     </description>
 
-<!--
     <rule ref="rulesets/java/android.xml" />
--->
 
     <rule ref="rulesets/java/basic.xml" />
 
@@ -33,18 +30,10 @@
 
     <rule ref="rulesets/java/clone.xml" />
 
-    <rule ref="rulesets/java/codesize.xml">
-        <exclude name="TooManyMethods" />
-    </rule>
-    <rule ref="rulesets/java/codesize.xml/TooManyMethods">
-        <properties>
-            <property name="maxmethods" value="25"/>
-        </properties>
-    </rule>
+    <rule ref="rulesets/java/codesize.xml" />
 
     <rule ref="rulesets/java/comments.xml">
-        <exclude name="CommentRequired" />
-        <exclude name="CommentSize" />
+        <exclude name="CommentDefaultAccessModifier" />
     </rule>
     <rule ref="rulesets/java/comments.xml/CommentRequired" >
         <properties>
@@ -58,13 +47,10 @@
     </rule>
 
     <rule ref="rulesets/java/controversial.xml">
-        <exclude name="NullAssignment" />
-        <exclude name="OnlyOneReturn" />
         <exclude name="DefaultPackage" />
+        <exclude name="OnlyOneReturn" />
         <exclude name="DataflowAnomalyAnalysis" />
-        <exclude name="AvoidUsingShortType" />
         <exclude name="AvoidLiteralsInIfCondition" />
-        <exclude name="UseConcurrentHashMap" />
     </rule>
 
     <rule ref="rulesets/java/coupling.xml">
@@ -73,8 +59,6 @@
     </rule>
 
     <rule ref="rulesets/java/design.xml">
-        <exclude name="SimplifyBooleanReturns" />
-        <exclude name="ConfusingTernary" />
         <exclude name="UnnecessaryLocalBeforeReturn" />
         <exclude name="FieldDeclarationsShouldBeAtStartOfClass" />
     </rule>
@@ -85,33 +69,25 @@
 
     <rule ref="rulesets/java/imports.xml" />
 
-<!--
-    <rule ref="rulesets/java/j2ee.xml" />
-    <rule ref="rulesets/java/javabeans.xml" />
--->
-
-    <rule ref="rulesets/java/junit.xml" />
+    <rule ref="rulesets/java/j2ee.xml">
+        <exclude name="DoNotUseThreads" />
+    </rule>
 
-<!--
     <rule ref="rulesets/java/logging-jakarta-commons.xml" />
--->
+
+    <rule ref="rulesets/java/javabeans.xml">
+        <exclude name="BeanMembersShouldSerialize" />
+    </rule>
 
     <rule ref="rulesets/java/logging-java.xml" />
 
+    <rule ref="rulesets/java/junit.xml" />
+
     <rule ref="rulesets/java/migrating.xml" />
-<!--
-    <rule ref="rulesets/java/migrating_to_XX.xml" />
--->
 
     <rule ref="rulesets/java/naming.xml">
         <exclude name="ShortVariable" />
         <exclude name="LongVariable" />
-        <exclude name="AvoidFieldNameMatchingMethodName" />
-    </rule>
-    <rule ref="rulesets/java/naming.xml/LongVariable">
-        <properties>
-            <property name="minimum" value="25"/>
-        </properties>
     </rule>
 
     <rule ref="rulesets/java/optimizations.xml">
@@ -120,11 +96,11 @@
         <exclude name="RedundantFieldInitializer" />
     </rule>
 
-    <rule ref="rulesets/java/strictexception.xml">
-        <exclude name="AvoidThrowingNullPointerException" />
-    </rule>
+    <rule ref="rulesets/java/strictexception.xml" />
 
-    <rule ref="rulesets/java/strings.xml" />
+    <rule ref="rulesets/java/strings.xml">
+        <exclude name="ConsecutiveAppendsShouldReuse" />
+    </rule>
 
     <rule ref="rulesets/java/sunsecure.xml" />
 
@@ -132,7 +108,6 @@
 
     <rule ref="rulesets/java/unnecessary.xml">
         <exclude name="UnnecessaryReturn" />
-        <exclude name="UselessParentheses" />
     </rule>
 
     <rule ref="rulesets/java/unusedcode.xml" />