diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/design/CognitiveComplexityRule.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/design/CognitiveComplexityRule.java index 37112180d7..28a2110917 100644 --- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/design/CognitiveComplexityRule.java +++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/design/CognitiveComplexityRule.java @@ -75,7 +75,7 @@ public class CognitiveComplexityRule extends AbstractApexRule { String.valueOf(classLevelThreshold), }; - asCtx(data).addViolation(node, messageParams); + asCtx(data).addViolation(node, (Object[]) messageParams); } } return data; diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/design/CyclomaticComplexityRule.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/design/CyclomaticComplexityRule.java index 9318666fa5..e1af8663df 100644 --- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/design/CyclomaticComplexityRule.java +++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/design/CyclomaticComplexityRule.java @@ -78,7 +78,7 @@ public class CyclomaticComplexityRule extends AbstractApexRule { " total", classWmc + " (highest " + classHighest + ")", }; - asCtx(data).addViolation(node, messageParams); + asCtx(data).addViolation(node, (Object[]) messageParams); } } return data; diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AccessorMethodGenerationRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AccessorMethodGenerationRule.java index 0313d95be8..33e8e96c41 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AccessorMethodGenerationRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/bestpractices/AccessorMethodGenerationRule.java @@ -76,7 +76,7 @@ public class AccessorMethodGenerationRule extends AbstractJavaRulechainRule { JavaNode node = sym.tryGetNode(); assert node != null : "Node should be in the same compilation unit"; if (reportedNodes.add(node)) { - ruleContext.addViolation(node, new String[] {stripPackageName(refExpr.getEnclosingType().getSymbol())}); + ruleContext.addViolation(node, stripPackageName(refExpr.getEnclosingType().getSymbol())); } } } diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/IdenticalCatchBranchesRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/IdenticalCatchBranchesRule.java index 00228a569b..9be54e90ab 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/IdenticalCatchBranchesRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/IdenticalCatchBranchesRule.java @@ -91,7 +91,7 @@ public class IdenticalCatchBranchesRule extends AbstractJavaRulechainRule { // By convention, lower catch blocks are collapsed into the highest one // The first node of the equivalence class is thus the block that should be transformed for (int i = 1; i < identicalStmts.size(); i++) { - asCtx(data).addViolation(identicalStmts.get(i), new String[]{identicalBranchName, }); + asCtx(data).addViolation(identicalStmts.get(i), identicalBranchName); } } } diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryImportRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryImportRule.java index 2b1bcf356e..b2049fa1fc 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryImportRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryImportRule.java @@ -220,7 +220,7 @@ public class UnnecessaryImportRule extends AbstractJavaRule { } private void reportWithMessage(ASTImportDeclaration node, Object data, String message) { - asCtx(data).addViolationWithMessage(node, message, new String[] { PrettyPrintingUtil.prettyImport(node) }); + asCtx(data).addViolationWithMessage(node, message, PrettyPrintingUtil.prettyImport(node)); } @Override diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryModifierRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryModifierRule.java index 358ce5719c..97c9a263b8 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryModifierRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UnnecessaryModifierRule.java @@ -54,12 +54,10 @@ public class UnnecessaryModifierRule extends AbstractJavaRulechainRule { if (unnecessaryModifiers.isEmpty()) { return; } - asCtx(data).addViolation(node, new String[]{ - formatUnnecessaryModifiers(unnecessaryModifiers), - PrettyPrintingUtil.getPrintableNodeKind(node), - PrettyPrintingUtil.getNodeName(node), - explanation.isEmpty() ? "" : ": " + explanation, - }); + asCtx(data).addViolation(node, formatUnnecessaryModifiers(unnecessaryModifiers), + PrettyPrintingUtil.getPrintableNodeKind(node), + PrettyPrintingUtil.getNodeName(node), + explanation.isEmpty() ? "" : ": " + explanation); } diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UseDiamondOperatorRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UseDiamondOperatorRule.java index a2ae464eae..d73916d580 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UseDiamondOperatorRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codestyle/UseDiamondOperatorRule.java @@ -85,7 +85,7 @@ public class UseDiamondOperatorRule extends AbstractJavaRulechainRule { JavaNode reportNode = targs == null ? newTypeNode : targs; String message = targs == null ? RAW_TYPE_MESSAGE : REPLACE_TYPE_ARGS_MESSAGE; String replaceWith = produceSuggestedExprImage(ctorCall); - asCtx(data).addViolationWithMessage(reportNode, message, new String[] { replaceWith }); + asCtx(data).addViolationWithMessage(reportNode, message, replaceWith); } return null; } diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/CognitiveComplexityRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/CognitiveComplexityRule.java index fe5fd9eafe..7a7978f0f5 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/CognitiveComplexityRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/CognitiveComplexityRule.java @@ -56,10 +56,10 @@ public class CognitiveComplexityRule extends AbstractJavaRulechainRule { int cognitive = MetricsUtil.computeMetric(COGNITIVE_COMPLEXITY, node); final int reportLevel = getReportLevel(); if (cognitive >= reportLevel) { - asCtx(data).addViolation(node, new String[] { node instanceof ASTMethodDeclaration ? "method" : "constructor", - PrettyPrintingUtil.displaySignature(node), - String.valueOf(cognitive), - String.valueOf(reportLevel) }); + asCtx(data).addViolation(node, node instanceof ASTMethodDeclaration ? "method" : "constructor", + PrettyPrintingUtil.displaySignature(node), + String.valueOf(cognitive), + String.valueOf(reportLevel)); } return data; diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/CyclomaticComplexityRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/CyclomaticComplexityRule.java index 349921ac12..52359d8439 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/CyclomaticComplexityRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/CyclomaticComplexityRule.java @@ -89,7 +89,7 @@ public class CyclomaticComplexityRule extends AbstractJavaRulechainRule { " total", classWmc + " (highest " + classHighest + ")", }; - asCtx(data).addViolation(node, messageParams); + asCtx(data).addViolation(node, (Object[]) messageParams); } } return data; @@ -120,11 +120,7 @@ public class CyclomaticComplexityRule extends AbstractJavaRulechainRule { String kindname = node instanceof ASTConstructorDeclaration ? "constructor" : "method"; - - asCtx(data).addViolation(node, new String[] {kindname, - opname, - "", - "" + cyclo, }); + asCtx(data).addViolation(node, kindname, opname, "", "" + cyclo); } } } diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/NPathComplexityRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/NPathComplexityRule.java index fa1237ad4e..6c1f566dfe 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/NPathComplexityRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/NPathComplexityRule.java @@ -51,10 +51,10 @@ public class NPathComplexityRule extends AbstractJavaRulechainRule { BigInteger npath = MetricsUtil.computeMetric(JavaMetrics.NPATH, node); if (npath.compareTo(BigInteger.valueOf(reportLevel)) >= 0) { - asCtx(data).addViolation(node, new String[] {node instanceof ASTMethodDeclaration ? "method" : "constructor", - PrettyPrintingUtil.displaySignature(node), - String.valueOf(npath), - String.valueOf(reportLevel)}); + asCtx(data).addViolation(node, node instanceof ASTMethodDeclaration ? "method" : "constructor", + PrettyPrintingUtil.displaySignature(node), + String.valueOf(npath), + String.valueOf(reportLevel)); } return data; diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/NcssCountRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/NcssCountRule.java index fe252338f1..492d2474e4 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/NcssCountRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/NcssCountRule.java @@ -115,9 +115,8 @@ public final class NcssCountRule extends AbstractJavaRulechainRule { if (JavaMetrics.NCSS.supports(node)) { int methodSize = MetricsUtil.computeMetric(JavaMetrics.NCSS, node, ncssOptions); if (methodSize >= level) { - asCtx(data).addViolation(node, new String[] { - node instanceof ASTMethodDeclaration ? "method" : "constructor", - PrettyPrintingUtil.displaySignature(node), "" + methodSize, }); + asCtx(data).addViolation(node, node instanceof ASTMethodDeclaration ? "method" : "constructor", + PrettyPrintingUtil.displaySignature(node), "" + methodSize); } } } diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/ConsecutiveLiteralAppendsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/ConsecutiveLiteralAppendsRule.java index 8f100a88af..367c2e7be0 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/ConsecutiveLiteralAppendsRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/ConsecutiveLiteralAppendsRule.java @@ -258,8 +258,7 @@ public class ConsecutiveLiteralAppendsRule extends AbstractJavaRulechainRule { private void checkForViolation(Object data) { if (counter.isViolation()) { assert counter.getReportNode() != null; - String[] param = { String.valueOf(counter.getCounter()) }; - asCtx(data).addViolation(counter.getReportNode(), param); + asCtx(data).addViolation(counter.getReportNode(), String.valueOf(counter.getCounter())); } } diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/InsufficientStringBufferDeclarationRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/InsufficientStringBufferDeclarationRule.java index 7f1905577f..a6fabf91a2 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/InsufficientStringBufferDeclarationRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/performance/InsufficientStringBufferDeclarationRule.java @@ -72,7 +72,7 @@ public class InsufficientStringBufferDeclarationRule extends AbstractJavaRulecha } - public String[] getParamsForViolation() { + public Object[] getParamsForViolation() { return new String[] { getTypeName(variable), String.valueOf(capacity), String.valueOf(anticipatedLength) }; } diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/design/CyclomaticComplexityRule.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/design/CyclomaticComplexityRule.java index ca79a806a2..c35c9b1752 100644 --- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/design/CyclomaticComplexityRule.java +++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/design/CyclomaticComplexityRule.java @@ -210,8 +210,8 @@ public class CyclomaticComplexityRule extends AbstractPLSQLRule { classEntry.getComplexityAverage(), classEntry.highestDecisionPoints); if (showClassesComplexity) { if (classEntry.getComplexityAverage() >= reportLevel || classEntry.highestDecisionPoints >= reportLevel) { - asCtx(data).addViolation(node, new String[] { "class", node.getImage(), - classEntry.getComplexityAverage() + " (Highest = " + classEntry.highestDecisionPoints + ')', }); + asCtx(data).addViolation(node, "class", node.getImage(), + classEntry.getComplexityAverage() + " (Highest = " + classEntry.highestDecisionPoints + ')'); } } return data; @@ -227,8 +227,8 @@ public class CyclomaticComplexityRule extends AbstractPLSQLRule { classEntry.highestDecisionPoints); if (showClassesComplexity) { if (classEntry.getComplexityAverage() >= reportLevel || classEntry.highestDecisionPoints >= reportLevel) { - asCtx(data).addViolation(node, new String[] { "class", node.getImage(), - classEntry.getComplexityAverage() + " (Highest = " + classEntry.highestDecisionPoints + ')', }); + asCtx(data).addViolation(node, "class", node.getImage(), + classEntry.getComplexityAverage() + " (Highest = " + classEntry.highestDecisionPoints + ')'); } } return data; @@ -276,8 +276,8 @@ public class CyclomaticComplexityRule extends AbstractPLSQLRule { ASTMethodDeclarator methodDeclarator = node.firstChild(ASTMethodDeclarator.class); if (methodEntry.decisionPoints >= reportLevel) { asCtx(data).addViolation(node, - new String[] { "method", methodDeclarator == null ? "" : methodDeclarator.getImage(), - String.valueOf(methodEntry.decisionPoints), }); + "method", methodDeclarator == null ? "" : methodDeclarator.getImage(), + String.valueOf(methodEntry.decisionPoints)); } } return data; @@ -306,8 +306,8 @@ public class CyclomaticComplexityRule extends AbstractPLSQLRule { ASTMethodDeclarator methodDeclarator = node.firstChild(ASTMethodDeclarator.class); if (methodEntry.decisionPoints >= reportLevel) { asCtx(data).addViolation(node, - new String[] { "method", methodDeclarator == null ? "" : methodDeclarator.getImage(), - String.valueOf(methodEntry.decisionPoints), }); + "method", methodDeclarator == null ? "" : methodDeclarator.getImage(), + String.valueOf(methodEntry.decisionPoints)); } } return data; @@ -334,8 +334,8 @@ public class CyclomaticComplexityRule extends AbstractPLSQLRule { ASTMethodDeclarator methodDeclarator = node.firstChild(ASTMethodDeclarator.class); if (methodEntry.decisionPoints >= reportLevel) { asCtx(data).addViolation(node, - new String[] { "method", methodDeclarator == null ? "" : methodDeclarator.getImage(), - String.valueOf(methodEntry.decisionPoints), }); + "method", methodDeclarator == null ? "" : methodDeclarator.getImage(), + String.valueOf(methodEntry.decisionPoints)); } } return data;