--- /dev/null
+/*
+ * Sonar, open source software quality management tool.
+ * Copyright (C) 2009 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * Sonar is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * Sonar is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Sonar; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02
+ */
+
+package org.sonar.java.ast.check;
+
+import java.util.List;
+
+import org.sonar.check.IsoCategory;
+import org.sonar.check.Rule;
+import org.sonar.check.RuleProperty;
+import org.sonar.java.ast.visitor.ClassVisitor;
+import org.sonar.squid.api.CheckMessage;
+import org.sonar.squid.api.SourceCode;
+import org.sonar.squid.api.SourceFile;
+import org.sonar.squid.measures.Metric;
+
+import com.puppycrawl.tools.checkstyle.api.DetailAST;
+
+@Rule(key = "ClassComplexityCheck", isoCategory = IsoCategory.Maintainability)
+public class ClassComplexityCheck extends JavaAstCheck {
+
+ @RuleProperty
+ private Integer threshold;
+
+ @Override
+ public List<Integer> getWantedTokens() {
+ return ClassVisitor.wantedTokens;
+ }
+
+ @Override
+ public void leaveToken(DetailAST ast) {
+ SourceCode currentResource = peekSourceCode();
+ int complexity = calculateComplexity(currentResource);
+ if (complexity > threshold) {
+ CheckMessage message = new CheckMessage(this, "Class complexity exceeds " + threshold + ".");
+ message.setLine(ast.getLineNo());
+ message.setCost(complexity - threshold);
+ SourceFile sourceFile = currentResource.getParent(SourceFile.class);
+ sourceFile.log(message);
+ }
+ }
+
+ private int calculateComplexity(SourceCode sourceCode) {
+ int result = 0;
+ if (sourceCode.getChildren() != null) {
+ for (SourceCode child : sourceCode.getChildren()) {
+ result += calculateComplexity(child);
+ }
+ }
+ result += sourceCode.getInt(Metric.COMPLEXITY);
+ return result;
+ }
+
+ public void setThreshold(int threshold) {
+ this.threshold = threshold;
+ }
+
+}
+++ /dev/null
-/*
- * Sonar, open source software quality management tool.
- * Copyright (C) 2009 SonarSource SA
- * mailto:contact AT sonarsource DOT com
- *
- * Sonar is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * Sonar is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Sonar; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02
- */
-
-package org.sonar.java.ast.check;
-
-import java.util.List;
-
-import org.sonar.check.IsoCategory;
-import org.sonar.check.Rule;
-import org.sonar.check.RuleProperty;
-import org.sonar.java.ast.visitor.ClassVisitor;
-import org.sonar.squid.api.CheckMessage;
-import org.sonar.squid.api.SourceCode;
-import org.sonar.squid.api.SourceFile;
-import org.sonar.squid.measures.Metric;
-
-import com.puppycrawl.tools.checkstyle.api.DetailAST;
-
-@Rule(key = "ComplexityCheck", isoCategory = IsoCategory.Maintainability)
-public class ComplexityCheck extends JavaAstCheck {
-
- @RuleProperty
- private Integer threshold;
-
- @Override
- public List<Integer> getWantedTokens() {
- return ClassVisitor.wantedTokens;
- }
-
- @Override
- public void leaveToken(DetailAST ast) {
- SourceCode currentResource = peekSourceCode();
- int complexity = calculateComplexity(currentResource);
- if (complexity > threshold) {
- CheckMessage message = new CheckMessage(this, "Complexity exceeds " + threshold + ".");
- message.setLine(ast.getLineNo());
- SourceFile sourceFile = currentResource.getParent(SourceFile.class);
- sourceFile.log(message);
- }
- }
-
- private int calculateComplexity(SourceCode sourceCode) {
- int result = 0;
- if (sourceCode.getChildren() != null) {
- for (SourceCode child : sourceCode.getChildren()) {
- result += calculateComplexity(child);
- }
- }
- result += sourceCode.getInt(Metric.COMPLEXITY);
- return result;
- }
-
- public void setThreshold(int threshold) {
- this.threshold = threshold;
- }
-
-}
--- /dev/null
+package org.sonar.java.ast.check;
+
+import java.util.List;
+
+import org.sonar.check.IsoCategory;
+import org.sonar.check.Rule;
+import org.sonar.check.RuleProperty;
+import org.sonar.java.ast.visitor.MethodVisitor;
+import org.sonar.squid.api.CheckMessage;
+import org.sonar.squid.api.SourceCode;
+import org.sonar.squid.api.SourceFile;
+import org.sonar.squid.measures.Metric;
+
+import com.puppycrawl.tools.checkstyle.api.DetailAST;
+
+@Rule(key = "MethodComplexityCheck", isoCategory = IsoCategory.Maintainability)
+public class MethodComplexityCheck extends JavaAstCheck {
+
+ @RuleProperty
+ private Integer threshold;
+
+ @Override
+ public List<Integer> getWantedTokens() {
+ return MethodVisitor.wantedTokens;
+ }
+
+ @Override
+ public void leaveToken(DetailAST ast) {
+ SourceCode currentResource = peekSourceCode();
+ int complexity = currentResource.getInt(Metric.COMPLEXITY) + currentResource.getInt(Metric.BRANCHES) + 1;
+ if (complexity > threshold) {
+ CheckMessage message = new CheckMessage(this, "Method complexity exceeds " + threshold + ".");
+ message.setLine(ast.getLineNo());
+ message.setCost(complexity - threshold);
+ SourceFile sourceFile = currentResource.getParent(SourceFile.class);
+ sourceFile.log(message);
+ }
+ }
+
+ public void setThreshold(int threshold) {
+ this.threshold = threshold;
+ }
+
+}
private static final String CONSTRUCTOR = "<init>";
- private static final List<Integer> wantedTokens = Arrays.asList(TokenTypes.CTOR_DEF, TokenTypes.METHOD_DEF);
+ public static final List<Integer> wantedTokens = Arrays.asList(TokenTypes.CTOR_DEF, TokenTypes.METHOD_DEF);
private static final Map<Integer, JvmJavaType> tokenJavaTypeMapping = new HashMap<Integer, JvmJavaType>();
static {
import org.sonar.api.rules.Rule;
import org.sonar.api.rules.RuleRepository;
import org.sonar.java.ast.check.BreakCheck;
-import org.sonar.java.ast.check.ComplexityCheck;
+import org.sonar.java.ast.check.ClassComplexityCheck;
import org.sonar.java.ast.check.ContinueCheck;
+import org.sonar.java.ast.check.MethodComplexityCheck;
import org.sonar.java.ast.check.UndocumentedApiCheck;
import org.sonar.java.bytecode.check.ArchitectureCheck;
import org.sonar.java.bytecode.check.CallToDeprecatedMethodCheck;
(Class) CallToDeprecatedMethodCheck.class, UnusedPrivateMethodCheck.class, UnusedProtectedMethodCheck.class,
ArchitectureCheck.class, DITCheck.class,
// AST checks
- UndocumentedApiCheck.class, ContinueCheck.class, BreakCheck.class, ComplexityCheck.class);
+ UndocumentedApiCheck.class, ContinueCheck.class, BreakCheck.class, ClassComplexityCheck.class, MethodComplexityCheck.class);
}
}
*/
package org.sonar.plugins.squid.bridges;
+import java.util.Locale;
+import java.util.Set;
+
import org.sonar.api.resources.Resource;
import org.sonar.api.rules.ActiveRule;
import org.sonar.api.rules.Violation;
import org.sonar.squid.api.CheckMessage;
import org.sonar.squid.api.SourceFile;
-import java.util.Locale;
-import java.util.Set;
-
public class ChecksBridge extends Bridge {
protected ChecksBridge() {
Violation violation = Violation.create(rule, sonarFile);
violation.setLineId(checkMessage.getLine());
violation.setMessage(checkMessage.getText(Locale.ENGLISH));
+ violation.setCost(checkMessage.getCost());
context.saveViolation(violation);
}
}
--- /dev/null
+/*
+ * Sonar, open source software quality management tool.
+ * Copyright (C) 2009 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * Sonar is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * Sonar is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Sonar; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02
+ */
+
+package org.sonar.java.ast.check;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+import static org.sonar.java.ast.SquidTestUtils.getFile;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.sonar.java.ast.JavaAstScanner;
+import org.sonar.java.squid.JavaSquidConfiguration;
+import org.sonar.squid.Squid;
+import org.sonar.squid.api.CheckMessage;
+import org.sonar.squid.api.SourceFile;
+
+public class ClassComplexityCheckTest {
+
+ private Squid squid;
+
+ @Before
+ public void setUp() {
+ squid = new Squid(new JavaSquidConfiguration());
+ ClassComplexityCheck check = new ClassComplexityCheck();
+ check.setThreshold(5);
+ squid.registerVisitor(check);
+ JavaAstScanner scanner = squid.register(JavaAstScanner.class);
+ scanner.scanFile(getFile("/metrics/branches/NoBranches.java"));
+ scanner.scanFile(getFile("/metrics/branches/ComplexBranches.java"));
+ }
+
+ @Test
+ public void testComplexityExceedsThreshold() {
+ SourceFile file = (SourceFile) squid.search("ComplexBranches.java");
+ assertThat(file.getCheckMessages().size(), is(1));
+ CheckMessage message = file.getCheckMessages().iterator().next();
+ assertThat(message.getLine(), is(3));
+ }
+
+ @Test
+ public void testComplexityNotExceedsThreshold() {
+ SourceFile file = (SourceFile) squid.search("NoBranches.java");
+ assertThat(file.getCheckMessages().size(), is(0));
+ }
+
+}
+++ /dev/null
-/*
- * Sonar, open source software quality management tool.
- * Copyright (C) 2009 SonarSource SA
- * mailto:contact AT sonarsource DOT com
- *
- * Sonar is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * Sonar is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with Sonar; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02
- */
-
-package org.sonar.java.ast.check;
-
-import static org.hamcrest.Matchers.is;
-import static org.junit.Assert.assertThat;
-import static org.sonar.java.ast.SquidTestUtils.getFile;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.sonar.java.ast.JavaAstScanner;
-import org.sonar.java.squid.JavaSquidConfiguration;
-import org.sonar.squid.Squid;
-import org.sonar.squid.api.CheckMessage;
-import org.sonar.squid.api.SourceFile;
-
-public class ComplexityCheckTest {
-
- private Squid squid;
-
- @Before
- public void setUp() {
- squid = new Squid(new JavaSquidConfiguration());
- ComplexityCheck check = new ComplexityCheck();
- check.setThreshold(5);
- squid.registerVisitor(check);
- JavaAstScanner scanner = squid.register(JavaAstScanner.class);
- scanner.scanFile(getFile("/metrics/branches/NoBranches.java"));
- scanner.scanFile(getFile("/metrics/branches/ComplexBranches.java"));
- }
-
- @Test
- public void testComplexityExceedsThreshold() {
- SourceFile file = (SourceFile) squid.search("ComplexBranches.java");
- assertThat(file.getCheckMessages().size(), is(1));
- CheckMessage message = file.getCheckMessages().iterator().next();
- assertThat(message.getLine(), is(3));
- }
-
- @Test
- public void testComplexityNotExceedsThreshold() {
- SourceFile file = (SourceFile) squid.search("NoBranches.java");
- assertThat(file.getCheckMessages().size(), is(0));
- }
-
-}
--- /dev/null
+package org.sonar.java.ast.check;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+import static org.sonar.java.ast.SquidTestUtils.getFile;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.sonar.java.ast.JavaAstScanner;
+import org.sonar.java.squid.JavaSquidConfiguration;
+import org.sonar.squid.Squid;
+import org.sonar.squid.api.CheckMessage;
+import org.sonar.squid.api.SourceFile;
+
+public class MethodComplexityCheckTest {
+ private Squid squid;
+
+ @Before
+ public void setUp() {
+ squid = new Squid(new JavaSquidConfiguration());
+ MethodComplexityCheck check = new MethodComplexityCheck();
+ check.setThreshold(5);
+ squid.registerVisitor(check);
+ JavaAstScanner scanner = squid.register(JavaAstScanner.class);
+ scanner.scanFile(getFile("/metrics/branches/ComplexBranches.java"));
+ }
+
+ @Test
+ public void testMethodComplexityExceedsThreshold() {
+ SourceFile file = (SourceFile) squid.search("ComplexBranches.java");
+ assertThat(file.getCheckMessages().size(), is(1));
+ CheckMessage message = file.getCheckMessages().iterator().next();
+ assertThat(message.getLine(), is(10));
+ }
+}
public class CheckMessage implements Message {
private Integer line;
+ private Double cost;
private SourceCode sourceCode;
private CodeCheck codeCheck;
private String defaultMessage;
return line;
}
+ public void setCost(double cost) {
+ this.cost = cost;
+ }
+
+ public Double getCost() {
+ return cost;
+ }
+
public CodeCheck getChecker() {
return codeCheck;
}
projects / sonarqube.git / commitdiff