From 6b50104cb57d40e5057c169fd817b7468f187c48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Fournier?= Date: Wed, 1 Nov 2017 18:17:57 +0100 Subject: [PATCH] Corrections for PR #669 --- .../AvoidDeeplyNestedIfStmtsRule.java | 2 +- .../StdCyclomaticComplexityRule.java | 2 +- .../sourceforge/pmd/lang/rule/MockRule.java | 2 +- .../pmd/properties/BooleanMultiProperty.java | 9 ++-- .../pmd/properties/BooleanProperty.java | 10 ++--- .../properties/CharacterMultiProperty.java | 9 ++-- .../pmd/properties/CharacterProperty.java | 9 ++-- .../pmd/properties/DoubleMultiProperty.java | 9 ++-- .../pmd/properties/DoubleProperty.java | 9 ++-- .../properties/EnumeratedMultiProperty.java | 22 ++++++--- .../pmd/properties/EnumeratedProperty.java | 5 ++- .../pmd/properties/FileProperty.java | 9 ++-- .../pmd/properties/FloatMultiProperty.java | 9 ++-- .../pmd/properties/FloatProperty.java | 9 ++-- .../pmd/properties/IntegerMultiProperty.java | 9 ++-- .../pmd/properties/IntegerProperty.java | 9 ++-- .../pmd/properties/LongMultiProperty.java | 15 ++++--- .../pmd/properties/LongProperty.java | 9 ++-- .../pmd/properties/MethodMultiProperty.java | 17 +++---- .../pmd/properties/MethodProperty.java | 13 +++--- .../pmd/properties/StringMultiProperty.java | 9 ++-- .../pmd/properties/StringProperty.java | 11 ++--- .../pmd/properties/TypeMultiProperty.java | 16 ++++--- .../pmd/properties/TypeProperty.java | 11 ++--- .../builders/MultiNumericPropertyBuilder.java | 29 ++++-------- .../MultiPackagedPropertyBuilder.java | 5 +++ .../builders/MultiValuePropertyBuilder.java | 24 +++++++++- .../builders/PropertyDescriptorBuilder.java | 13 +----- ...rtyDescriptorBuilderConversionWrapper.java | 45 ++++++++++--------- .../SingleNumericPropertyBuilder.java | 26 +++++------ .../SinglePackagedPropertyBuilder.java | 7 ++- .../builders/SingleValuePropertyBuilder.java | 9 +++- .../net/sourceforge/pmd/AbstractRuleTest.java | 2 +- .../NonRuleWithAllPropertyTypes.java | 2 +- .../rule/CyclomaticComplexityRule.java | 6 +-- .../rule/basic/AvoidUsingOctalValuesRule.java | 2 +- .../codesize/StdCyclomaticComplexityRule.java | 2 +- .../java/rule/comments/CommentSizeRule.java | 4 +- .../DataflowAnomalyAnalysisRule.java | 10 ++--- .../coupling/CouplingBetweenObjectsRule.java | 2 +- .../design/AvoidDeeplyNestedIfStmtsRule.java | 2 +- .../strings/AvoidDuplicateLiteralsRule.java | 2 +- .../ConsecutiveLiteralAppendsRule.java | 2 +- .../codesize/CyclomaticComplexityRule.java | 2 +- .../basic/AvoidDeeplyNestedIfStmtsRule.java | 2 +- 45 files changed, 236 insertions(+), 196 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 eaf6272c77..ac199cfdac 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 @@ -17,7 +17,7 @@ public class AvoidDeeplyNestedIfStmtsRule extends AbstractApexRule { 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(); + .range(1, 25).defaultValue(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 297ee7816d..1ded37e5c7 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 @@ -40,7 +40,7 @@ public class StdCyclomaticComplexityRule extends AbstractApexRule { 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(); + .range(1, 30).defaultValue(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 4eec038fe2..4777e22a46 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(IntegerProperty.builder("testIntProperty").desc("testIntProperty").min(0).max(100).defalt(1).uiOrder(0).build()); + definePropertyDescriptor(IntegerProperty.builder("testIntProperty").desc("testIntProperty").range(0, 100).defaultValue(1).uiOrder(0).build()); } public MockRule(String name, String description, String message, String ruleSetName, RulePriority priority) { diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/properties/BooleanMultiProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/properties/BooleanMultiProperty.java index c513a24119..beb165d551 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/properties/BooleanMultiProperty.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/properties/BooleanMultiProperty.java @@ -69,20 +69,21 @@ public final class BooleanMultiProperty extends AbstractMultiValueProperty extractor() { return new PropertyDescriptorBuilderConversionWrapper.MultiValue(Boolean.class, ValueParserConstants.BOOLEAN_PARSER) { @Override - protected BooleanMultiPBuilder newBuilder() { - return new BooleanMultiPBuilder(); + protected BooleanMultiPBuilder newBuilder(String name) { + return new BooleanMultiPBuilder(name); } }; } public static BooleanMultiPBuilder builder(String name) { - return new BooleanMultiPBuilder().name(name); + return new BooleanMultiPBuilder(name); } public static final class BooleanMultiPBuilder extends MultiValuePropertyBuilder { - private BooleanMultiPBuilder() { + private BooleanMultiPBuilder(String name) { + super(name); } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/properties/BooleanProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/properties/BooleanProperty.java index 6561942e20..0f52ca8dae 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/properties/BooleanProperty.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/properties/BooleanProperty.java @@ -67,21 +67,21 @@ public final class BooleanProperty extends AbstractSingleValueProperty static PropertyDescriptorBuilderConversionWrapper.SingleValue extractor() { return new PropertyDescriptorBuilderConversionWrapper.SingleValue(Boolean.class, ValueParserConstants.BOOLEAN_PARSER) { @Override - protected BooleanPBuilder newBuilder() { - return new BooleanPBuilder(); + protected BooleanPBuilder newBuilder(String name) { + return new BooleanPBuilder(name); } }; } public static BooleanPBuilder builder(String name) { - return new BooleanPBuilder().name(name); + return new BooleanPBuilder(name); } public static final class BooleanPBuilder extends SingleValuePropertyBuilder { - private BooleanPBuilder() { - + private BooleanPBuilder(String name) { + super(name); } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/properties/CharacterMultiProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/properties/CharacterMultiProperty.java index 943eafbc88..eab0b82be7 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/properties/CharacterMultiProperty.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/properties/CharacterMultiProperty.java @@ -97,20 +97,21 @@ public final class CharacterMultiProperty extends AbstractMultiValueProperty extractor() { return new PropertyDescriptorBuilderConversionWrapper.MultiValue(Character.class, ValueParserConstants.CHARACTER_PARSER) { @Override - protected CharacterMultiPBuilder newBuilder() { - return new CharacterMultiPBuilder(); + protected CharacterMultiPBuilder newBuilder(String name) { + return new CharacterMultiPBuilder(name); } }; } public static CharacterMultiPBuilder builder(String name) { - return new CharacterMultiPBuilder().name(name); + return new CharacterMultiPBuilder(name); } public static final class CharacterMultiPBuilder extends MultiValuePropertyBuilder { - private CharacterMultiPBuilder() { + private CharacterMultiPBuilder(String name) { + super(name); } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/properties/CharacterProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/properties/CharacterProperty.java index b73d72d445..252fba061e 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/properties/CharacterProperty.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/properties/CharacterProperty.java @@ -81,20 +81,21 @@ public final class CharacterProperty extends AbstractSingleValueProperty extractor() { return new PropertyDescriptorBuilderConversionWrapper.SingleValue(Character.class, ValueParserConstants.CHARACTER_PARSER) { @Override - protected CharacterPBuilder newBuilder() { - return new CharacterPBuilder(); + protected CharacterPBuilder newBuilder(String name) { + return new CharacterPBuilder(name); } }; } public static CharacterPBuilder builder(String name) { - return new CharacterPBuilder().name(name); + return new CharacterPBuilder(name); } public static final class CharacterPBuilder extends SingleValuePropertyBuilder { - private CharacterPBuilder() { + private CharacterPBuilder(String name) { + super(name); } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/properties/DoubleMultiProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/properties/DoubleMultiProperty.java index 9c7ec2280e..4408deae94 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/properties/DoubleMultiProperty.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/properties/DoubleMultiProperty.java @@ -77,20 +77,21 @@ public final class DoubleMultiProperty extends AbstractMultiNumericProperty extractor() { return new PropertyDescriptorBuilderConversionWrapper.MultiValue.Numeric(Double.class, ValueParserConstants.DOUBLE_PARSER) { @Override - protected DoubleMultiPBuilder newBuilder() { - return new DoubleMultiPBuilder(); + protected DoubleMultiPBuilder newBuilder(String name) { + return new DoubleMultiPBuilder(name); } }; } public static DoubleMultiPBuilder builder(String name) { - return new DoubleMultiPBuilder().name(name); + return new DoubleMultiPBuilder(name); } public static final class DoubleMultiPBuilder extends MultiNumericPropertyBuilder { - private DoubleMultiPBuilder() { + private DoubleMultiPBuilder(String name) { + super(name); } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/properties/DoubleProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/properties/DoubleProperty.java index cc4f772a5b..46e834dae5 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/properties/DoubleProperty.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/properties/DoubleProperty.java @@ -91,20 +91,21 @@ public final class DoubleProperty extends AbstractNumericProperty { static PropertyDescriptorBuilderConversionWrapper.SingleValue.Numeric extractor() { return new PropertyDescriptorBuilderConversionWrapper.SingleValue.Numeric(Double.class, ValueParserConstants.DOUBLE_PARSER) { @Override - protected DoublePBuilder newBuilder() { - return new DoublePBuilder(); + protected DoublePBuilder newBuilder(String name) { + return new DoublePBuilder(name); } }; } public static DoublePBuilder builder(String name) { - return new DoublePBuilder().name(name); + return new DoublePBuilder(name); } public static final class DoublePBuilder extends SingleNumericPropertyBuilder { - private DoublePBuilder() { + private DoublePBuilder(String name) { + super(name); } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/properties/EnumeratedMultiProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/properties/EnumeratedMultiProperty.java index 1c4384a821..371b8f558e 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/properties/EnumeratedMultiProperty.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/properties/EnumeratedMultiProperty.java @@ -24,7 +24,7 @@ import net.sourceforge.pmd.util.CollectionUtil; * @version Refactored June 2017 (6.0.0) */ public final class EnumeratedMultiProperty extends AbstractMultiValueProperty - implements EnumeratedPropertyDescriptor> { + implements EnumeratedPropertyDescriptor> { private final EnumeratedPropertyModule module; @@ -43,13 +43,13 @@ public final class EnumeratedMultiProperty extends AbstractMultiValueProperty * @param theUIOrder UI order * * @deprecated Use {@link #EnumeratedMultiProperty(String, String, Map, List, Class, float)}. Will be removed in - * 7.0.0 + * 7.0.0 */ @Deprecated public EnumeratedMultiProperty(String theName, String theDescription, String[] theLabels, E[] theChoices, int[] choiceIndices, Class valueType, float theUIOrder) { this(theName, theDescription, CollectionUtil.mapFrom(theLabels, theChoices), - selection(choiceIndices, theChoices), valueType, theUIOrder, false); + selection(choiceIndices, theChoices), valueType, theUIOrder, false); } @@ -65,13 +65,13 @@ public final class EnumeratedMultiProperty extends AbstractMultiValueProperty * @param theUIOrder UI order * * @deprecated Use {@link #EnumeratedMultiProperty(String, String, Map, List, Class, float)}. Will be removed in - * 7.0.0 + * 7.0.0 */ @Deprecated public EnumeratedMultiProperty(String theName, String theDescription, String[] theLabels, E[] theChoices, int[] choiceIndices, float theUIOrder) { this(theName, theDescription, CollectionUtil.mapFrom(theLabels, theChoices), - selection(choiceIndices, theChoices), null, theUIOrder, false); + selection(choiceIndices, theChoices), null, theUIOrder, false); } @@ -157,7 +157,7 @@ public final class EnumeratedMultiProperty extends AbstractMultiValueProperty public static EnumMultiPBuilder builder(String name, Class type) { - return new EnumMultiPBuilder<>(type).name(name); + return new EnumMultiPBuilder<>(name, type); } @@ -167,11 +167,19 @@ public final class EnumeratedMultiProperty extends AbstractMultiValueProperty private Map mappings; - private EnumMultiPBuilder(Class type) { + private EnumMultiPBuilder(String name, Class type) { + super(name); this.valueType = type; } + /** + * Sets the key-value mappings. + * + * @param map A map of label to value + * + * @return The same builder + */ public EnumMultiPBuilder mappings(Map map) { this.mappings = map; return this; diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/properties/EnumeratedProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/properties/EnumeratedProperty.java index 23b2534c59..0cd5b16c42 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/properties/EnumeratedProperty.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/properties/EnumeratedProperty.java @@ -129,7 +129,7 @@ public final class EnumeratedProperty extends AbstractSingleValueProperty public static EnumPBuilder builder(String name, Class type) { - return new EnumPBuilder<>(type).name(name); + return new EnumPBuilder<>(name, type); } @@ -139,7 +139,8 @@ public final class EnumeratedProperty extends AbstractSingleValueProperty private Map mappings; - private EnumPBuilder(Class type) { + private EnumPBuilder(String name, Class type) { + super(name); this.valueType = type; } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/properties/FileProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/properties/FileProperty.java index c67f3a8631..d01f177926 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/properties/FileProperty.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/properties/FileProperty.java @@ -55,20 +55,21 @@ public final class FileProperty extends AbstractSingleValueProperty { static PropertyDescriptorBuilderConversionWrapper.SingleValue extractor() { return new PropertyDescriptorBuilderConversionWrapper.SingleValue(File.class, ValueParserConstants.FILE_PARSER) { @Override - protected FilePBuilder newBuilder() { - return new FilePBuilder(); + protected FilePBuilder newBuilder(String name) { + return new FilePBuilder(name); } }; } public static FilePBuilder builder(String name) { - return new FilePBuilder().name(name); + return new FilePBuilder(name); } public static final class FilePBuilder extends SinglePackagedPropertyBuilder { - private FilePBuilder() { + private FilePBuilder(String name) { + super(name); } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/properties/FloatMultiProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/properties/FloatMultiProperty.java index f4d6c3ee9c..cf28feb715 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/properties/FloatMultiProperty.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/properties/FloatMultiProperty.java @@ -78,20 +78,21 @@ public final class FloatMultiProperty extends AbstractMultiNumericProperty extractor() { return new PropertyDescriptorBuilderConversionWrapper.MultiValue.Numeric(Float.class, ValueParserConstants.FLOAT_PARSER) { @Override - protected FloatMultiPBuilder newBuilder() { - return new FloatMultiPBuilder(); + protected FloatMultiPBuilder newBuilder(String name) { + return new FloatMultiPBuilder(name); } }; } public static FloatMultiPBuilder builder(String name) { - return new FloatMultiPBuilder().name(name); + return new FloatMultiPBuilder(name); } public static final class FloatMultiPBuilder extends MultiNumericPropertyBuilder { - private FloatMultiPBuilder() { + private FloatMultiPBuilder(String name) { + super(name); } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/properties/FloatProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/properties/FloatProperty.java index f66fdd4b77..352d5cb81b 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/properties/FloatProperty.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/properties/FloatProperty.java @@ -79,20 +79,21 @@ public final class FloatProperty extends AbstractNumericProperty { static PropertyDescriptorBuilderConversionWrapper.SingleValue.Numeric extractor() { return new PropertyDescriptorBuilderConversionWrapper.SingleValue.Numeric(Float.class, ValueParserConstants.FLOAT_PARSER) { @Override - protected FloatPBuilder newBuilder() { - return new FloatPBuilder(); + protected FloatPBuilder newBuilder(String name) { + return new FloatPBuilder(name); } }; } public static FloatPBuilder builder(String name) { - return new FloatPBuilder().name(name); + return new FloatPBuilder(name); } public static final class FloatPBuilder extends SingleNumericPropertyBuilder { - private FloatPBuilder() { + private FloatPBuilder(String name) { + super(name); } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/properties/IntegerMultiProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/properties/IntegerMultiProperty.java index 352c0b830c..9453d9079a 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/properties/IntegerMultiProperty.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/properties/IntegerMultiProperty.java @@ -80,20 +80,21 @@ public final class IntegerMultiProperty extends AbstractMultiNumericProperty extractor() { return new PropertyDescriptorBuilderConversionWrapper.MultiValue.Numeric(Integer.class, ValueParserConstants.INTEGER_PARSER) { @Override - protected IntegerMultiPBuilder newBuilder() { - return new IntegerMultiPBuilder(); + protected IntegerMultiPBuilder newBuilder(String name) { + return new IntegerMultiPBuilder(name); } }; } public static IntegerMultiPBuilder builder(String name) { - return new IntegerMultiPBuilder().name(name); + return new IntegerMultiPBuilder(name); } public static final class IntegerMultiPBuilder extends MultiNumericPropertyBuilder { - private IntegerMultiPBuilder() { + private IntegerMultiPBuilder(String name) { + super(name); } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/properties/IntegerProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/properties/IntegerProperty.java index ccb486002f..5797c82b3b 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/properties/IntegerProperty.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/properties/IntegerProperty.java @@ -58,20 +58,21 @@ public final class IntegerProperty extends AbstractNumericProperty { static PropertyDescriptorBuilderConversionWrapper.SingleValue.Numeric extractor() { return new PropertyDescriptorBuilderConversionWrapper.SingleValue.Numeric(Integer.class, ValueParserConstants.INTEGER_PARSER) { @Override - protected IntegerPBuilder newBuilder() { - return new IntegerPBuilder(); + protected IntegerPBuilder newBuilder(String name) { + return new IntegerPBuilder(name); } }; } public static IntegerPBuilder builder(String name) { - return new IntegerPBuilder().name(name); + return new IntegerPBuilder(name); } public static final class IntegerPBuilder extends SingleNumericPropertyBuilder { - private IntegerPBuilder() { + private IntegerPBuilder(String name) { + super(name); } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/properties/LongMultiProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/properties/LongMultiProperty.java index eac7ccda3a..f70814f0d0 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/properties/LongMultiProperty.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/properties/LongMultiProperty.java @@ -78,25 +78,30 @@ public final class LongMultiProperty extends AbstractMultiNumericProperty static PropertyDescriptorBuilderConversionWrapper.MultiValue.Numeric extractor() { return new PropertyDescriptorBuilderConversionWrapper.MultiValue.Numeric(Long.class, ValueParserConstants.LONG_PARSER) { @Override - protected LongMultiPBuilder newBuilder() { - return new LongMultiPBuilder(); + protected LongMultiPBuilder newBuilder(String name) { + return new LongMultiPBuilder(name); } }; } public static LongMultiPBuilder builder(String name) { - return new LongMultiPBuilder().name(name); + return new LongMultiPBuilder(name); } private static final class LongMultiPBuilder - extends MultiNumericPropertyBuilder { + extends MultiNumericPropertyBuilder { + + protected LongMultiPBuilder(String name) { + super(name); + } + @Override public LongMultiProperty build() { return new LongMultiProperty(name, description, lowerLimit, upperLimit, - defaultValues, uiOrder, isDefinedInXML); + defaultValues, uiOrder, isDefinedInXML); } } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/properties/LongProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/properties/LongProperty.java index 08c50e28f8..ad3751bb80 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/properties/LongProperty.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/properties/LongProperty.java @@ -78,20 +78,21 @@ public final class LongProperty extends AbstractNumericProperty { static PropertyDescriptorBuilderConversionWrapper.SingleValue.Numeric extractor() { return new PropertyDescriptorBuilderConversionWrapper.SingleValue.Numeric(Long.class, ValueParserConstants.LONG_PARSER) { @Override - protected LongPBuilder newBuilder() { - return new LongPBuilder(); + protected LongPBuilder newBuilder(String name) { + return new LongPBuilder(name); } }; } public static LongPBuilder builder(String name) { - return new LongPBuilder().name(name); + return new LongPBuilder(name); } public static final class LongPBuilder extends SingleNumericPropertyBuilder { - private LongPBuilder() { + private LongPBuilder(String name) { + super(name); } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/properties/MethodMultiProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/properties/MethodMultiProperty.java index 68e9d695d0..2e0ea81a0f 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/properties/MethodMultiProperty.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/properties/MethodMultiProperty.java @@ -63,7 +63,7 @@ public final class MethodMultiProperty extends AbstractMultiPackagedProperty theDefaults, String[] legalPackageNames, float theUIOrder, boolean isDefinedExternally) { super(theName, theDescription, theDefaults, theUIOrder, isDefinedExternally, - new MethodPropertyModule(legalPackageNames, theDefaults)); + new MethodPropertyModule(legalPackageNames, theDefaults)); } @@ -82,9 +82,9 @@ public final class MethodMultiProperty extends AbstractMultiPackagedProperty extractor() { return new PropertyDescriptorBuilderConversionWrapper.MultiValue.Packaged(Method.class, ValueParserConstants.METHOD_PARSER) { @Override - protected MethodMultiPBuilder newBuilder() { - return new MethodMultiPBuilder(); + protected MethodMultiPBuilder newBuilder(String name) { + return new MethodMultiPBuilder(name); } }; } public static MethodMultiPBuilder builder(String name) { - return new MethodMultiPBuilder().name(name); + return new MethodMultiPBuilder(name); } public static final class MethodMultiPBuilder extends MultiPackagedPropertyBuilder { - private MethodMultiPBuilder() { + private MethodMultiPBuilder(String name) { + super(name); } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/properties/MethodProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/properties/MethodProperty.java index 67a79c1427..4813deb99d 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/properties/MethodProperty.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/properties/MethodProperty.java @@ -46,7 +46,7 @@ public final class MethodProperty extends AbstractPackagedProperty { private MethodProperty(String theName, String theDescription, Method theDefault, String[] legalPackageNames, float theUIOrder, boolean isDefinedExternally) { super(theName, theDescription, theDefault, theUIOrder, isDefinedExternally, - new MethodPropertyModule(legalPackageNames, Collections.singletonList(theDefault))); + new MethodPropertyModule(legalPackageNames, Collections.singletonList(theDefault))); } @@ -64,7 +64,7 @@ public final class MethodProperty extends AbstractPackagedProperty { public MethodProperty(String theName, String theDescription, String defaultMethodStr, String[] legalPackageNames, float theUIOrder) { this(theName, theDescription, METHOD_PARSER.valueOf(defaultMethodStr), - legalPackageNames, theUIOrder, false); + legalPackageNames, theUIOrder, false); } @@ -89,20 +89,21 @@ public final class MethodProperty extends AbstractPackagedProperty { static PropertyDescriptorBuilderConversionWrapper.SingleValue.Packaged extractor() { return new PropertyDescriptorBuilderConversionWrapper.SingleValue.Packaged(Method.class, ValueParserConstants.METHOD_PARSER) { @Override - protected MethodPBuilder newBuilder() { - return new MethodPBuilder(); + protected MethodPBuilder newBuilder(String name) { + return new MethodPBuilder(name); } }; } public static MethodPBuilder builder(String name) { - return new MethodPBuilder().name(name); + return new MethodPBuilder(name); } public static final class MethodPBuilder extends SinglePackagedPropertyBuilder { - private MethodPBuilder() { + private MethodPBuilder(String name) { + super(name); } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/properties/StringMultiProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/properties/StringMultiProperty.java index e0dff17bf5..49120ad045 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/properties/StringMultiProperty.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/properties/StringMultiProperty.java @@ -140,20 +140,21 @@ public final class StringMultiProperty extends AbstractMultiValueProperty extractor() { return new PropertyDescriptorBuilderConversionWrapper.MultiValue(String.class, ValueParserConstants.STRING_PARSER) { @Override - protected StringMultiPBuilder newBuilder() { - return new StringMultiPBuilder(); + protected StringMultiPBuilder newBuilder(String name) { + return new StringMultiPBuilder(name); } }; } public static StringMultiPBuilder builder(String name) { - return new StringMultiPBuilder().name(name); + return new StringMultiPBuilder(name); } public static final class StringMultiPBuilder extends MultiValuePropertyBuilder { - private StringMultiPBuilder() { + private StringMultiPBuilder(String name) { + super(name); } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/properties/StringProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/properties/StringProperty.java index 32ddecfb7d..d5f2ad72d7 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/properties/StringProperty.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/properties/StringProperty.java @@ -31,7 +31,7 @@ public final class StringProperty extends AbstractSingleValueProperty { /** Master constructor. */ private StringProperty(String theName, String theDescription, String defaultValue, float theUIOrder, boolean - isDefinedExternally) { + isDefinedExternally) { super(theName, theDescription, defaultValue, theUIOrder, isDefinedExternally); } @@ -51,20 +51,21 @@ public final class StringProperty extends AbstractSingleValueProperty { static PropertyDescriptorBuilderConversionWrapper.SingleValue extractor() { return new PropertyDescriptorBuilderConversionWrapper.SingleValue(String.class, ValueParserConstants.STRING_PARSER) { @Override - protected StringPBuilder newBuilder() { - return new StringPBuilder(); + protected StringPBuilder newBuilder(String name) { + return new StringPBuilder(name); } }; } public static StringPBuilder builder(String name) { - return new StringPBuilder().name(name); + return new StringPBuilder(name); } public static final class StringPBuilder extends SingleValuePropertyBuilder { - private StringPBuilder() { + private StringPBuilder(String name) { + super(name); } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/properties/TypeMultiProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/properties/TypeMultiProperty.java index d2380612f5..9c819ab701 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/properties/TypeMultiProperty.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/properties/TypeMultiProperty.java @@ -43,7 +43,7 @@ public final class TypeMultiProperty extends AbstractMultiPackagedProperty theTypeDefaults, String[] legalPackageNames, float theUIOrder, boolean isDefinedExternally) { super(theName, theDescription, theTypeDefaults, theUIOrder, isDefinedExternally, - new TypePropertyModule(legalPackageNames, theTypeDefaults)); + new TypePropertyModule(legalPackageNames, theTypeDefaults)); } @@ -61,8 +61,8 @@ public final class TypeMultiProperty extends AbstractMultiPackagedProperty extractor() { return new PropertyDescriptorBuilderConversionWrapper.MultiValue.Packaged(Class.class, ValueParserConstants.CLASS_PARSER) { @Override - protected TypeMultiPBuilder newBuilder() { - return new TypeMultiPBuilder(); + protected TypeMultiPBuilder newBuilder(String name) { + return new TypeMultiPBuilder(name); } }; } public static TypeMultiPBuilder builder(String name) { - return new TypeMultiPBuilder().name(name); + return new TypeMultiPBuilder(name); } public static final class TypeMultiPBuilder extends MultiPackagedPropertyBuilder { - private TypeMultiPBuilder() { + + private TypeMultiPBuilder(String name) { + super(name); } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/properties/TypeProperty.java b/pmd-core/src/main/java/net/sourceforge/pmd/properties/TypeProperty.java index 595dae9a42..5d4db1b5e0 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/properties/TypeProperty.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/properties/TypeProperty.java @@ -42,7 +42,7 @@ public final class TypeProperty extends AbstractPackagedProperty { private TypeProperty(String theName, String theDescription, Class theDefault, String[] legalPackageNames, float theUIOrder, boolean isDefinedExternally) { super(theName, theDescription, theDefault, theUIOrder, isDefinedExternally, - new TypePropertyModule(legalPackageNames, Collections.singletonList(theDefault))); + new TypePropertyModule(legalPackageNames, Collections.singletonList(theDefault))); } @@ -82,20 +82,21 @@ public final class TypeProperty extends AbstractPackagedProperty { static PropertyDescriptorBuilderConversionWrapper.SingleValue.Packaged extractor() { return new PropertyDescriptorBuilderConversionWrapper.SingleValue.Packaged(Class.class, ValueParserConstants.CLASS_PARSER) { @Override - protected TypePBuilder newBuilder() { - return new TypePBuilder(); + protected TypePBuilder newBuilder(String name) { + return new TypePBuilder(name); } }; } public static TypePBuilder builder(String name) { - return new TypePBuilder().name(name); + return new TypePBuilder(name); } public static final class TypePBuilder extends SinglePackagedPropertyBuilder { - private TypePBuilder() { + private TypePBuilder(String name) { + super(name); } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/properties/builders/MultiNumericPropertyBuilder.java b/pmd-core/src/main/java/net/sourceforge/pmd/properties/builders/MultiNumericPropertyBuilder.java index 09d818fc4e..9a8585f640 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/properties/builders/MultiNumericPropertyBuilder.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/properties/builders/MultiNumericPropertyBuilder.java @@ -14,42 +14,31 @@ import net.sourceforge.pmd.properties.MultiValuePropertyDescriptor; * @param Concrete type of the underlying builder */ public abstract class MultiNumericPropertyBuilder> - extends MultiValuePropertyBuilder { + extends MultiValuePropertyBuilder { protected V lowerLimit; protected V upperLimit; - protected MultiNumericPropertyBuilder() { + protected MultiNumericPropertyBuilder(String name) { + super(name); multiValueDelimiter = MultiValuePropertyDescriptor.DEFAULT_NUMERIC_DELIMITER; } /** - * Specify a minimum value. + * Specify the range of acceptable values. * - * @param val Value + * @param min Lower bound + * @param max Upper bound * * @return The same builder */ @SuppressWarnings("unchecked") - public T min(V val) { - this.lowerLimit = val; - return (T) this; - } - - - /** - * Specify a maximum value. - * - * @param val Value - * - * @return The same builder - */ - @SuppressWarnings("unchecked") - public T max(V val) { - this.upperLimit = val; + public T range(V min, V max) { + this.lowerLimit = min; + this.upperLimit = max; return (T) this; } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/properties/builders/MultiPackagedPropertyBuilder.java b/pmd-core/src/main/java/net/sourceforge/pmd/properties/builders/MultiPackagedPropertyBuilder.java index 3d43e17c2b..aad9f61895 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/properties/builders/MultiPackagedPropertyBuilder.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/properties/builders/MultiPackagedPropertyBuilder.java @@ -17,6 +17,11 @@ public abstract class MultiPackagedPropertyBuilder Concrete type of the underlying builder */ public abstract class MultiValuePropertyBuilder> - extends PropertyDescriptorBuilder, T> { + extends PropertyDescriptorBuilder, T> { protected List defaultValues; protected char multiValueDelimiter = MultiValuePropertyDescriptor.DEFAULT_DELIMITER; + protected MultiValuePropertyBuilder(String name) { + super(name); + } + + /** * Specify a default value. * @@ -30,12 +36,26 @@ public abstract class MultiValuePropertyBuilder val) { + public T defaultValues(List val) { this.defaultValues = val; return (T) this; } + /** + * Specify default values. + * + * @param val List of values + * + * @return The same builder + */ + @SuppressWarnings("unchecked") + public T defaultValues(V... val) { + this.defaultValues = Arrays.asList(val); + return (T) this; + } + + /** * Specify a delimiter character. By default it's {@link MultiValuePropertyDescriptor#DEFAULT_DELIMITER}, or {@link * MultiValuePropertyDescriptor#DEFAULT_NUMERIC_DELIMITER} for numeric properties. diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/properties/builders/PropertyDescriptorBuilder.java b/pmd-core/src/main/java/net/sourceforge/pmd/properties/builders/PropertyDescriptorBuilder.java index 6f1991a6c6..dc0cb5b4a4 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/properties/builders/PropertyDescriptorBuilder.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/properties/builders/PropertyDescriptorBuilder.java @@ -27,22 +27,13 @@ public abstract class PropertyDescriptorBuilder> - implements PropertyDescriptorExternalBuilder { + implements PropertyDescriptorExternalBuilder { private final Class valueType; @@ -42,7 +42,6 @@ public abstract class PropertyDescriptorBuilderConversionWrapper fields) { - builder.name(fields.get(PropertyDescriptorField.NAME)); builder.desc(fields.get(PropertyDescriptorField.DESCRIPTION)); if (fields.containsKey(PropertyDescriptorField.UI_ORDER)) { builder.uiOrder(Float.parseFloat(fields.get(PropertyDescriptorField.UI_ORDER))); @@ -58,12 +57,12 @@ public abstract class PropertyDescriptorBuilderConversionWrapper build(Map fields) { - T builder = newBuilder(); + T builder = newBuilder(fields.get(PropertyDescriptorField.NAME)); populate(builder, fields); builder.isDefinedInXML = true; return builder.build(); @@ -100,7 +99,7 @@ public abstract class PropertyDescriptorBuilderConversionWrapper Concrete type of the underlying builder */ public abstract static class MultiValue> - extends PropertyDescriptorBuilderConversionWrapper, T> { + extends PropertyDescriptorBuilderConversionWrapper, T> { protected final ValueParser parser; @@ -115,8 +114,8 @@ public abstract class PropertyDescriptorBuilderConversionWrapper fields) { super.populate(builder, fields); char delim = delimiterIn(fields, builder.multiValueDelimiter); - builder.delim(delim).defalt(ValueParserConstants.multi(parser, delim) - .valueOf(fields.get(PropertyDescriptorField.DEFAULT_VALUE))); + builder.delim(delim).defaultValues(ValueParserConstants.multi(parser, delim) + .valueOf(fields.get(PropertyDescriptorField.DEFAULT_VALUE))); } @@ -133,7 +132,7 @@ public abstract class PropertyDescriptorBuilderConversionWrapper Concrete type of the underlying builder */ public abstract static class Numeric> - extends MultiValue { + extends MultiValue { protected Numeric(Class valueType, ValueParser parser) { super(valueType, parser); @@ -143,8 +142,9 @@ public abstract class PropertyDescriptorBuilderConversionWrapper fields) { super.populate(builder, fields); - builder.min(parser.valueOf(fields.get(PropertyDescriptorField.MIN))); - builder.max(parser.valueOf(fields.get(PropertyDescriptorField.MAX))); + V min = parser.valueOf(fields.get(PropertyDescriptorField.MIN)); + V max = parser.valueOf(fields.get(PropertyDescriptorField.MAX)); + builder.range(min, max); } } @@ -156,7 +156,7 @@ public abstract class PropertyDescriptorBuilderConversionWrapper Concrete type of the underlying builder */ public abstract static class Packaged> - extends MultiValue { + extends MultiValue { protected Packaged(Class valueType, ValueParser parser) { super(valueType, parser); @@ -167,7 +167,7 @@ public abstract class PropertyDescriptorBuilderConversionWrapper fields) { super.populate(builder, fields); builder.legalPackages(legalPackageNamesIn(fields, PropertyDescriptorBuilderConversionWrapper.delimiterIn(fields, - MultiValuePropertyDescriptor.DEFAULT_DELIMITER))); + MultiValuePropertyDescriptor.DEFAULT_DELIMITER))); } } @@ -181,7 +181,7 @@ public abstract class PropertyDescriptorBuilderConversionWrapper Concrete type of the underlying builder */ public abstract static class SingleValue> - extends PropertyDescriptorBuilderConversionWrapper { + extends PropertyDescriptorBuilderConversionWrapper { protected final ValueParser parser; @@ -195,7 +195,7 @@ public abstract class PropertyDescriptorBuilderConversionWrapper fields) { super.populate(builder, fields); - builder.defalt(parser.valueOf(fields.get(PropertyDescriptorField.DEFAULT_VALUE))); + builder.defaultValue(parser.valueOf(fields.get(PropertyDescriptorField.DEFAULT_VALUE))); } @@ -208,13 +208,13 @@ public abstract class PropertyDescriptorBuilderConversionWrapper Element type of the list + * @param Element type of the list * @param Concrete type of the underlying builder */ - public abstract static class Numeric> - extends SingleValue { + public abstract static class Numeric> + extends SingleValue { - protected Numeric(Class valueType, ValueParser parser) { + protected Numeric(Class valueType, ValueParser parser) { super(valueType, parser); } @@ -222,8 +222,9 @@ public abstract class PropertyDescriptorBuilderConversionWrapper fields) { super.populate(builder, fields); - builder.min(parser.valueOf(fields.get(PropertyDescriptorField.MIN))); - builder.max(parser.valueOf(fields.get(PropertyDescriptorField.MAX))); + V min = parser.valueOf(fields.get(PropertyDescriptorField.MIN)); + V max = parser.valueOf(fields.get(PropertyDescriptorField.MAX)); + builder.range(min, max); } } @@ -235,7 +236,7 @@ public abstract class PropertyDescriptorBuilderConversionWrapper Concrete type of the underlying builder */ public abstract static class Packaged> - extends SingleValue { + extends SingleValue { protected Packaged(Class valueType, ValueParser parser) { super(valueType, parser); @@ -246,7 +247,7 @@ public abstract class PropertyDescriptorBuilderConversionWrapper fields) { super.populate(builder, fields); builder.legalPackageNames(legalPackageNamesIn(fields, PropertyDescriptorBuilderConversionWrapper.delimiterIn(fields, - MultiValuePropertyDescriptor.DEFAULT_DELIMITER))); + MultiValuePropertyDescriptor.DEFAULT_DELIMITER))); } } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/properties/builders/SingleNumericPropertyBuilder.java b/pmd-core/src/main/java/net/sourceforge/pmd/properties/builders/SingleNumericPropertyBuilder.java index e8fe4b081d..4e4d450aed 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/properties/builders/SingleNumericPropertyBuilder.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/properties/builders/SingleNumericPropertyBuilder.java @@ -9,37 +9,31 @@ package net.sourceforge.pmd.properties.builders; * @since 6.0.0 */ public abstract class SingleNumericPropertyBuilder> - extends SingleValuePropertyBuilder { + extends SingleValuePropertyBuilder { protected V lowerLimit; protected V upperLimit; - /** - * Specify a minimum value. - * - * @param val Value - * - * @return The same builder - */ - @SuppressWarnings("unchecked") - public T min(V val) { - this.lowerLimit = val; - return (T) this; + public SingleNumericPropertyBuilder(String name) { + super(name); } /** - * Specify a maximum value. + * Specify the range of acceptable values. * - * @param val Value + * @param min Lower bound + * @param max Upper bound * * @return The same builder */ @SuppressWarnings("unchecked") - public T max(V val) { - this.upperLimit = val; + public T range(V min, V max) { + this.lowerLimit = min; + this.upperLimit = max; return (T) this; } + } diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/properties/builders/SinglePackagedPropertyBuilder.java b/pmd-core/src/main/java/net/sourceforge/pmd/properties/builders/SinglePackagedPropertyBuilder.java index d743cdc2f6..3fb0b755bf 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/properties/builders/SinglePackagedPropertyBuilder.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/properties/builders/SinglePackagedPropertyBuilder.java @@ -12,11 +12,16 @@ import java.util.Arrays; * @since 6.0.0 */ public abstract class SinglePackagedPropertyBuilder> - extends SingleValuePropertyBuilder { + extends SingleValuePropertyBuilder { protected String[] legalPackageNames; + public SinglePackagedPropertyBuilder(String name) { + super(name); + } + + @SuppressWarnings("unchecked") public T legalPackageNames(String[] packs) { if (packs != null) { diff --git a/pmd-core/src/main/java/net/sourceforge/pmd/properties/builders/SingleValuePropertyBuilder.java b/pmd-core/src/main/java/net/sourceforge/pmd/properties/builders/SingleValuePropertyBuilder.java index ecf1f6d722..4c8edbf11b 100644 --- a/pmd-core/src/main/java/net/sourceforge/pmd/properties/builders/SingleValuePropertyBuilder.java +++ b/pmd-core/src/main/java/net/sourceforge/pmd/properties/builders/SingleValuePropertyBuilder.java @@ -11,11 +11,16 @@ package net.sourceforge.pmd.properties.builders; * @param Concrete type of this builder instance. */ public abstract class SingleValuePropertyBuilder> - extends PropertyDescriptorBuilder { + extends PropertyDescriptorBuilder { protected E defaultValue; + protected SingleValuePropertyBuilder(String name) { + super(name); + } + + /** * Specify a default value. * @@ -24,7 +29,7 @@ public abstract class SingleValuePropertyBuilder OPTION_MAP; @@ -53,7 +53,7 @@ public class CyclomaticComplexityRule extends AbstractJavaMetricsRule { = EnumeratedMultiProperty.builder("cycloOptions", CycloOption.class) .desc("Choose options for the computation of Cyclo") .mappings(OPTION_MAP) - .defalt(Collections.emptyList()) + .defaultValues(Collections.emptyList()) .uiOrder(3.0f).build(); private int methodReportLevel; diff --git a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/AvoidUsingOctalValuesRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/AvoidUsingOctalValuesRule.java index f79299f50f..d3b829cfbf 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/AvoidUsingOctalValuesRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/basic/AvoidUsingOctalValuesRule.java @@ -18,7 +18,7 @@ public class AvoidUsingOctalValuesRule extends AbstractJavaRule { private static final BooleanProperty STRICT_METHODS_DESCRIPTOR = BooleanProperty.builder("strict") .desc("Detect violations between 00 and 07") - .defalt(false) + .defaultValue(false) .uiOrder(1.0f).build(); 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 768a130774..323e96439b 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 @@ -42,7 +42,7 @@ public class StdCyclomaticComplexityRule extends AbstractJavaRule { 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(); + .range(1, 30).defaultValue(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 aabc6a16ac..26696ea473 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 @@ -24,12 +24,12 @@ public class CommentSizeRule extends AbstractCommentRule { public static final IntegerProperty MAX_LINES = IntegerProperty.builder("maxLines") .desc("Maximum lines") - .min(2).max(200).defalt(6).uiOrder(2.0f).build(); + .range(2, 200).defaultValue(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(); + .range(1, 200).defaultValue(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/controversial/DataflowAnomalyAnalysisRule.java b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/DataflowAnomalyAnalysisRule.java index a8fe3dbc11..414b0bf9b1 100644 --- a/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/DataflowAnomalyAnalysisRule.java +++ b/pmd-java/src/main/java/net/sourceforge/pmd/lang/java/rule/controversial/DataflowAnomalyAnalysisRule.java @@ -32,16 +32,14 @@ public class DataflowAnomalyAnalysisRule extends AbstractJavaRule implements Exe private static final IntegerProperty MAX_PATH_DESCRIPTOR = IntegerProperty.builder("maxPaths") .desc("Maximum number of checked paths per method. A lower value will increase the performance of the rule but may decrease anomalies found.") - .min(100) - .max(8000) - .defalt(1000) + .range(100, 8000) + .defaultValue(1000) .uiOrder(1.0f).build(); private static final IntegerProperty MAX_VIOLATIONS_DESCRIPTOR = IntegerProperty.builder("maxViolations") .desc("Maximum number of anomalies per class") - .min(1) - .max(2000) - .defalt(100) + .range(1, 2000) + .defaultValue(100) .uiOrder(2.0f).build(); private RuleContext rc; private List daaRuleViolations; 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 d7035c5a68..5c862872a2 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 @@ -39,7 +39,7 @@ public class CouplingBetweenObjectsRule extends AbstractJavaRule { private static final IntegerProperty THRESHOLD_DESCRIPTOR = IntegerProperty.builder("threshold") .desc("Unique type reporting threshold") - .min(2).max(100).defalt(20).uiOrder(1.0f).build(); + .range(2, 100).defaultValue(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 78610170ed..e01be9cfd6 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 @@ -17,7 +17,7 @@ public class AvoidDeeplyNestedIfStmtsRule extends AbstractJavaRule { 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(); + .range(1, 25).defaultValue(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 75a135331e..5d0ae22bf7 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 @@ -36,7 +36,7 @@ public class AvoidDuplicateLiteralsRule extends AbstractJavaRule { public static final IntegerProperty THRESHOLD_DESCRIPTOR = IntegerProperty.builder("maxDuplicateLiterals") .desc("Max duplicate literals") - .min(1).max(20).defalt(4).uiOrder(1.0f).build(); + .range(1, 20).defaultValue(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 01a9e3e1bf..e4d43d37db 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 @@ -74,7 +74,7 @@ public class ConsecutiveLiteralAppendsRule extends AbstractJavaRule { private static final IntegerProperty THRESHOLD_DESCRIPTOR = IntegerProperty.builder("threshold") .desc("Max consecutive appends") - .min(1).max(10).defalt(1).uiOrder(1.0f).build(); + .range(1, 10).defaultValue(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 3490327d61..e219732a95 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 @@ -46,7 +46,7 @@ public class CyclomaticComplexityRule extends AbstractPLSQLRule { 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(); + .range(1, 30).defaultValue(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 04a055d03d..bab406cf32 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 @@ -19,7 +19,7 @@ public class AvoidDeeplyNestedIfStmtsRule extends AbstractVmRule { 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(); + .range(1, 25).defaultValue(3).uiOrder(1.0f).build(); public AvoidDeeplyNestedIfStmtsRule() { definePropertyDescriptor(PROBLEM_DEPTH_DESCRIPTOR);