Merge pull request #27 from kemitix/upgrade-checkstyle

Upgrade checkstyle to 7.8

builder/pom.xml

@@ -42,6 +42,8 @@
         <mapstream.version>2.3.5</mapstream.version>
         <map-builder.version>1.0.0</map-builder.version>
         <coveralls-maven-plugin.version>4.3.0</coveralls-maven-plugin.version>
+        <checkstyle.version>7.8</checkstyle.version>
+        <sevntu.version>1.24.0</sevntu.version>
     </properties>
 
     <dependencies>
@@ -92,6 +94,19 @@
             <version>${map-builder.version}</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>com.puppycrawl.tools</groupId>
+            <artifactId>checkstyle</artifactId>
+            <version>${checkstyle.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.sevntu-checkstyle</groupId>
+            <artifactId>sevntu-checks</artifactId>
+            <version>${sevntu.version}</version>
+        </dependency>
+
     </dependencies>
     <build>
         <plugins>

builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/BuilderConfiguration.java

@@ -0,0 +1,49 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Paul Campbell
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies
+ * or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
+ * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package net.kemitix.checkstyle.ruleset.builder;
+
+import com.google.common.reflect.ClassPath;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.io.IOException;
+
+/**
+ * Configuration for Builder.
+ *
+ * @author Paul Campbell (pcampbell@kemitix.net).
+ */
+@Configuration
+public class BuilderConfiguration {
+
+    /**
+     * Create the ClassPath used to scan packages.
+     *
+     * @return the ClassPath
+     *
+     * @throws IOException if there is an error
+     */
+    @Bean
+    public ClassPath classPath() throws IOException {
+        return ClassPath.from(getClass().getClassLoader());
+    }
+}

builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/CheckstyleClassNotFoundException.java

@@ -0,0 +1,39 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Paul Campbell
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies
+ * or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
+ * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package net.kemitix.checkstyle.ruleset.builder;
+
+/**
+ * Raised when a Class to implement a Rule is not found.
+ *
+ * @author Paul Campbell (pcampbell@kemitix.net).
+ */
+public class CheckstyleClassNotFoundException extends RuntimeException {
+
+    /**
+     * Constructor.
+     *
+     * @param name the name of the unimplemented rule
+     */
+    public CheckstyleClassNotFoundException(final String name) {
+        super("No class found to implement " + name);
+    }
+}

builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/CheckstyleSourceLoadException.java

@@ -0,0 +1,42 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Paul Campbell
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies
+ * or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
+ * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package net.kemitix.checkstyle.ruleset.builder;
+
+import java.io.IOException;
+
+/**
+ * Raised when there is an error scanning for check classes.
+ *
+ * @author Paul Campbell (pcampbell@kemitix.net).
+ */
+public class CheckstyleSourceLoadException extends RuntimeException {
+
+    /**
+     * Constructor.
+     *
+     * @param basePackage the base package classes were being loaded from
+     * @param cause       the cause
+     */
+    public CheckstyleSourceLoadException(final String basePackage, final IOException cause) {
+        super("Error loading checkstyle rules from package: " + basePackage, cause);
+    }
+}

builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/CheckstyleWriter.java

@@ -55,6 +55,8 @@ class CheckstyleWriter implements CommandLineRunner {
 
     private final RulesProperties rulesProperties;
 
+    private final RuleClassLocator ruleClassLocator;
+
     @Override
     public void run(final String... args) throws Exception {
         Stream.of(RuleLevel.values())
@@ -101,9 +103,9 @@ class CheckstyleWriter implements CommandLineRunner {
     private String formatRuleAsModule(final Rule rule) {
         if (rule.getProperties()
                 .isEmpty()) {
-            return String.format("<module name=\"%s\"/>", rule.getName());
+            return String.format("<module name=\"%s\"/>", ruleClassLocator.apply(rule));
         }
-        return String.format("<module name=\"%s\">%n    %s%n</module>", rule.getName(),
+        return String.format("<module name=\"%s\">%n    %s%n</module>", ruleClassLocator.apply(rule),
                              formatProperties(rule.getProperties())
                             );
     }

builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/DefaultPackageScanner.java

@@ -0,0 +1,47 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Paul Campbell
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies
+ * or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
+ * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package net.kemitix.checkstyle.ruleset.builder;
+
+import com.google.common.reflect.ClassPath;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.stream.Stream;
+
+/**
+ * Default implementation of {@link PackageScanner}.
+ *
+ * @author Paul Campbell (pcampbell@kemitix.net).
+ */
+@Service
+@RequiredArgsConstructor
+public class DefaultPackageScanner implements PackageScanner {
+
+    private final ClassPath classPath;
+
+    @Override
+    public final Stream<String> apply(final RuleSource ruleSource) {
+        return classPath.getTopLevelClassesRecursive(ruleSource.getBasePackage())
+                        .stream()
+                        .map(ClassPath.ClassInfo::getName);
+    }
+}

builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/DefaultRuleClassLocator.java

@@ -0,0 +1,77 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Paul Campbell
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies
+ * or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
+ * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package net.kemitix.checkstyle.ruleset.builder;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PostConstruct;
+import java.util.AbstractMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * Default implementation of {@link RuleClassLocator}.
+ *
+ * @author Paul Campbell (pcampbell@kemitix.net).
+ */
+@Service
+@RequiredArgsConstructor
+public class DefaultRuleClassLocator implements RuleClassLocator {
+
+    private final PackageScanner packageScanner;
+
+    private Map<RuleSource, List<String>> checkClasses;
+
+    /**
+     * Initialise class lists for {@link RuleSource}s.
+     */
+    @PostConstruct
+    public final void init() {
+        checkClasses = Stream.of(RuleSource.values())
+                             .map(source -> new AbstractMap.SimpleEntry<>(
+                                     source, packageScanner.apply(source)
+                                                           .collect(Collectors.toList())))
+                             .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue));
+    }
+
+    @Override
+    public final String apply(final Rule rule) {
+        return getCanonicalClassName(rule.getSource(), rule.getName());
+    }
+
+    private String getCanonicalClassName(final RuleSource source, final String name) {
+        return checkClasses.get(source)
+                           .stream()
+                           .sorted()
+                           .filter(classname -> byRuleName(classname, name))
+                           .findFirst()
+                           .orElseThrow(() -> new CheckstyleClassNotFoundException(name));
+    }
+
+    private boolean byRuleName(final String classname, final String name) {
+        final String classNameWithDelimiter = "." + name;
+        return classname.endsWith(classNameWithDelimiter) || classname.endsWith(classNameWithDelimiter + "Check");
+    }
+}

builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/PackageScanner.java

@@ -0,0 +1,34 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Paul Campbell
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies
+ * or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
+ * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package net.kemitix.checkstyle.ruleset.builder;
+
+import java.util.function.Function;
+import java.util.stream.Stream;
+
+/**
+ * Scans a package for all classes.
+ *
+ * @author Paul Campbell (pcampbell@kemitix.net).
+ */
+interface PackageScanner extends Function<RuleSource, Stream<String>> {
+
+}

builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/Rule.java

@@ -40,6 +40,11 @@ public class Rule {
 
     private static final Locale LOCALE = Locale.ENGLISH;
 
+    /**
+     * Configuration properties.
+     */
+    private final Map<String, String> properties = new HashMap<>();
+
     /**
      * The name of the rule's Check class.
      */
@@ -80,11 +85,6 @@ public class Rule {
      */
     private String reason;
 
-    /**
-     * Configuration properties.
-     */
-    private final Map<String, String> properties = new HashMap<>();
-
     /**
      * Compare two Rules lexicographically for sorting by rule name, ignoring case.
      *
@@ -103,5 +103,4 @@ public class Rule {
     private String getLowerCaseRuleName() {
         return getName().toLowerCase(LOCALE);
     }
-
 }

builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/RuleClassLocator.java

@@ -0,0 +1,33 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Paul Campbell
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies
+ * or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
+ * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package net.kemitix.checkstyle.ruleset.builder;
+
+import java.util.function.Function;
+
+/**
+ * Returns the canonical name of the class that implements a {@link Rule}.
+ *
+ * @author Paul Campbell (pcampbell@kemitix.net).
+ */
+interface RuleClassLocator extends Function<Rule, String> {
+
+}

builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/RuleSource.java

@@ -21,6 +21,8 @@
 
 package net.kemitix.checkstyle.ruleset.builder;
 
+import lombok.Getter;
+
 /**
  * The origin of the rule.
  *
@@ -28,6 +30,19 @@ package net.kemitix.checkstyle.ruleset.builder;
  */
 public enum RuleSource {
 
-    CHECKSTYLE,
+    CHECKSTYLE("com.puppycrawl.tools.checkstyle"),
-    SEVNTU,
+    SEVNTU("com.github.sevntu.checkstyle.checks");
+
+    @Getter
+    private final String basePackage;
+
+
+    /**
+     * Constructor.
+     *
+     * @param basePackage the base package that contains all checks from this source
+     */
+    RuleSource(final String basePackage) {
+        this.basePackage = basePackage;
+    }
 }

builder/src/test/java/net/kemitix/checkstyle/ruleset/builder/BuilderConfigurationTest.java

@@ -0,0 +1,24 @@
+package net.kemitix.checkstyle.ruleset.builder;
+
+import com.google.common.reflect.ClassPath;
+import org.junit.Test;
+
+import java.io.IOException;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link BuilderConfiguration}.
+ *
+ * @author Paul Campbell (pcampbell@kemitix.net)
+ */
+public class BuilderConfigurationTest {
+
+    @Test
+    public void canGetClassPath() throws IOException {
+        //when
+        final ClassPath classPath = new BuilderConfiguration().classPath();
+        //then
+        assertThat(classPath).isNotNull();
+    }
+}

builder/src/test/java/net/kemitix/checkstyle/ruleset/builder/CheckstyleClassNotFoundExceptionTest.java

@@ -0,0 +1,24 @@
+package net.kemitix.checkstyle.ruleset.builder;
+
+import org.junit.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link CheckstyleClassNotFoundException}.
+ *
+ * @author Paul Campbell (pcampbell@kemitix.net).
+ */
+public class CheckstyleClassNotFoundExceptionTest {
+
+    @Test
+    public void canRaiseException() {
+        //given
+        final String classname = "class name";
+        //when
+        final CheckstyleClassNotFoundException exception = new CheckstyleClassNotFoundException(classname);
+        //then
+        assertThat(exception.getMessage()).startsWith("No class found to implement ")
+                                          .endsWith(classname);
+    }
+}

builder/src/test/java/net/kemitix/checkstyle/ruleset/builder/CheckstyleSourceLoadExceptionTest.java

@@ -0,0 +1,28 @@
+package net.kemitix.checkstyle.ruleset.builder;
+
+import org.junit.Test;
+
+import java.io.IOException;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
+/**
+ * Tests for {@link CheckstyleSourceLoadException}.
+ *
+ * @author Paul Campbell (pcampbell@kemitix.net).
+ */
+public class CheckstyleSourceLoadExceptionTest {
+
+    @Test
+    public void canRaiseException() {
+        //given
+        final String basePackage = "base package";
+        final IOException cause = new IOException();
+        //when
+        final CheckstyleSourceLoadException exception = new CheckstyleSourceLoadException(basePackage, cause);
+        //then
+        assertThat(exception).hasCause(cause)
+                             .hasMessageStartingWith("Error loading checkstyle rules from package: ")
+                             .hasMessageEndingWith(basePackage);
+    }
+}

builder/src/test/java/net/kemitix/checkstyle/ruleset/builder/CheckstyleWriterTest.java

@@ -5,7 +5,9 @@ import me.andrz.builder.map.MapBuilder;
 import org.assertj.core.api.ThrowableAssert;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.rules.ExpectedException;
 import org.junit.rules.TemporaryFolder;
+import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 
 import java.io.IOException;
@@ -17,10 +19,11 @@ import java.nio.file.StandardOpenOption;
 import java.util.AbstractMap;
 import java.util.List;
 import java.util.Map;
-import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.Matchers.any;
 
 /**
  * Tests for {@link CheckstyleWriter}.
@@ -33,6 +36,12 @@ public class CheckstyleWriterTest {
 
     private static final String FILE_SEPARATOR = System.getProperty("file.separator");
 
+    @org.junit.Rule
+    public ExpectedException exception = ExpectedException.none();
+
+    @org.junit.Rule
+    public TemporaryFolder folder = new TemporaryFolder();
+
     private CheckstyleWriter checkstyleWriter;
 
     private OutputProperties outputProperties;
@@ -43,18 +52,20 @@ public class CheckstyleWriterTest {
 
     private String ruleName;
 
+    private String ruleClassname;
+
     private Map<RuleLevel, String> outputFiles;
 
     private Path outputDirectory;
 
-    @org.junit.Rule
+    @Mock
-    public TemporaryFolder folder = new TemporaryFolder();
+    private RuleClassLocator ruleClassLocator;
 
     @Before
     public void setUp() throws Exception {
         MockitoAnnotations.initMocks(this);
-        ruleName = UUID.randomUUID()
+        ruleName = "RegexpOnFilename";
-                       .toString();
+        ruleClassname = "com.puppycrawl.tools.checkstyle.checks.regexp.RegexpOnFilenameCheck";
         outputProperties = new OutputProperties();
         outputFiles = new MapBuilder<RuleLevel, String>().put(getOutputFile(RuleLevel.LAYOUT))
                                                          .put(getOutputFile(RuleLevel.NAMING))
@@ -73,7 +84,14 @@ public class CheckstyleWriterTest {
                 checkstyleTemplate, TEMPLATE.getBytes(StandardCharsets.UTF_8), StandardOpenOption.TRUNCATE_EXISTING);
         templateProperties.setCheckstyleXml(checkstyleTemplate);
         rulesProperties = new RulesProperties();
-        checkstyleWriter = new CheckstyleWriter(outputProperties, templateProperties, rulesProperties);
+        checkstyleWriter =
+                new CheckstyleWriter(outputProperties, templateProperties, rulesProperties, ruleClassLocator);
+        given(ruleClassLocator.apply(any())).willReturn(ruleClassname);
+    }
+
+    private Map.Entry<RuleLevel, String> getOutputFile(final RuleLevel level) throws IOException {
+        final String xmlFile = String.format("checkstyle-%s.xml", level.toString());
+        return new AbstractMap.SimpleImmutableEntry<>(level, xmlFile);
     }
 
     // write rule that matches current level
@@ -87,7 +105,24 @@ public class CheckstyleWriterTest {
         checkstyleWriter.run();
         //then
         val lines = loadOutputFile(RuleLevel.LAYOUT);
-        assertThat(lines).containsExactly("C:", String.format("TW:<module name=\"%s\"/>", ruleName));
+        assertThat(lines).containsExactly("C:", String.format("TW:<module name=\"%s\"/>", ruleClassname));
+    }
+
+    private List<String> loadOutputFile(final RuleLevel level) throws IOException {
+        val path = outputDirectory.resolve(outputFiles.get(level));
+        assertThat(path).as("Output path exists")
+                        .exists();
+        return Files.readAllLines(path, StandardCharsets.UTF_8);
+    }
+
+    private Rule enabledRule(final RuleLevel level, final RuleParent parent) {
+        val rule = new Rule();
+        rule.setName(ruleName);
+        rule.setSource(RuleSource.CHECKSTYLE);
+        rule.setEnabled(true);
+        rule.setLevel(level);
+        rule.setParent(parent);
+        return rule;
     }
 
     // write rule that is below current level
@@ -101,7 +136,7 @@ public class CheckstyleWriterTest {
         checkstyleWriter.run();
         //then
         val lines = loadOutputFile(RuleLevel.NAMING);
-        assertThat(lines).containsExactly("C:", String.format("TW:<module name=\"%s\"/>", ruleName));
+        assertThat(lines).containsExactly("C:", String.format("TW:<module name=\"%s\"/>", ruleClassname));
     }
 
     // write rule with checker parent
@@ -115,7 +150,7 @@ public class CheckstyleWriterTest {
         checkstyleWriter.run();
         //then
         val lines = loadOutputFile(RuleLevel.LAYOUT);
-        assertThat(lines).containsExactly(String.format("C:<module name=\"%s\"/>", ruleName), "TW:");
+        assertThat(lines).containsExactly(String.format("C:<module name=\"%s\"/>", ruleClassname), "TW:");
     }
 
     // write rule with properties
@@ -131,7 +166,7 @@ public class CheckstyleWriterTest {
         checkstyleWriter.run();
         //then
         val lines = loadOutputFile(RuleLevel.LAYOUT);
-        assertThat(lines).containsExactly("C:", String.format("TW:<module name=\"%s\">", ruleName),
+        assertThat(lines).containsExactly("C:", String.format("TW:<module name=\"%s\">", ruleClassname),
                                           "    <property name=\"key\" value=\"value\"/>", "</module>"
                                          );
     }
@@ -191,25 +226,4 @@ public class CheckstyleWriterTest {
                                                         imaginary + FILE_SEPARATOR
                                                        ));
     }
-
-    private Map.Entry<RuleLevel, String> getOutputFile(final RuleLevel level) throws IOException {
-        final String xmlFile = String.format("checkstyle-%s.xml", level.toString());
-        return new AbstractMap.SimpleImmutableEntry<>(level, xmlFile);
-    }
-
-    private List<String> loadOutputFile(final RuleLevel level) throws IOException {
-        val path = outputDirectory.resolve(outputFiles.get(level));
-        assertThat(path).as("Output path exists")
-                        .exists();
-        return Files.readAllLines(path, StandardCharsets.UTF_8);
-    }
-
-    private Rule enabledRule(final RuleLevel level, final RuleParent parent) {
-        val rule = new Rule();
-        rule.setName(ruleName);
-        rule.setEnabled(true);
-        rule.setLevel(level);
-        rule.setParent(parent);
-        return rule;
-    }
 }

builder/src/test/java/net/kemitix/checkstyle/ruleset/builder/DefaultPackageScannerTest.java

@@ -0,0 +1,44 @@
+package net.kemitix.checkstyle.ruleset.builder;
+
+import com.google.common.reflect.ClassPath;
+import org.junit.Before;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.util.stream.Stream;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link DefaultPackageScanner}.
+ *
+ * @author Paul Campbell (pcampbell@kemitix.net)
+ */
+public class DefaultPackageScannerTest {
+
+    private DefaultPackageScanner scanner;
+
+    @Before
+    public void setUp() throws Exception {
+        final ClassPath classPath = ClassPath.from(getClass().getClassLoader());
+        scanner = new DefaultPackageScanner(classPath);
+    }
+
+    @Test
+    public void canScanCheckstylePackage() throws IOException {
+        //when
+        final Stream<String> result = scanner.apply(RuleSource.CHECKSTYLE);
+        //then
+        assertThat(result).allMatch(cn -> cn.startsWith(RuleSource.CHECKSTYLE.getBasePackage()))
+                          .contains("com.puppycrawl.tools.checkstyle.checks.sizes.FileLengthCheck");
+    }
+
+    @Test
+    public void canScanSevntuPackage() throws IOException {
+        //when
+        final Stream<String> result = scanner.apply(RuleSource.SEVNTU);
+        //then
+        assertThat(result).allMatch(cn -> cn.startsWith(RuleSource.SEVNTU.getBasePackage()))
+                          .contains("com.github.sevntu.checkstyle.checks.design.NestedSwitchCheck");
+    }
+}

builder/src/test/java/net/kemitix/checkstyle/ruleset/builder/DefaultRuleClassLocatorTest.java

@@ -0,0 +1,55 @@
+package net.kemitix.checkstyle.ruleset.builder;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+import java.util.Collections;
+import java.util.List;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.BDDMockito.given;
+
+/**
+ * Tests for {@link DefaultRuleClassLocator}.
+ *
+ * @author Paul Campbell (pcampbell@kemitix.net)
+ */
+public class DefaultRuleClassLocatorTest {
+
+    private DefaultRuleClassLocator subject;
+
+    @Mock
+    private PackageScanner packageScanner;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+        subject = new DefaultRuleClassLocator(packageScanner);
+    }
+
+    @Test
+    public void canLookupRule() {
+        //given
+        final String rulename = "RegexpOnFilename";
+        final String expected = "com.puppycrawl.tools.checkstyle.checks.regexp.RegexpOnFilenameCheck";
+        final List<String> checkstyleClasses = Collections.singletonList(expected);
+        final List<String> sevntuClasses = Collections.emptyList();
+        given(packageScanner.apply(RuleSource.CHECKSTYLE)).willReturn(checkstyleClasses.stream());
+        given(packageScanner.apply(RuleSource.SEVNTU)).willReturn(sevntuClasses.stream());
+        subject.init();
+        final Rule rule = createCheckstyleRule(rulename);
+        //when
+        final String result = subject.apply(rule);
+        //then
+        assertThat(result).isEqualTo(expected);
+    }
+
+    private Rule createCheckstyleRule(final String rulename) {
+        final Rule rule = new Rule();
+        rule.setSource(RuleSource.CHECKSTYLE);
+        rule.setName(rulename);
+        return rule;
+    }
+}

builder/src/test/java/net/kemitix/checkstyle/ruleset/builder/RuleSourceTest.java

@@ -30,4 +30,16 @@ public class RuleSourceTest {
         //then
         assertThat(values).containsExactlyElementsOf(expected);
     }
+
+    @Test
+    public void basePackages() {
+        //given
+        final String puppycrawl = "puppycrawl";
+        final String sevntu = "sevntu";
+        //then
+        assertThat(RuleSource.CHECKSTYLE.getBasePackage()).contains(puppycrawl)
+                                                          .doesNotContain(sevntu);
+        assertThat(RuleSource.SEVNTU.getBasePackage()).contains(sevntu)
+                                                      .doesNotContain(puppycrawl);
+    }
 }

plugin-sample/pom.xml

@@ -2,7 +2,9 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
+    <properties>
+        <kemitix-checkstyle-ruleset.level>2-naming</kemitix-checkstyle-ruleset.level>
+    </properties>
     <modelVersion>4.0.0</modelVersion>
 
     <parent>

pom.xml

@@ -21,7 +21,7 @@
         <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
 
         <maven-checkstyle-plugin.version>2.17</maven-checkstyle-plugin.version>
-        <checkstyle.version>7.7</checkstyle.version>
+        <checkstyle.version>7.8</checkstyle.version>
         <sevntu.version>1.24.0</sevntu.version>
         <mockito.version>1.10.19</mockito.version>
         <assertj.version>3.8.0</assertj.version>

regressions/src/main/java/net/kemitix/checkstyle/regressions/ExplicitInitialization.java

@@ -0,0 +1,60 @@
+/**
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Paul Campbell
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
+ * and associated documentation files (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies
+ * or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
+ * AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+ * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package net.kemitix.checkstyle.regressions;
+
+/**
+ * Regression demo for {@code ExplicitInitializationCheck}.
+ *
+ * @author Paul Campbell (pcampbell@kemitix.net).
+ */
+@SuppressWarnings("hideutilityclassconstructor")
+class ExplicitInitialization {
+
+    /**
+     * This will become valid in next release.
+     */
+    @SuppressWarnings("explicitinitialization")
+    private boolean validBoolean = false;
+
+    /**
+     * This will become valid in next release.
+     */
+    @SuppressWarnings("explicitinitialization")
+    private int validInt = 0;
+
+    private String validString = "";
+
+    private Object validObject = new Object();
+
+    @SuppressWarnings("explicitinitialization")
+    private Boolean invalidBoolean = null;
+
+    @SuppressWarnings("explicitinitialization")
+    private Integer invalidInteger = null;
+
+    @SuppressWarnings("explicitinitialization")
+    private String invalidString = null;
+
+    @SuppressWarnings("explicitinitialization")
+    private Object invalidObject = null;
+
+}

ruleset/src/main/resources/net/kemitix/checkstyle-1-layout.xml

@@ -4,61 +4,61 @@
         "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
 <module name="Checker">
 
-    <module name="RegexpOnFilename">
+    <module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpOnFilenameCheck">
     <property name="fileNamePattern" value="(.sync-conflict-| conflicted copy )"/>
 <property name="match" value="true"/>
 </module>
-<module name="FileTabCharacter"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.FileTabCharacterCheck"/>
-<module name="Header">
+<module name="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck">
     <property name="fileExtensions" value="java"/>
 <property name="headerFile" value="LICENSE.txt"/>
 </module>
-<module name="NewlineAtEndOfFile">
+<module name="com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck">
     <property name="lineSeparator" value="lf"/>
 </module>
 
     <module name="TreeWalker">
 
-        <module name="AnnotationLocation"/>
+        <module name="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationLocationCheck"/>
-<module name="AnnotationUseStyle"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck"/>
-<module name="ArrayTypeStyle"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.ArrayTypeStyleCheck"/>
-<module name="AvoidStarImport"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.imports.AvoidStarImportCheck"/>
-<module name="CommentsIndentation"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.indentation.CommentsIndentationCheck"/>
-<module name="DeclarationOrder"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.DeclarationOrderCheck"/>
-<module name="EmptyForInitializerPad"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyForInitializerPadCheck"/>
-<module name="EmptyForIteratorPad"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyForIteratorPadCheck"/>
-<module name="EmptyLineSeparator"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyLineSeparatorCheck"/>
-<module name="EmptyStatement"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.EmptyStatementCheck"/>
-<module name="GenericWhitespace"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.GenericWhitespaceCheck"/>
-<module name="LeftCurly"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyCheck"/>
-<module name="LineLength">
+<module name="com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck">
     <property name="max" value="120"/>
 </module>
-<module name="MethodParamPad"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.MethodParamPadCheck"/>
-<module name="NoLineWrap"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoLineWrapCheck"/>
-<module name="NoWhitespaceAfter">
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceAfterCheck">
     <property name="tokens" value="DOT"/>
 <property name="allowLineBreaks" value="false"/>
 </module>
-<module name="NoWhitespaceBefore"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceBeforeCheck"/>
-<module name="OneStatementPerLine"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.OneStatementPerLineCheck"/>
-<module name="OperatorWrap"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.OperatorWrapCheck"/>
-<module name="OverloadMethodsDeclarationOrder"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.OverloadMethodsDeclarationOrderCheck"/>
-<module name="ParenPad"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.ParenPadCheck"/>
-<module name="RightCurly"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.blocks.RightCurlyCheck"/>
-<module name="SeparatorWrap">
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.SeparatorWrapCheck">
     <property name="tokens" value="DOT"/>
 <property name="option" value="nl"/>
 </module>
-<module name="SingleSpaceSeparator"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.SingleSpaceSeparatorCheck"/>
-<module name="TrailingComment"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.TrailingCommentCheck"/>
-<module name="TypecastParenPad"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.TypecastParenPadCheck"/>
-<module name="UnnecessaryParentheses"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.UnnecessaryParenthesesCheck"/>
-<module name="UnusedImports"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck"/>
-<module name="UpperEll"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.UpperEllCheck"/>
-<module name="WhitespaceAfter"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAfterCheck"/>
-<module name="WhitespaceAround"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck"/>
-<module name="ForbidCCommentsInMethods"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.ForbidCCommentsInMethodsCheck"/>
 
     </module><!-- /TreeWalker -->
 

ruleset/src/main/resources/net/kemitix/checkstyle-2-naming.xml

@@ -4,93 +4,93 @@
         "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
 <module name="Checker">
 
-    <module name="RegexpOnFilename">
+    <module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpOnFilenameCheck">
     <property name="fileNamePattern" value="(.sync-conflict-| conflicted copy )"/>
 <property name="match" value="true"/>
 </module>
-<module name="FileTabCharacter"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.FileTabCharacterCheck"/>
-<module name="Header">
+<module name="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck">
     <property name="fileExtensions" value="java"/>
 <property name="headerFile" value="LICENSE.txt"/>
 </module>
-<module name="NewlineAtEndOfFile">
+<module name="com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck">
     <property name="lineSeparator" value="lf"/>
 </module>
-<module name="SuppressWarningsFilter"/>
+<module name="com.puppycrawl.tools.checkstyle.filters.SuppressWarningsFilter"/>
 
     <module name="TreeWalker">
 
-        <module name="AbbreviationAsWordInName"/>
+        <module name="com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck"/>
-<module name="AbstractClassName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck"/>
-<module name="AnnotationLocation"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationLocationCheck"/>
-<module name="AnnotationUseStyle"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck"/>
-<module name="ArrayTypeStyle"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.ArrayTypeStyleCheck"/>
-<module name="AvoidStarImport"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.imports.AvoidStarImportCheck"/>
-<module name="CatchParameterName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.CatchParameterNameCheck"/>
-<module name="ClassTypeParameterName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.ClassTypeParameterNameCheck"/>
-<module name="CommentsIndentation"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.indentation.CommentsIndentationCheck"/>
-<module name="ConstantName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck"/>
-<module name="DeclarationOrder"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.DeclarationOrderCheck"/>
-<module name="EmptyForInitializerPad"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyForInitializerPadCheck"/>
-<module name="EmptyForIteratorPad"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyForIteratorPadCheck"/>
-<module name="EmptyLineSeparator"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyLineSeparatorCheck"/>
-<module name="EmptyStatement"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.EmptyStatementCheck"/>
-<module name="GenericWhitespace"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.GenericWhitespaceCheck"/>
-<module name="InterfaceTypeParameterName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.InterfaceTypeParameterNameCheck"/>
-<module name="LeftCurly"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyCheck"/>
-<module name="LineLength">
+<module name="com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck">
     <property name="max" value="120"/>
 </module>
-<module name="LocalFinalVariableName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.LocalFinalVariableNameCheck"/>
-<module name="LocalVariableName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck"/>
-<module name="MagicNumber"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.MagicNumberCheck"/>
-<module name="MemberName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck"/>
-<module name="MethodName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.MethodNameCheck"/>
-<module name="MethodParamPad"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.MethodParamPadCheck"/>
-<module name="MethodTypeParameterName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.MethodTypeParameterNameCheck"/>
-<module name="ModifierOrder"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.modifier.ModifierOrderCheck"/>
-<module name="MultipleStringLiterals"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.MultipleStringLiteralsCheck"/>
-<module name="MultipleVariableDeclarations"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.MultipleVariableDeclarationsCheck"/>
-<module name="NeedBraces"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.blocks.NeedBracesCheck"/>
-<module name="NoLineWrap"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoLineWrapCheck"/>
-<module name="NoWhitespaceAfter">
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceAfterCheck">
     <property name="tokens" value="DOT"/>
 <property name="allowLineBreaks" value="false"/>
 </module>
-<module name="NoWhitespaceBefore"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceBeforeCheck"/>
-<module name="OneStatementPerLine"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.OneStatementPerLineCheck"/>
-<module name="OperatorWrap"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.OperatorWrapCheck"/>
-<module name="OverloadMethodsDeclarationOrder"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.OverloadMethodsDeclarationOrderCheck"/>
-<module name="PackageName">
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck">
     <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]+)*$"/>
 </module>
-<module name="ParameterName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck"/>
-<module name="ParenPad"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.ParenPadCheck"/>
-<module name="RightCurly"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.blocks.RightCurlyCheck"/>
-<module name="SeparatorWrap">
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.SeparatorWrapCheck">
     <property name="tokens" value="DOT"/>
 <property name="option" value="nl"/>
 </module>
-<module name="SingleSpaceSeparator"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.SingleSpaceSeparatorCheck"/>
-<module name="StaticVariableName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.StaticVariableNameCheck"/>
-<module name="SuppressWarnings">
+<module name="com.puppycrawl.tools.checkstyle.checks.annotation.SuppressWarningsCheck">
     <property name="format" value="^constantname|covariantequals|equalshashcode|noclone|onetoplevelclass|outertypefilename|packagedeclaration|typename|visibilitymodifier$"/>
 </module>
-<module name="SuppressWarningsHolder"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.SuppressWarningsHolder"/>
-<module name="TrailingComment"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.TrailingCommentCheck"/>
-<module name="TypecastParenPad"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.TypecastParenPadCheck"/>
-<module name="TypeName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.TypeNameCheck"/>
-<module name="UnnecessaryParentheses"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.UnnecessaryParenthesesCheck"/>
-<module name="UnusedImports"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck"/>
-<module name="UpperEll"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.UpperEllCheck"/>
-<module name="WhitespaceAfter"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAfterCheck"/>
-<module name="WhitespaceAround"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck"/>
-<module name="EnumValueName"/>
+<module name="com.github.sevntu.checkstyle.checks.naming.EnumValueNameCheck"/>
-<module name="ForbidCCommentsInMethods"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.ForbidCCommentsInMethodsCheck"/>
-<module name="NameConventionForJunit4TestClasses"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.NameConventionForJunit4TestClassesCheck"/>
-<module name="NumericLiteralNeedsUnderscore"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.NumericLiteralNeedsUnderscoreCheck"/>
-<module name="SimpleAccessorNameNotation"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.SimpleAccessorNameNotationCheck"/>
-<module name="UniformEnumConstantName"/>
+<module name="com.github.sevntu.checkstyle.checks.naming.UniformEnumConstantNameCheck"/>
 
     </module><!-- /TreeWalker -->
 

ruleset/src/main/resources/net/kemitix/checkstyle-3-javadoc.xml

@@ -4,119 +4,119 @@
         "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
 <module name="Checker">
 
-    <module name="RegexpOnFilename">
+    <module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpOnFilenameCheck">
     <property name="fileNamePattern" value="(.sync-conflict-| conflicted copy )"/>
 <property name="match" value="true"/>
 </module>
-<module name="FileTabCharacter"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.FileTabCharacterCheck"/>
-<module name="Header">
+<module name="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck">
     <property name="fileExtensions" value="java"/>
 <property name="headerFile" value="LICENSE.txt"/>
 </module>
-<module name="JavadocPackage"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocPackageCheck"/>
-<module name="NewlineAtEndOfFile">
+<module name="com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck">
     <property name="lineSeparator" value="lf"/>
 </module>
-<module name="SuppressWarningsFilter"/>
+<module name="com.puppycrawl.tools.checkstyle.filters.SuppressWarningsFilter"/>
-<module name="Translation"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.TranslationCheck"/>
-<module name="UniqueProperties"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.UniquePropertiesCheck"/>
 
     <module name="TreeWalker">
 
-        <module name="AbbreviationAsWordInName"/>
+        <module name="com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck"/>
-<module name="AbstractClassName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck"/>
-<module name="AnnotationLocation"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationLocationCheck"/>
-<module name="AnnotationUseStyle"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck"/>
-<module name="ArrayTypeStyle"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.ArrayTypeStyleCheck"/>
-<module name="AtclauseOrder">
+<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck">
     <property name="tagOrder" value="@param, @author, @version, @serial, @return, @throws, @exception,             @serialData, @serialField, @see, @since, @deprecated"/>
 </module>
-<module name="AvoidStarImport"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.imports.AvoidStarImportCheck"/>
-<module name="CatchParameterName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.CatchParameterNameCheck"/>
-<module name="ClassTypeParameterName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.ClassTypeParameterNameCheck"/>
-<module name="CommentsIndentation"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.indentation.CommentsIndentationCheck"/>
-<module name="ConstantName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck"/>
-<module name="DeclarationOrder"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.DeclarationOrderCheck"/>
-<module name="EmptyForInitializerPad"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyForInitializerPadCheck"/>
-<module name="EmptyForIteratorPad"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyForIteratorPadCheck"/>
-<module name="EmptyLineSeparator"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyLineSeparatorCheck"/>
-<module name="EmptyStatement"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.EmptyStatementCheck"/>
-<module name="FallThrough"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.FallThroughCheck"/>
-<module name="GenericWhitespace"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.GenericWhitespaceCheck"/>
-<module name="InterfaceTypeParameterName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.InterfaceTypeParameterNameCheck"/>
-<module name="JavadocMethod">
+<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck">
     <property name="allowMissingPropertyJavadoc" value="true"/>
 <property name="validateThrows" value="true"/>
 <property name="scope" value="package"/>
 </module>
-<module name="JavadocParagraph"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck"/>
-<module name="JavadocStyle"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck"/>
-<module name="JavadocType">
+<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck">
     <property name="authorFormat" value="^.+ (\S+@[\S.]+)$"/>
 </module>
-<module name="LeftCurly"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyCheck"/>
-<module name="LineLength">
+<module name="com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck">
     <property name="max" value="120"/>
 </module>
-<module name="LocalFinalVariableName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.LocalFinalVariableNameCheck"/>
-<module name="LocalVariableName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck"/>
-<module name="MagicNumber"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.MagicNumberCheck"/>
-<module name="MemberName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck"/>
-<module name="MethodName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.MethodNameCheck"/>
-<module name="MethodParamPad"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.MethodParamPadCheck"/>
-<module name="MethodTypeParameterName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.MethodTypeParameterNameCheck"/>
-<module name="MissingDeprecated"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.annotation.MissingDeprecatedCheck"/>
-<module name="ModifierOrder"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.modifier.ModifierOrderCheck"/>
-<module name="MultipleStringLiterals"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.MultipleStringLiteralsCheck"/>
-<module name="MultipleVariableDeclarations"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.MultipleVariableDeclarationsCheck"/>
-<module name="NeedBraces"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.blocks.NeedBracesCheck"/>
-<module name="NoLineWrap"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoLineWrapCheck"/>
-<module name="NonEmptyAtclauseDescription"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheck"/>
-<module name="NoWhitespaceAfter">
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceAfterCheck">
     <property name="tokens" value="DOT"/>
 <property name="allowLineBreaks" value="false"/>
 </module>
-<module name="NoWhitespaceBefore"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceBeforeCheck"/>
-<module name="OneStatementPerLine"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.OneStatementPerLineCheck"/>
-<module name="OperatorWrap"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.OperatorWrapCheck"/>
-<module name="OverloadMethodsDeclarationOrder"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.OverloadMethodsDeclarationOrderCheck"/>
-<module name="PackageDeclaration"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.PackageDeclarationCheck"/>
-<module name="PackageName">
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck">
     <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]+)*$"/>
 </module>
-<module name="ParameterName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck"/>
-<module name="ParenPad"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.ParenPadCheck"/>
-<module name="RightCurly"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.blocks.RightCurlyCheck"/>
-<module name="SeparatorWrap">
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.SeparatorWrapCheck">
     <property name="tokens" value="DOT"/>
 <property name="option" value="nl"/>
 </module>
-<module name="SingleSpaceSeparator"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.SingleSpaceSeparatorCheck"/>
-<module name="StaticVariableName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.StaticVariableNameCheck"/>
-<module name="SuppressWarnings">
+<module name="com.puppycrawl.tools.checkstyle.checks.annotation.SuppressWarningsCheck">
     <property name="format" value="^constantname|covariantequals|equalshashcode|noclone|onetoplevelclass|outertypefilename|packagedeclaration|typename|visibilitymodifier$"/>
 </module>
-<module name="SuppressWarningsHolder"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.SuppressWarningsHolder"/>
-<module name="TodoComment">
+<module name="com.puppycrawl.tools.checkstyle.checks.TodoCommentCheck">
     <property name="format" value="^(\s*\*).*((TODO)|(FIXME))"/>
 </module>
-<module name="TrailingComment"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.TrailingCommentCheck"/>
-<module name="TypecastParenPad"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.TypecastParenPadCheck"/>
-<module name="TypeName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.TypeNameCheck"/>
-<module name="UncommentedMain">
+<module name="com.puppycrawl.tools.checkstyle.checks.UncommentedMainCheck">
     <property name="excludedClasses" value="(Main|Application)$"/>
 </module>
-<module name="UnnecessaryParentheses"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.UnnecessaryParenthesesCheck"/>
-<module name="UnusedImports"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck"/>
-<module name="UpperEll"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.UpperEllCheck"/>
-<module name="WhitespaceAfter"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAfterCheck"/>
-<module name="WhitespaceAround"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck"/>
-<module name="EnumValueName"/>
+<module name="com.github.sevntu.checkstyle.checks.naming.EnumValueNameCheck"/>
-<module name="ForbidCCommentsInMethods"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.ForbidCCommentsInMethodsCheck"/>
-<module name="NameConventionForJunit4TestClasses"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.NameConventionForJunit4TestClassesCheck"/>
-<module name="NumericLiteralNeedsUnderscore"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.NumericLiteralNeedsUnderscoreCheck"/>
-<module name="SimpleAccessorNameNotation"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.SimpleAccessorNameNotationCheck"/>
-<module name="UniformEnumConstantName"/>
+<module name="com.github.sevntu.checkstyle.checks.naming.UniformEnumConstantNameCheck"/>
 
     </module><!-- /TreeWalker -->
 

ruleset/src/main/resources/net/kemitix/checkstyle-4-tweaks.xml

@@ -4,178 +4,178 @@
         "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
 <module name="Checker">
 
-    <module name="RegexpOnFilename">
+    <module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpOnFilenameCheck">
     <property name="fileNamePattern" value="(.sync-conflict-| conflicted copy )"/>
 <property name="match" value="true"/>
 </module>
-<module name="FileTabCharacter"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.FileTabCharacterCheck"/>
-<module name="Header">
+<module name="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck">
     <property name="fileExtensions" value="java"/>
 <property name="headerFile" value="LICENSE.txt"/>
 </module>
-<module name="JavadocPackage"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocPackageCheck"/>
-<module name="NewlineAtEndOfFile">
+<module name="com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck">
     <property name="lineSeparator" value="lf"/>
 </module>
-<module name="SuppressWarningsFilter"/>
+<module name="com.puppycrawl.tools.checkstyle.filters.SuppressWarningsFilter"/>
-<module name="Translation"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.TranslationCheck"/>
-<module name="UniqueProperties"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.UniquePropertiesCheck"/>
 
     <module name="TreeWalker">
 
-        <module name="AbbreviationAsWordInName"/>
+        <module name="com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck"/>
-<module name="AbstractClassName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck"/>
-<module name="AnnotationLocation"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationLocationCheck"/>
-<module name="AnnotationUseStyle"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck"/>
-<module name="ArrayTypeStyle"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.ArrayTypeStyleCheck"/>
-<module name="AtclauseOrder">
+<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck">
     <property name="tagOrder" value="@param, @author, @version, @serial, @return, @throws, @exception,             @serialData, @serialField, @see, @since, @deprecated"/>
 </module>
-<module name="AvoidEscapedUnicodeCharacters">
+<module name="com.puppycrawl.tools.checkstyle.checks.AvoidEscapedUnicodeCharactersCheck">
     <property name="allowEscapesForControlCharacters" value="true"/>
 </module>
-<module name="AvoidStarImport"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.imports.AvoidStarImportCheck"/>
-<module name="CatchParameterName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.CatchParameterNameCheck"/>
-<module name="ClassTypeParameterName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.ClassTypeParameterNameCheck"/>
-<module name="CommentsIndentation"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.indentation.CommentsIndentationCheck"/>
-<module name="ConstantName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck"/>
-<module name="DeclarationOrder"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.DeclarationOrderCheck"/>
-<module name="DefaultComesLast"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.DefaultComesLastCheck"/>
-<module name="EmptyBlock"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.blocks.EmptyBlockCheck"/>
-<module name="EmptyCatchBlock">
+<module name="com.puppycrawl.tools.checkstyle.checks.blocks.EmptyCatchBlockCheck">
     <property name="commentFormat" value="expected|ignore"/>
 </module>
-<module name="EmptyForInitializerPad"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyForInitializerPadCheck"/>
-<module name="EmptyForIteratorPad"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyForIteratorPadCheck"/>
-<module name="EmptyLineSeparator"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyLineSeparatorCheck"/>
-<module name="EmptyStatement"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.EmptyStatementCheck"/>
-<module name="EqualsAvoidNull"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck"/>
-<module name="ExplicitInitialization"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.ExplicitInitializationCheck"/>
-<module name="FallThrough"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.FallThroughCheck"/>
-<module name="FinalParameters"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.FinalParametersCheck"/>
-<module name="GenericWhitespace"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.GenericWhitespaceCheck"/>
-<module name="HiddenField">
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.HiddenFieldCheck">
     <property name="ignoreConstructorParameter" value="true"/>
 <property name="ignoreSetter" value="true"/>
 </module>
-<module name="HideUtilityClassConstructor"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.design.HideUtilityClassConstructorCheck"/>
-<module name="IllegalCatch"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.IllegalCatchCheck"/>
-<module name="IllegalImport"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck"/>
-<module name="IllegalThrows"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.IllegalThrowsCheck"/>
-<module name="IllegalToken"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.IllegalTokenCheck"/>
-<module name="IllegalType">
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck">
     <property name="illegalClassNames" value="java.util.ArrayDeque, java.util.ArrayList, java.util.EnumMap, java.util.EnumSet, java.util.HashMap, java.util.HashSet, java.util.IdentityHashMap, java.util.LinkedHashMap, java.util.LinkedHashSet, java.util.LinkedList, java.util.PriorityQueue, java.util.TreeMap, java.util.TreeSet"/>
 </module>
-<module name="InnerAssignment"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.InnerAssignmentCheck"/>
-<module name="InnerTypeLast"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.design.InnerTypeLastCheck"/>
-<module name="InterfaceTypeParameterName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.InterfaceTypeParameterNameCheck"/>
-<module name="JavadocMethod">
+<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck">
     <property name="allowMissingPropertyJavadoc" value="true"/>
 <property name="validateThrows" value="true"/>
 <property name="scope" value="package"/>
 </module>
-<module name="JavadocParagraph"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck"/>
-<module name="JavadocStyle"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck"/>
-<module name="JavadocType">
+<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck">
     <property name="authorFormat" value="^.+ (\S+@[\S.]+)$"/>
 </module>
-<module name="LeftCurly"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyCheck"/>
-<module name="LineLength">
+<module name="com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck">
     <property name="max" value="120"/>
 </module>
-<module name="LocalFinalVariableName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.LocalFinalVariableNameCheck"/>
-<module name="LocalVariableName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck"/>
-<module name="MagicNumber"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.MagicNumberCheck"/>
-<module name="MemberName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck"/>
-<module name="MethodName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.MethodNameCheck"/>
-<module name="MethodParamPad"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.MethodParamPadCheck"/>
-<module name="MethodTypeParameterName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.MethodTypeParameterNameCheck"/>
-<module name="MissingDeprecated"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.annotation.MissingDeprecatedCheck"/>
-<module name="MissingSwitchDefault"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.MissingSwitchDefaultCheck"/>
-<module name="ModifiedControlVariable">
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.ModifiedControlVariableCheck">
     <property name="skipEnhancedForLoopVariable" value="true"/>
 </module>
-<module name="ModifierOrder"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.modifier.ModifierOrderCheck"/>
-<module name="MultipleStringLiterals"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.MultipleStringLiteralsCheck"/>
-<module name="MultipleVariableDeclarations"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.MultipleVariableDeclarationsCheck"/>
-<module name="MutableException"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.design.MutableExceptionCheck"/>
-<module name="NeedBraces"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.blocks.NeedBracesCheck"/>
-<module name="NoClone"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.NoCloneCheck"/>
-<module name="NoFinalizer"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.NoFinalizerCheck"/>
-<module name="NoLineWrap"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoLineWrapCheck"/>
-<module name="NonEmptyAtclauseDescription"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheck"/>
-<module name="NoWhitespaceAfter">
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceAfterCheck">
     <property name="tokens" value="DOT"/>
 <property name="allowLineBreaks" value="false"/>
 </module>
-<module name="NoWhitespaceBefore"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceBeforeCheck"/>
-<module name="OneStatementPerLine"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.OneStatementPerLineCheck"/>
-<module name="OneTopLevelClass"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.design.OneTopLevelClassCheck"/>
-<module name="OperatorWrap"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.OperatorWrapCheck"/>
-<module name="OuterTypeFilename"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.OuterTypeFilenameCheck"/>
-<module name="OverloadMethodsDeclarationOrder"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.OverloadMethodsDeclarationOrderCheck"/>
-<module name="PackageAnnotation"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.annotation.PackageAnnotationCheck"/>
-<module name="PackageDeclaration"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.PackageDeclarationCheck"/>
-<module name="PackageName">
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck">
     <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]+)*$"/>
 </module>
-<module name="ParameterName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck"/>
-<module name="ParenPad"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.ParenPadCheck"/>
-<module name="RedundantModifier"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.modifier.RedundantModifierCheck"/>
-<module name="RequireThis">
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck">
     <property name="checkMethods" value="false"/>
 </module>
-<module name="RightCurly"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.blocks.RightCurlyCheck"/>
-<module name="SeparatorWrap">
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.SeparatorWrapCheck">
     <property name="tokens" value="DOT"/>
 <property name="option" value="nl"/>
 </module>
-<module name="SingleSpaceSeparator"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.SingleSpaceSeparatorCheck"/>
-<module name="StaticVariableName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.StaticVariableNameCheck"/>
-<module name="StringLiteralEquality"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.StringLiteralEqualityCheck"/>
-<module name="SuppressWarnings">
+<module name="com.puppycrawl.tools.checkstyle.checks.annotation.SuppressWarningsCheck">
     <property name="format" value="^constantname|covariantequals|equalshashcode|noclone|onetoplevelclass|outertypefilename|packagedeclaration|typename|visibilitymodifier$"/>
 </module>
-<module name="SuppressWarningsHolder"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.SuppressWarningsHolder"/>
-<module name="TodoComment">
+<module name="com.puppycrawl.tools.checkstyle.checks.TodoCommentCheck">
     <property name="format" value="^(\s*\*).*((TODO)|(FIXME))"/>
 </module>
-<module name="TrailingComment"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.TrailingCommentCheck"/>
-<module name="TypecastParenPad"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.TypecastParenPadCheck"/>
-<module name="TypeName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.TypeNameCheck"/>
-<module name="UncommentedMain">
+<module name="com.puppycrawl.tools.checkstyle.checks.UncommentedMainCheck">
     <property name="excludedClasses" value="(Main|Application)$"/>
 </module>
-<module name="UnnecessaryParentheses"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.UnnecessaryParenthesesCheck"/>
-<module name="UnusedImports"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck"/>
-<module name="UpperEll"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.UpperEllCheck"/>
-<module name="VariableDeclarationUsageDistance"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.VariableDeclarationUsageDistanceCheck"/>
-<module name="VisibilityModifier"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.design.VisibilityModifierCheck"/>
-<module name="WhitespaceAfter"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAfterCheck"/>
-<module name="WhitespaceAround"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck"/>
-<module name="AvoidConstantAsFirstOperandInCondition"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.AvoidConstantAsFirstOperandInConditionCheck"/>
-<module name="AvoidHidingCauseException"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.AvoidHidingCauseExceptionCheck"/>
-<module name="AvoidNotShortCircuitOperatorsForBoolean"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.AvoidNotShortCircuitOperatorsForBooleanCheck"/>
-<module name="DiamondOperatorForVariableDefinition"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.DiamondOperatorForVariableDefinitionCheck"/>
-<module name="EitherLogOrThrow"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.EitherLogOrThrowCheck"/>
-<module name="EnumValueName"/>
+<module name="com.github.sevntu.checkstyle.checks.naming.EnumValueNameCheck"/>
-<module name="ForbidCCommentsInMethods"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.ForbidCCommentsInMethodsCheck"/>
-<module name="LogicConditionNeedOptimization"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.LogicConditionNeedOptimizationCheck"/>
-<module name="NameConventionForJunit4TestClasses"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.NameConventionForJunit4TestClassesCheck"/>
-<module name="NoMainMethodInAbstractClass"/>
+<module name="com.github.sevntu.checkstyle.checks.design.NoMainMethodInAbstractClassCheck"/>
-<module name="NumericLiteralNeedsUnderscore"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.NumericLiteralNeedsUnderscoreCheck"/>
-<module name="OverridableMethodInConstructor"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.OverridableMethodInConstructorCheck"/>
-<module name="PublicReferenceToPrivateType"/>
+<module name="com.github.sevntu.checkstyle.checks.design.PublicReferenceToPrivateTypeCheck"/>
-<module name="RedundantReturn"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.RedundantReturnCheck"/>
-<module name="ReturnBooleanFromTernary"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.ReturnBooleanFromTernaryCheck"/>
-<module name="ReturnNullInsteadOfBoolean"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.ReturnNullInsteadOfBooleanCheck"/>
-<module name="SimpleAccessorNameNotation"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.SimpleAccessorNameNotationCheck"/>
-<module name="SingleBreakOrContinue"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.SingleBreakOrContinueCheck"/>
-<module name="TernaryPerExpressionCount"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.TernaryPerExpressionCountCheck"/>
-<module name="UniformEnumConstantName"/>
+<module name="com.github.sevntu.checkstyle.checks.naming.UniformEnumConstantNameCheck"/>
-<module name="UselessSingleCatch"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.UselessSingleCatchCheck"/>
-<module name="UselessSuperCtorCall"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.UselessSuperCtorCallCheck"/>
-<module name="MoveVariableInsideIfCheck"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.MoveVariableInsideIfCheck"/>
 
     </module><!-- /TreeWalker -->
 

ruleset/src/main/resources/net/kemitix/checkstyle-5-complexity.xml

@@ -4,231 +4,231 @@
         "http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
 <module name="Checker">
 
-    <module name="RegexpOnFilename">
+    <module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpOnFilenameCheck">
     <property name="fileNamePattern" value="(.sync-conflict-| conflicted copy )"/>
 <property name="match" value="true"/>
 </module>
-<module name="FileLength"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.sizes.FileLengthCheck"/>
-<module name="FileTabCharacter"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.FileTabCharacterCheck"/>
-<module name="Header">
+<module name="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck">
     <property name="fileExtensions" value="java"/>
 <property name="headerFile" value="LICENSE.txt"/>
 </module>
-<module name="JavadocPackage"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocPackageCheck"/>
-<module name="NewlineAtEndOfFile">
+<module name="com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck">
     <property name="lineSeparator" value="lf"/>
 </module>
-<module name="SuppressWarningsFilter"/>
+<module name="com.puppycrawl.tools.checkstyle.filters.SuppressWarningsFilter"/>
-<module name="Translation"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.TranslationCheck"/>
-<module name="UniqueProperties"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.UniquePropertiesCheck"/>
 
     <module name="TreeWalker">
 
-        <module name="AbbreviationAsWordInName"/>
+        <module name="com.puppycrawl.tools.checkstyle.checks.naming.AbbreviationAsWordInNameCheck"/>
-<module name="AbstractClassName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.AbstractClassNameCheck"/>
-<module name="AnnotationLocation"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationLocationCheck"/>
-<module name="AnnotationUseStyle"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck"/>
-<module name="AnonInnerLength"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.sizes.AnonInnerLengthCheck"/>
-<module name="ArrayTypeStyle"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.ArrayTypeStyleCheck"/>
-<module name="AtclauseOrder">
+<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.AtclauseOrderCheck">
     <property name="tagOrder" value="@param, @author, @version, @serial, @return, @throws, @exception,             @serialData, @serialField, @see, @since, @deprecated"/>
 </module>
-<module name="AvoidEscapedUnicodeCharacters">
+<module name="com.puppycrawl.tools.checkstyle.checks.AvoidEscapedUnicodeCharactersCheck">
     <property name="allowEscapesForControlCharacters" value="true"/>
 </module>
-<module name="AvoidInlineConditionals"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.AvoidInlineConditionalsCheck"/>
-<module name="AvoidNestedBlocks"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.blocks.AvoidNestedBlocksCheck"/>
-<module name="AvoidStarImport"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.imports.AvoidStarImportCheck"/>
-<module name="AvoidStaticImport">
+<module name="com.puppycrawl.tools.checkstyle.checks.imports.AvoidStaticImportCheck">
     <property name="excludes" value="org.assertj.core.api.Assertions.assertThat,org.mockito.BDDMockito.given,org.mockito.Mockito.*,org.mockito.Matchers.*,org.mockito.Mockito.*"/>
 </module>
-<module name="BooleanExpressionComplexity">
+<module name="com.puppycrawl.tools.checkstyle.checks.metrics.BooleanExpressionComplexityCheck">
     <property name="max" value="2"/>
 </module>
-<module name="CatchParameterName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.CatchParameterNameCheck"/>
-<module name="ClassDataAbstractionCoupling"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.metrics.ClassDataAbstractionCouplingCheck"/>
-<module name="ClassFanOutComplexity"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.metrics.ClassFanOutComplexityCheck"/>
-<module name="ClassTypeParameterName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.ClassTypeParameterNameCheck"/>
-<module name="CommentsIndentation"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.indentation.CommentsIndentationCheck"/>
-<module name="ConstantName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck"/>
-<module name="CovariantEquals"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.CovariantEqualsCheck"/>
-<module name="CyclomaticComplexity">
+<module name="com.puppycrawl.tools.checkstyle.checks.metrics.CyclomaticComplexityCheck">
     <property name="max" value="5"/>
 </module>
-<module name="DeclarationOrder"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.DeclarationOrderCheck"/>
-<module name="DefaultComesLast"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.DefaultComesLastCheck"/>
-<module name="DesignForExtension"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.design.DesignForExtensionCheck"/>
-<module name="EmptyBlock"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.blocks.EmptyBlockCheck"/>
-<module name="EmptyCatchBlock">
+<module name="com.puppycrawl.tools.checkstyle.checks.blocks.EmptyCatchBlockCheck">
     <property name="commentFormat" value="expected|ignore"/>
 </module>
-<module name="EmptyForInitializerPad"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyForInitializerPadCheck"/>
-<module name="EmptyForIteratorPad"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyForIteratorPadCheck"/>
-<module name="EmptyLineSeparator"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyLineSeparatorCheck"/>
-<module name="EmptyStatement"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.EmptyStatementCheck"/>
-<module name="EqualsAvoidNull"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck"/>
-<module name="EqualsHashCode"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.EqualsHashCodeCheck"/>
-<module name="ExecutableStatementCount"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.sizes.ExecutableStatementCountCheck"/>
-<module name="ExplicitInitialization"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.ExplicitInitializationCheck"/>
-<module name="FallThrough"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.FallThroughCheck"/>
-<module name="FinalClass"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.design.FinalClassCheck"/>
-<module name="FinalParameters"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.FinalParametersCheck"/>
-<module name="GenericWhitespace"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.GenericWhitespaceCheck"/>
-<module name="HiddenField">
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.HiddenFieldCheck">
     <property name="ignoreConstructorParameter" value="true"/>
 <property name="ignoreSetter" value="true"/>
 </module>
-<module name="HideUtilityClassConstructor"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.design.HideUtilityClassConstructorCheck"/>
-<module name="IllegalCatch"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.IllegalCatchCheck"/>
-<module name="IllegalImport"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.imports.IllegalImportCheck"/>
-<module name="IllegalThrows"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.IllegalThrowsCheck"/>
-<module name="IllegalToken"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.IllegalTokenCheck"/>
-<module name="IllegalType">
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.IllegalTypeCheck">
     <property name="illegalClassNames" value="java.util.ArrayDeque, java.util.ArrayList, java.util.EnumMap, java.util.EnumSet, java.util.HashMap, java.util.HashSet, java.util.IdentityHashMap, java.util.LinkedHashMap, java.util.LinkedHashSet, java.util.LinkedList, java.util.PriorityQueue, java.util.TreeMap, java.util.TreeSet"/>
 </module>
-<module name="InnerAssignment"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.InnerAssignmentCheck"/>
-<module name="InnerTypeLast"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.design.InnerTypeLastCheck"/>
-<module name="InterfaceIsType"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.design.InterfaceIsTypeCheck"/>
-<module name="InterfaceTypeParameterName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.InterfaceTypeParameterNameCheck"/>
-<module name="JavadocMethod">
+<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck">
     <property name="allowMissingPropertyJavadoc" value="true"/>
 <property name="validateThrows" value="true"/>
 <property name="scope" value="package"/>
 </module>
-<module name="JavadocParagraph"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck"/>
-<module name="JavadocStyle"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck"/>
-<module name="JavadocType">
+<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck">
     <property name="authorFormat" value="^.+ (\S+@[\S.]+)$"/>
 </module>
-<module name="JavaNCSS">
+<module name="com.puppycrawl.tools.checkstyle.checks.metrics.JavaNCSSCheck">
     <property name="classMaximum" value="1200"/>
 <property name="fileMaximum" value="1600"/>
 <property name="methodMaximum" value="40"/>
 </module>
-<module name="LeftCurly"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyCheck"/>
-<module name="LineLength">
+<module name="com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck">
     <property name="max" value="120"/>
 </module>
-<module name="LocalFinalVariableName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.LocalFinalVariableNameCheck"/>
-<module name="LocalVariableName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck"/>
-<module name="MagicNumber"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.MagicNumberCheck"/>
-<module name="MemberName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck"/>
-<module name="MethodCount">
+<module name="com.puppycrawl.tools.checkstyle.checks.sizes.MethodCountCheck">
     <property name="maxTotal" value="30"/>
 </module>
-<module name="MethodLength">
+<module name="com.puppycrawl.tools.checkstyle.checks.sizes.MethodLengthCheck">
     <property name="max" value="40"/>
 </module>
-<module name="MethodName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.MethodNameCheck"/>
-<module name="MethodParamPad"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.MethodParamPadCheck"/>
-<module name="MethodTypeParameterName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.MethodTypeParameterNameCheck"/>
-<module name="MissingDeprecated"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.annotation.MissingDeprecatedCheck"/>
-<module name="MissingSwitchDefault"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.MissingSwitchDefaultCheck"/>
-<module name="ModifiedControlVariable">
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.ModifiedControlVariableCheck">
     <property name="skipEnhancedForLoopVariable" value="true"/>
 </module>
-<module name="ModifierOrder"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.modifier.ModifierOrderCheck"/>
-<module name="MultipleStringLiterals"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.MultipleStringLiteralsCheck"/>
-<module name="MultipleVariableDeclarations"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.MultipleVariableDeclarationsCheck"/>
-<module name="MutableException"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.design.MutableExceptionCheck"/>
-<module name="NeedBraces"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.blocks.NeedBracesCheck"/>
-<module name="NestedForDepth"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.NestedForDepthCheck"/>
-<module name="NestedIfDepth"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.NestedIfDepthCheck"/>
-<module name="NestedTryDepth">
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.NestedTryDepthCheck">
     <property name="max" value="0"/>
 </module>
-<module name="NoClone"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.NoCloneCheck"/>
-<module name="NoFinalizer"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.NoFinalizerCheck"/>
-<module name="NoLineWrap"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoLineWrapCheck"/>
-<module name="NonEmptyAtclauseDescription"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheck"/>
-<module name="NoWhitespaceAfter">
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceAfterCheck">
     <property name="tokens" value="DOT"/>
 <property name="allowLineBreaks" value="false"/>
 </module>
-<module name="NoWhitespaceBefore"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceBeforeCheck"/>
-<module name="NPathComplexity">
+<module name="com.puppycrawl.tools.checkstyle.checks.metrics.NPathComplexityCheck">
     <property name="max" value="5"/>
 </module>
-<module name="OneStatementPerLine"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.OneStatementPerLineCheck"/>
-<module name="OneTopLevelClass"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.design.OneTopLevelClassCheck"/>
-<module name="OperatorWrap"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.OperatorWrapCheck"/>
-<module name="OuterTypeFilename"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.OuterTypeFilenameCheck"/>
-<module name="OverloadMethodsDeclarationOrder"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.OverloadMethodsDeclarationOrderCheck"/>
-<module name="PackageAnnotation"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.annotation.PackageAnnotationCheck"/>
-<module name="PackageDeclaration"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.PackageDeclarationCheck"/>
-<module name="PackageName">
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck">
     <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]+)*$"/>
 </module>
-<module name="ParameterName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck"/>
-<module name="ParameterNumber">
+<module name="com.puppycrawl.tools.checkstyle.checks.sizes.ParameterNumberCheck">
     <property name="ignoreOverriddenMethods" value="true"/>
 </module>
-<module name="ParenPad"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.ParenPadCheck"/>
-<module name="RedundantModifier"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.modifier.RedundantModifierCheck"/>
-<module name="RequireThis">
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck">
     <property name="checkMethods" value="false"/>
 </module>
-<module name="ReturnCount"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.ReturnCountCheck"/>
-<module name="RightCurly"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.blocks.RightCurlyCheck"/>
-<module name="SeparatorWrap">
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.SeparatorWrapCheck">
     <property name="tokens" value="DOT"/>
 <property name="option" value="nl"/>
 </module>
-<module name="SimplifyBooleanExpression"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.SimplifyBooleanExpressionCheck"/>
-<module name="SimplifyBooleanReturn"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.SimplifyBooleanReturnCheck"/>
-<module name="SingleSpaceSeparator"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.SingleSpaceSeparatorCheck"/>
-<module name="StaticVariableName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.StaticVariableNameCheck"/>
-<module name="StringLiteralEquality"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.StringLiteralEqualityCheck"/>
-<module name="SuppressWarnings">
+<module name="com.puppycrawl.tools.checkstyle.checks.annotation.SuppressWarningsCheck">
     <property name="format" value="^constantname|covariantequals|equalshashcode|noclone|onetoplevelclass|outertypefilename|packagedeclaration|typename|visibilitymodifier$"/>
 </module>
-<module name="SuppressWarningsHolder"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.SuppressWarningsHolder"/>
-<module name="ThrowsCount"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.design.ThrowsCountCheck"/>
-<module name="TodoComment">
+<module name="com.puppycrawl.tools.checkstyle.checks.TodoCommentCheck">
     <property name="format" value="^(\s*\*).*((TODO)|(FIXME))"/>
 </module>
-<module name="TrailingComment"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.TrailingCommentCheck"/>
-<module name="TypecastParenPad"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.TypecastParenPadCheck"/>
-<module name="TypeName"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.naming.TypeNameCheck"/>
-<module name="UncommentedMain">
+<module name="com.puppycrawl.tools.checkstyle.checks.UncommentedMainCheck">
     <property name="excludedClasses" value="(Main|Application)$"/>
 </module>
-<module name="UnnecessaryParentheses"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.UnnecessaryParenthesesCheck"/>
-<module name="UnusedImports"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck"/>
-<module name="UpperEll"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.UpperEllCheck"/>
-<module name="VariableDeclarationUsageDistance"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.coding.VariableDeclarationUsageDistanceCheck"/>
-<module name="VisibilityModifier"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.design.VisibilityModifierCheck"/>
-<module name="WhitespaceAfter"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAfterCheck"/>
-<module name="WhitespaceAround"/>
+<module name="com.puppycrawl.tools.checkstyle.checks.whitespace.WhitespaceAroundCheck"/>
-<module name="AvoidConstantAsFirstOperandInCondition"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.AvoidConstantAsFirstOperandInConditionCheck"/>
-<module name="AvoidHidingCauseException"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.AvoidHidingCauseExceptionCheck"/>
-<module name="AvoidNotShortCircuitOperatorsForBoolean"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.AvoidNotShortCircuitOperatorsForBooleanCheck"/>
-<module name="ConfusingCondition"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.ConfusingConditionCheck"/>
-<module name="ConstructorWithoutParams"/>
+<module name="com.github.sevntu.checkstyle.checks.design.ConstructorWithoutParamsCheck"/>
-<module name="DiamondOperatorForVariableDefinition"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.DiamondOperatorForVariableDefinitionCheck"/>
-<module name="EitherLogOrThrow"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.EitherLogOrThrowCheck"/>
-<module name="EnumValueName"/>
+<module name="com.github.sevntu.checkstyle.checks.naming.EnumValueNameCheck"/>
-<module name="ForbidCCommentsInMethods"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.ForbidCCommentsInMethodsCheck"/>
-<module name="ForbidReturnInFinallyBlock"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.ForbidReturnInFinallyBlockCheck"/>
-<module name="ForbidWildcardAsReturnType"/>
+<module name="com.github.sevntu.checkstyle.checks.design.ForbidWildcardAsReturnTypeCheck"/>
-<module name="LogicConditionNeedOptimization"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.LogicConditionNeedOptimizationCheck"/>
-<module name="MapIterationInForEachLoop"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.MapIterationInForEachLoopCheck"/>
-<module name="NameConventionForJunit4TestClasses"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.NameConventionForJunit4TestClassesCheck"/>
-<module name="NestedSwitch"/>
+<module name="com.github.sevntu.checkstyle.checks.design.NestedSwitchCheck"/>
-<module name="NoMainMethodInAbstractClass"/>
+<module name="com.github.sevntu.checkstyle.checks.design.NoMainMethodInAbstractClassCheck"/>
-<module name="NumericLiteralNeedsUnderscore"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.NumericLiteralNeedsUnderscoreCheck"/>
-<module name="OverridableMethodInConstructor"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.OverridableMethodInConstructorCheck"/>
-<module name="PublicReferenceToPrivateType"/>
+<module name="com.github.sevntu.checkstyle.checks.design.PublicReferenceToPrivateTypeCheck"/>
-<module name="RedundantReturn"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.RedundantReturnCheck"/>
-<module name="ReturnBooleanFromTernary"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.ReturnBooleanFromTernaryCheck"/>
-<module name="ReturnNullInsteadOfBoolean"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.ReturnNullInsteadOfBooleanCheck"/>
-<module name="SimpleAccessorNameNotation"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.SimpleAccessorNameNotationCheck"/>
-<module name="SingleBreakOrContinue"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.SingleBreakOrContinueCheck"/>
-<module name="TernaryPerExpressionCount"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.TernaryPerExpressionCountCheck"/>
-<module name="UniformEnumConstantName"/>
+<module name="com.github.sevntu.checkstyle.checks.naming.UniformEnumConstantNameCheck"/>
-<module name="UselessSingleCatch"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.UselessSingleCatchCheck"/>
-<module name="UselessSuperCtorCall"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.UselessSuperCtorCallCheck"/>
-<module name="MoveVariableInsideIfCheck"/>
+<module name="com.github.sevntu.checkstyle.checks.coding.MoveVariableInsideIfCheck"/>
 
     </module><!-- /TreeWalker -->
 

sample-parent/pom.xml

@@ -14,7 +14,8 @@
     <description>Sample parent for modules that use kemitix-checkstyle-ruleset-maven-plugin</description>
 
     <properties>
-        <kemitix-checkstyle-ruleset-level>2-naming</kemitix-checkstyle-ruleset-level>
+        <kemitix-checkstyle-ruleset.version>${project.version}</kemitix-checkstyle-ruleset.version>
+        <kemitix-checkstyle-ruleset.level>5-complexity</kemitix-checkstyle-ruleset.level>
 
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -50,9 +51,9 @@
             <plugin>
                 <groupId>net.kemitix</groupId>
                 <artifactId>kemitix-checkstyle-ruleset-maven-plugin</artifactId>
-                <version>${project.version}</version>
+                <version>${kemitix-checkstyle-ruleset.version}</version>
                 <configuration>
-                    <level>${kemitix-checkstyle-ruleset-level}</level>
+                    <level>${kemitix-checkstyle-ruleset.level}</level>
                 </configuration>
                 <executions>
                     <execution>

travis-ci/travis-deploy.sh

@@ -1,10 +1,18 @@
 #!/usr/bin/env bash
 
 if [ "$TRAVIS_BRANCH" = 'master' ] && [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then
+	echo "Preparing to deploy to nexus..."
 	openssl aes-256-cbc -K $encrypted_efec3258f55d_key -iv $encrypted_efec3258f55d_iv \
 		-in travis-ci/codesigning.asc.enc -out travis-ci/codesigning.asc -d
+	echo "Signing key decrypted"
 	gpg --batch --fast-import travis-ci/codesigning.asc
+	echo "Signing key imported"
 	./mvnw --projects plugin,ruleset --settings travis-ci/travis-settings.xml \
 		-Dskip-Tests=true -P release -B deploy
+	echo "Deploy complete"
+else
+	echo "Not deploying"
+	echo "  TRAVIS_BRANCH: $TRAVIS_BRANCH"
+	echo "  TRAVIS_PULL_REQUEST: $TRAVIS_PULL_REQUEST"
 fi