SONAR-2301 ClassComplexityCheck NullPointerException

diff --git a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/squid/check/ClassComplexityCheck.java b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/squid/check/ClassComplexityCheck.java
index faa95c72a7aed3ff5fe2314c4a77c1bba6bdeee7..1f360273b955e2c648efcde8e49cee74e7b1f845 100644 (file)
--- a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/squid/check/ClassComplexityCheck.java
+++ b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/squid/check/ClassComplexityCheck.java
@@ -39,8 +39,10 @@ import org.sonar.squid.measures.Metric;
         + "and which should be re-factored to be split in several classes.</p>")
 public class ClassComplexityCheck extends SquidCheck {
 
-  @RuleProperty(description = "Maximum complexity allowed.", defaultValue = "200")
-  private Integer max;
+  public static final int DEFAULT_MAX = 200;
+
+  @RuleProperty(description = "Maximum complexity allowed.", defaultValue = "" + DEFAULT_MAX)
+  private Integer max = DEFAULT_MAX;
 
   @Override
   public void visitClass(SourceClass sourceClass) {

diff --git a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/squid/check/DITCheck.java b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/squid/check/DITCheck.java
index b9b13f76f263ac004252c15f3b0608128c1cde72..9599cd0453bfdd95a58e9a0d8d120446e9a6f24d 100644 (file)
--- a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/squid/check/DITCheck.java
+++ b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/squid/check/DITCheck.java
@@ -37,8 +37,10 @@ import org.sonar.squid.measures.Metric;
         + "'inheritance' when 'composition' would suit better.</p>")
 public class DITCheck extends SquidCheck {
 
-  @RuleProperty(description = "Maximum depth of the inheritance tree.", defaultValue = "5")
-  private Integer max;
+  public static final int DEFAULT_MAX = 5;
+
+  @RuleProperty(description = "Maximum depth of the inheritance tree.", defaultValue = "" + DEFAULT_MAX)
+  private Integer max = DEFAULT_MAX;
 
   @Override
   public void visitClass(SourceClass sourceClass) {

diff --git a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/squid/check/MethodComplexityCheck.java b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/squid/check/MethodComplexityCheck.java
index 186e859f38fe7d3cb60f4fba1035b8730627b372..0cbeb094367bc95f514a8833f0f4bdcb6175ec40 100644 (file)
--- a/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/squid/check/MethodComplexityCheck.java
+++ b/plugins/sonar-squid-java-plugin/src/main/java/org/sonar/java/squid/check/MethodComplexityCheck.java
@@ -39,8 +39,10 @@ import org.sonar.squid.measures.Metric;
         + "so the risk of regression increases exponentially.</p>")
 public class MethodComplexityCheck extends SquidCheck {
 
-  @RuleProperty(description = "Maximum complexity allowed.", defaultValue = "10")
-  private Integer max;
+  public static final int DEFAULT_MAX = 10;
+
+  @RuleProperty(description = "Maximum complexity allowed.", defaultValue = "" + DEFAULT_MAX)
+  private Integer max = DEFAULT_MAX;
 
   @Override
   public void visitMethod(SourceMethod sourceMethod) {