From a47471f742f0aef8675c33a9d5cf68b3296fa92d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= Date: Sun, 15 Oct 2017 22:22:36 +0200 Subject: [PATCH] Replace IntegerProperty --- .../complexity/AvoidDeeplyNestedIfStmtsRule.java | 6 ++++-- .../rule/complexity/StdCyclomaticComplexityRule.java | 6 ++++-- .../java/net/sourceforge/pmd/lang/rule/MockRule.java | 2 +- .../java/net/sourceforge/pmd/AbstractRuleTest.java | 2 +- .../pmd/properties/NonRuleWithAllPropertyTypes.java | 3 +-- .../rule/codesize/StdCyclomaticComplexityRule.java | 6 ++++-- .../pmd/lang/java/rule/comments/CommentSizeRule.java | 12 +++++++++--- .../rule/coupling/CouplingBetweenObjectsRule.java | 6 ++++-- .../rule/design/AvoidDeeplyNestedIfStmtsRule.java | 6 ++++-- .../rule/strings/AvoidDuplicateLiteralsRule.java | 6 ++++-- .../rule/strings/ConsecutiveLiteralAppendsRule.java | 6 ++++-- .../rule/codesize/CyclomaticComplexityRule.java | 6 ++++-- .../vm/rule/basic/AvoidDeeplyNestedIfStmtsRule.java | 6 ++++-- 13 files changed, 48 insertions(+), 25 deletions(-) diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/complexity/AvoidDeeplyNestedIfStmtsRule.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/complexity/AvoidDeeplyNestedIfStmtsRule.java index 8c657d2f44..eaf6272c77 100644 --- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/complexity/AvoidDeeplyNestedIfStmtsRule.java +++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/complexity/AvoidDeeplyNestedIfStmtsRule.java @@ -14,8 +14,10 @@ public class AvoidDeeplyNestedIfStmtsRule extends AbstractApexRule { private int depth; private int depthLimit; - private static final IntegerProperty PROBLEM_DEPTH_DESCRIPTOR = new IntegerProperty("problemDepth", - "The if statement depth reporting threshold", 1, 25, 3, 1.0f); + private static final IntegerProperty PROBLEM_DEPTH_DESCRIPTOR + = IntegerProperty.builder("problemDepth") + .desc("The if statement depth reporting threshold") + .min(1).max(25).defalt(3).uiOrder(1.0f).build(); public AvoidDeeplyNestedIfStmtsRule() { definePropertyDescriptor(PROBLEM_DEPTH_DESCRIPTOR); diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/complexity/StdCyclomaticComplexityRule.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/complexity/StdCyclomaticComplexityRule.java index 2eabcf788a..297ee7816d 100644 --- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/complexity/StdCyclomaticComplexityRule.java +++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/complexity/StdCyclomaticComplexityRule.java @@ -37,8 +37,10 @@ import net.sourceforge.pmd.properties.IntegerProperty; */ public class StdCyclomaticComplexityRule extends AbstractApexRule { - public static final IntegerProperty REPORT_LEVEL_DESCRIPTOR = new IntegerProperty("reportLevel", - "Cyclomatic Complexity reporting threshold", 1, 30, 10, 1.0f); + public static final IntegerProperty REPORT_LEVEL_DESCRIPTOR + = IntegerProperty.builder("reportLevel") + .desc("Cyclomatic Complexity reporting threshold") + .min(1).max(30).defalt(10).uiOrder(1.0f).build(); public static final BooleanProperty SHOW_CLASSES_COMPLEXITY_DESCRIPTOR = new BooleanProperty( "showClassesComplexity", "Add class average violations to the report", true, 2.0f); diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/MockRule.java b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/MockRule.java index f363ba3e03..4eec038fe2 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/MockRule.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/lang/rule/MockRule.java @@ -23,7 +23,7 @@ public class MockRule extends AbstractRule { public MockRule() { super(); setLanguage(LanguageRegistry.getLanguage("Dummy")); - definePropertyDescriptor(new IntegerProperty("testIntProperty", "testIntProperty", 0, 100, 1, 0)); + definePropertyDescriptor(IntegerProperty.builder("testIntProperty").desc("testIntProperty").min(0).max(100).defalt(1).uiOrder(0).build()); } public MockRule(String name, String description, String message, String ruleSetName, RulePriority priority) { diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/AbstractRuleTest.java b/pmd-core/src/test/java/net/sourceforge/pmd/AbstractRuleTest.java index 7fd8b2e4c2..726d997435 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/AbstractRuleTest.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/AbstractRuleTest.java @@ -96,7 +96,7 @@ public class AbstractRuleTest { @Test public void testRuleWithVariableInMessage() { MyRule r = new MyRule(); - r.definePropertyDescriptor(new IntegerProperty("testInt", "description", 0, 100, 10, 0)); + r.definePropertyDescriptor(IntegerProperty.builder("testInt").desc("description").min(0).max(100).defalt(10).uiOrder(0).build()); r.setMessage("Message ${packageName} ${className} ${methodName} ${variableName} ${testInt} ${noSuchProperty}"); RuleContext ctx = new RuleContext(); ctx.setLanguageVersion(LanguageRegistry.getLanguage(DummyLanguageModule.NAME).getDefaultVersion()); diff --git a/pmd-core/src/test/java/net/sourceforge/pmd/properties/NonRuleWithAllPropertyTypes.java b/pmd-core/src/test/java/net/sourceforge/pmd/properties/NonRuleWithAllPropertyTypes.java index 9c4b4205c4..f27a6eb058 100644 --- a/pmd-core/src/test/java/net/sourceforge/pmd/properties/NonRuleWithAllPropertyTypes.java +++ b/pmd-core/src/test/java/net/sourceforge/pmd/properties/NonRuleWithAllPropertyTypes.java @@ -34,8 +34,7 @@ public class NonRuleWithAllPropertyTypes extends AbstractRule { public static final StringProperty SINGLE_STR = new StringProperty("singleStr", "String value", "hello world", 3.0f); public static final StringMultiProperty MULTI_STR = new StringMultiProperty("multiStr", "Multiple string values", new String[] {"hello", "world"}, 5.0f, '|'); - public static final IntegerProperty SINGLE_INT = new IntegerProperty("singleInt", "Single integer value", 1, 10, 8, - 3.0f); + public static final IntegerProperty SINGLE_INT = IntegerProperty.builder("singleInt").desc("Single integer value").min(1).max(10).defalt(8).uiOrder(3.0f).build(); public static final IntegerMultiProperty MULTI_INT = new IntegerMultiProperty("multiInt", "Multiple integer values", 0, 10, new Integer[] {1, 2, 3, 4}, 5.0f); public static final LongProperty SINGLE_LONG = new LongProperty("singleLong", "Single long value", 1L, 10L, 8L, diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/StdCyclomaticComplexityRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/StdCyclomaticComplexityRule.java index dde262300d..768a130774 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/StdCyclomaticComplexityRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/codesize/StdCyclomaticComplexityRule.java @@ -39,8 +39,10 @@ import net.sourceforge.pmd.properties.IntegerProperty; */ public class StdCyclomaticComplexityRule extends AbstractJavaRule { - public static final IntegerProperty REPORT_LEVEL_DESCRIPTOR = new IntegerProperty("reportLevel", - "Cyclomatic Complexity reporting threshold", 1, 30, 10, 1.0f); + public static final IntegerProperty REPORT_LEVEL_DESCRIPTOR + = IntegerProperty.builder("reportLevel") + .desc("Cyclomatic Complexity reporting threshold") + .min(1).max(30).defalt(10).uiOrder(1.0f).build(); public static final BooleanProperty SHOW_CLASSES_COMPLEXITY_DESCRIPTOR = new BooleanProperty( "showClassesComplexity", "Add class average violations to the report", true, 2.0f); diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/CommentSizeRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/CommentSizeRule.java index eeeb7cdd0d..aabc6a16ac 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/CommentSizeRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/comments/CommentSizeRule.java @@ -21,9 +21,15 @@ import net.sourceforge.pmd.util.StringUtil; */ public class CommentSizeRule extends AbstractCommentRule { - public static final IntegerProperty MAX_LINES = new IntegerProperty("maxLines", "Maximum lines", 2, 200, 6, 2.0f); - public static final IntegerProperty MAX_LINE_LENGTH = new IntegerProperty("maxLineLength", "Maximum line length", 1, - 200, 80, 2.0f); + public static final IntegerProperty MAX_LINES + = IntegerProperty.builder("maxLines") + .desc("Maximum lines") + .min(2).max(200).defalt(6).uiOrder(2.0f).build(); + + public static final IntegerProperty MAX_LINE_LENGTH + = IntegerProperty.builder("maxLineLength") + .desc("Maximum line length") + .min(1).max(200).defalt(80).uiOrder(2.0f).build(); private static final String CR = "\n"; diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/coupling/CouplingBetweenObjectsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/coupling/CouplingBetweenObjectsRule.java index 00124a484a..d7035c5a68 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/coupling/CouplingBetweenObjectsRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/coupling/CouplingBetweenObjectsRule.java @@ -36,8 +36,10 @@ public class CouplingBetweenObjectsRule extends AbstractJavaRule { private int couplingCount; private Set typesFoundSoFar; - private static final IntegerProperty THRESHOLD_DESCRIPTOR = new IntegerProperty("threshold", - "Unique type reporting threshold", 2, 100, 20, 1.0f); + private static final IntegerProperty THRESHOLD_DESCRIPTOR + = IntegerProperty.builder("threshold") + .desc("Unique type reporting threshold") + .min(2).max(100).defalt(20).uiOrder(1.0f).build(); public CouplingBetweenObjectsRule() { definePropertyDescriptor(THRESHOLD_DESCRIPTOR); diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/AvoidDeeplyNestedIfStmtsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/AvoidDeeplyNestedIfStmtsRule.java index 973b6a56aa..78610170ed 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/AvoidDeeplyNestedIfStmtsRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/design/AvoidDeeplyNestedIfStmtsRule.java @@ -14,8 +14,10 @@ public class AvoidDeeplyNestedIfStmtsRule extends AbstractJavaRule { private int depth; private int depthLimit; - private static final IntegerProperty PROBLEM_DEPTH_DESCRIPTOR = new IntegerProperty("problemDepth", - "The if statement depth reporting threshold", 1, 25, 3, 1.0f); + private static final IntegerProperty PROBLEM_DEPTH_DESCRIPTOR + = IntegerProperty.builder("problemDepth") + .desc("The if statement depth reporting threshold") + .min(1).max(25).defalt(3).uiOrder(1.0f).build(); public AvoidDeeplyNestedIfStmtsRule() { definePropertyDescriptor(PROBLEM_DEPTH_DESCRIPTOR); diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/AvoidDuplicateLiteralsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/AvoidDuplicateLiteralsRule.java index c5f31cf4a6..75a135331e 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/AvoidDuplicateLiteralsRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/AvoidDuplicateLiteralsRule.java @@ -33,8 +33,10 @@ import net.sourceforge.pmd.properties.StringProperty; public class AvoidDuplicateLiteralsRule extends AbstractJavaRule { - public static final IntegerProperty THRESHOLD_DESCRIPTOR = new IntegerProperty("maxDuplicateLiterals", - "Max duplicate literals", 1, 20, 4, 1.0f); + public static final IntegerProperty THRESHOLD_DESCRIPTOR + = IntegerProperty.builder("maxDuplicateLiterals") + .desc("Max duplicate literals") + .min(1).max(20).defalt(4).uiOrder(1.0f).build(); public static final IntegerProperty MINIMUM_LENGTH_DESCRIPTOR = new IntegerProperty("minimumLength", "Minimum string length to check", 1, Integer.MAX_VALUE, 3, 1.5f); diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/ConsecutiveLiteralAppendsRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/ConsecutiveLiteralAppendsRule.java index 52c86a8836..01a9e3e1bf 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/ConsecutiveLiteralAppendsRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/strings/ConsecutiveLiteralAppendsRule.java @@ -71,8 +71,10 @@ public class ConsecutiveLiteralAppendsRule extends AbstractJavaRule { BLOCK_PARENTS.add(ASTMethodDeclaration.class); } - private static final IntegerProperty THRESHOLD_DESCRIPTOR = new IntegerProperty("threshold", - "Max consecutive appends", 1, 10, 1, 1.0f); + private static final IntegerProperty THRESHOLD_DESCRIPTOR + = IntegerProperty.builder("threshold") + .desc("Max consecutive appends") + .min(1).max(10).defalt(1).uiOrder(1.0f).build(); private int threshold = 1; diff --git a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/codesize/CyclomaticComplexityRule.java b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/codesize/CyclomaticComplexityRule.java index 1712855aa0..3490327d61 100644 --- a/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/codesize/CyclomaticComplexityRule.java +++ b/pmd-plsql/src/main/java/net/sourceforge/pmd/lang/plsql/rule/codesize/CyclomaticComplexityRule.java @@ -43,8 +43,10 @@ public class CyclomaticComplexityRule extends AbstractPLSQLRule { private static final Logger LOGGER = Logger.getLogger(CyclomaticComplexityRule.class.getName()); private static final String CLASS_NAME = CyclomaticComplexityRule.class.getName(); - public static final IntegerProperty REPORT_LEVEL_DESCRIPTOR = new IntegerProperty("reportLevel", - "Cyclomatic Complexity reporting threshold", 1, 30, 10, 1.0f); + public static final IntegerProperty REPORT_LEVEL_DESCRIPTOR + = IntegerProperty.builder("reportLevel") + .desc("Cyclomatic Complexity reporting threshold") + .min(1).max(30).defalt(10).uiOrder(1.0f).build(); public static final BooleanProperty SHOW_CLASSES_COMPLEXITY_DESCRIPTOR = new BooleanProperty( "showClassesComplexity", "Add class average violations to the report", true, 2.0f); diff --git a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/rule/basic/AvoidDeeplyNestedIfStmtsRule.java b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/rule/basic/AvoidDeeplyNestedIfStmtsRule.java index 228d9ab9e8..04a055d03d 100644 --- a/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/rule/basic/AvoidDeeplyNestedIfStmtsRule.java +++ b/pmd-vm/src/main/java/net/sourceforge/pmd/lang/vm/rule/basic/AvoidDeeplyNestedIfStmtsRule.java @@ -16,8 +16,10 @@ public class AvoidDeeplyNestedIfStmtsRule extends AbstractVmRule { private int depth; private int depthLimit; - private static final IntegerProperty PROBLEM_DEPTH_DESCRIPTOR = new IntegerProperty("problemDepth", - "The if statement depth reporting threshold", 1, 25, 3, 1.0f); + private static final IntegerProperty PROBLEM_DEPTH_DESCRIPTOR + = IntegerProperty.builder("problemDepth") + .desc("The if statement depth reporting threshold") + .min(1).max(25).defalt(3).uiOrder(1.0f).build(); public AvoidDeeplyNestedIfStmtsRule() { definePropertyDescriptor(PROBLEM_DEPTH_DESCRIPTOR);