PMDルール整備

diff --git a/pom.xml b/pom.xml
index 6151c62..df209df 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -266,6 +266,8 @@
                 <version>2.2</version>
                 <configuration>
                     <locales>ja</locales>
+                    <generateReports>true</generateReports>
+                    <generateSitemap>true</generateSitemap>
                     <inputEncoding>${project.build.sourceEncoding}</inputEncoding>
                     <outputEncoding>${project.reporting.outputEncoding}</outputEncoding>
                 </configuration>
@@ -295,12 +297,19 @@
                 <artifactId>maven-pmd-plugin</artifactId>
                 <version>2.5</version>
                 <configuration>
-                    <sourceEncoding>UTF-8</sourceEncoding>
                     <targetJdk>${maven.compiler.target}</targetJdk>
                     <rulesets>
                         <ruleset>${project.myrepoconf}/pmdrules.xml</ruleset>
                     </rulesets>
                 </configuration>
+                <reportSets>
+                    <reportSet>
+                        <reports>
+                            <report>pmd</report>
+                            <report>cpd</report>
+                        </reports>
+                    </reportSet>
+                </reportSets>
             </plugin>
 
             <plugin>

diff --git a/src/main/config/pmdrules.xml b/src/main/config/pmdrules.xml
index 1b5fcf2..ad3dba9 100644 (file)
--- a/src/main/config/pmdrules.xml
+++ b/src/main/config/pmdrules.xml
@@ -9,12 +9,12 @@
 -->
 
 <ruleset
-  name="Custom ruleset"
   xmlns="http://pmd.sf.net/ruleset/1.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0
   http://pmd.sf.net/ruleset_xml_schema.xsd"
   xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd"
+  name="Custom ruleset"
 >
 
     <rule ref="rulesets/basic.xml">
@@ -29,18 +29,25 @@
     <rule ref="rulesets/codesize.xml">
         <exclude name="TooManyMethods" />
     </rule>
+    <rule ref="rulesets/codesize.xml/TooManyMethods">
+        <properties>
+            <property name="maxmethods" value="25"/>
+        </properties>
+    </rule>
 
     <rule ref="rulesets/clone.xml" />
 
     <rule ref="rulesets/controversial.xml">
-        <exclude name="DataflowAnomalyAnalysis" />
+        <exclude name="NullAssignment" />
         <exclude name="OnlyOneReturn" />
         <exclude name="DefaultPackage" />
+        <exclude name="DataflowAnomalyAnalysis" />
     </rule>
 
     <rule ref="rulesets/coupling.xml" />
 
     <rule ref="rulesets/design.xml">
+        <exclude name="ConfusingTernary" />
         <exclude name="UnnecessaryLocalBeforeReturn" />
     </rule>
 
@@ -54,8 +61,14 @@
     <rule ref="rulesets/migrating_to_15.xml" />
 
     <rule ref="rulesets/naming.xml">
-        <exclude name="LongVariable" />
         <exclude name="ShortVariable" />
+        <exclude name="LongVariable" />
+        <exclude name="AvoidFieldNameMatchingMethodName" />
+    </rule>
+    <rule ref="rulesets/naming.xml/LongVariable">
+        <properties>
+            <property name="minimum" value="25"/>
+        </properties>
     </rule>
 
     <rule ref="rulesets/optimizations.xml">