From ee7eb75ffb01c6c77c9715d623c31eefe7a81fec Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Sun, 26 Aug 2018 15:49:02 +0100
Subject: [PATCH] ruleset: fix order of properties and adjust indentation

---
 .../checkstyle/ruleset/builder/Rule.java      |  6 +-
 .../net/kemitix/checkstyle-1-layout.xml       | 20 ++---
 .../net/kemitix/checkstyle-2-naming.xml       | 24 +++---
 .../net/kemitix/checkstyle-3-javadoc.xml      | 36 ++++-----
 .../net/kemitix/checkstyle-4-tweaks.xml       | 52 ++++++-------
 .../net/kemitix/checkstyle-5-complexity.xml   | 74 +++++++++----------
 6 files changed, 107 insertions(+), 105 deletions(-)

diff --git a/builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/Rule.java b/builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/Rule.java
index 30848f7..73323a8 100644
--- a/builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/Rule.java
+++ b/builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/Rule.java
@@ -27,6 +27,7 @@ import lombok.Setter;
 import net.kemitix.conditional.Value;
 
 import java.net.URI;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -46,7 +47,7 @@ public class Rule {
 
     private static final String MODULE_NO_PROPERTIES = "<module name=\"%s\"/>";
 
-    private static final String MODULE_WITH_PROPERTIES = "<module name=\"%s\">%n    %s%n</module>";
+    private static final String MODULE_WITH_PROPERTIES = "<module name=\"%s\">%n%s%n</module>";
 
     /**
      * Configuration properties.
@@ -133,7 +134,8 @@ public class Rule {
 
     private static String formatProperties(final Map<String, String> properties) {
         return MapStream.of(properties)
-                .map((k, v) -> String.format("<property name=\"%s\" value=\"%s\"/>", k, v))
+                .sorted(Comparator.comparing(Map.Entry::getKey))
+                .map((k, v) -> String.format("        <property name=\"%s\" value=\"%s\"/>", k, v))
                 .collect(Collectors.joining(System.lineSeparator()));
     }
 
diff --git a/ruleset/src/main/resources/net/kemitix/checkstyle-1-layout.xml b/ruleset/src/main/resources/net/kemitix/checkstyle-1-layout.xml
index 5378d67..8dffd66 100644
--- a/ruleset/src/main/resources/net/kemitix/checkstyle-1-layout.xml
+++ b/ruleset/src/main/resources/net/kemitix/checkstyle-1-layout.xml
@@ -5,16 +5,16 @@
 <module name="Checker">
 
     <module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpOnFilenameCheck">
-    <property name="fileNamePattern" value="(.sync-conflict-| conflicted copy )"/>
-<property name="match" value="true"/>
+        <property name="fileNamePattern" value="(.sync-conflict-| conflicted copy )"/>
+        <property name="match" value="true"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.FileTabCharacterCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck">
-    <property name="fileExtensions" value="java"/>
-<property name="headerFile" value="LICENSE.txt"/>
+        <property name="fileExtensions" value="java"/>
+        <property name="headerFile" value="LICENSE.txt"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck">
-    <property name="lineSeparator" value="lf"/>
+        <property name="lineSeparator" value="lf"/>
 </module>
 
     <module name="TreeWalker">
@@ -30,13 +30,13 @@
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.GenericWhitespaceCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck">
-    <property name="max" value="120"/>
+        <property name="max" value="120"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.MethodParamPadCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoLineWrapCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceAfterCheck">
-    <property name="tokens" value="DOT"/>
-<property name="allowLineBreaks" value="false"/>
+        <property name="allowLineBreaks" value="false"/>
+        <property name="tokens" value="DOT"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceBeforeCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.OneStatementPerLineCheck"/>
@@ -45,8 +45,8 @@
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.ParenPadCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.blocks.RightCurlyCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.SeparatorWrapCheck">
-    <property name="tokens" value="DOT"/>
-<property name="option" value="nl"/>
+        <property name="option" value="nl"/>
+        <property name="tokens" value="DOT"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.SingleSpaceSeparatorCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.TrailingCommentCheck"/>
diff --git a/ruleset/src/main/resources/net/kemitix/checkstyle-2-naming.xml b/ruleset/src/main/resources/net/kemitix/checkstyle-2-naming.xml
index 4125034..6140730 100644
--- a/ruleset/src/main/resources/net/kemitix/checkstyle-2-naming.xml
+++ b/ruleset/src/main/resources/net/kemitix/checkstyle-2-naming.xml
@@ -5,16 +5,16 @@
 <module name="Checker">
 
     <module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpOnFilenameCheck">
-    <property name="fileNamePattern" value="(.sync-conflict-| conflicted copy )"/>
-<property name="match" value="true"/>
+        <property name="fileNamePattern" value="(.sync-conflict-| conflicted copy )"/>
+        <property name="match" value="true"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.FileTabCharacterCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck">
-    <property name="fileExtensions" value="java"/>
-<property name="headerFile" value="LICENSE.txt"/>
+        <property name="fileExtensions" value="java"/>
+        <property name="headerFile" value="LICENSE.txt"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck">
-    <property name="lineSeparator" value="lf"/>
+        <property name="lineSeparator" value="lf"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.filters.SuppressWarningsFilter"/>
 
@@ -37,7 +37,7 @@
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.InterfaceTypeParameterNameCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck">
-    <property name="max" value="120"/>
+        <property name="max" value="120"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.LocalFinalVariableNameCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck"/>
@@ -52,27 +52,27 @@
 <module name="com.puppycrawl.tools.checkstyle.checks.blocks.NeedBracesCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoLineWrapCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceAfterCheck">
-    <property name="tokens" value="DOT"/>
-<property name="allowLineBreaks" value="false"/>
+        <property name="allowLineBreaks" value="false"/>
+        <property name="tokens" value="DOT"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceBeforeCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.OneStatementPerLineCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.OperatorWrapCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.OverloadMethodsDeclarationOrderCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck">
-    <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]+)*$"/>
+        <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]+)*$"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.ParenPadCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.blocks.RightCurlyCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.SeparatorWrapCheck">
-    <property name="tokens" value="DOT"/>
-<property name="option" value="nl"/>
+        <property name="option" value="nl"/>
+        <property name="tokens" value="DOT"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.SingleSpaceSeparatorCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.StaticVariableNameCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.annotation.SuppressWarningsCheck">
-    <property name="format" value="^constantname|covariantequals|equalshashcode|noclone|onetoplevelclass|outertypefilename|packagedeclaration|typename|visibilitymodifier$"/>
+        <property name="format" value="^constantname|covariantequals|equalshashcode|noclone|onetoplevelclass|outertypefilename|packagedeclaration|typename|visibilitymodifier$"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.SuppressWarningsHolder"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.TrailingCommentCheck"/>
diff --git a/ruleset/src/main/resources/net/kemitix/checkstyle-3-javadoc.xml b/ruleset/src/main/resources/net/kemitix/checkstyle-3-javadoc.xml
index 2463ad3..073357f 100644
--- a/ruleset/src/main/resources/net/kemitix/checkstyle-3-javadoc.xml
+++ b/ruleset/src/main/resources/net/kemitix/checkstyle-3-javadoc.xml
@@ -5,17 +5,17 @@
 <module name="Checker">
 
     <module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpOnFilenameCheck">
-    <property name="fileNamePattern" value="(.sync-conflict-| conflicted copy )"/>
-<property name="match" value="true"/>
+        <property name="fileNamePattern" value="(.sync-conflict-| conflicted copy )"/>
+        <property name="match" value="true"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.FileTabCharacterCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck">
-    <property name="fileExtensions" value="java"/>
-<property name="headerFile" value="LICENSE.txt"/>
+        <property name="fileExtensions" value="java"/>
+        <property name="headerFile" value="LICENSE.txt"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocPackageCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck">
-    <property name="lineSeparator" value="lf"/>
+        <property name="lineSeparator" value="lf"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.filters.SuppressWarningsFilter"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.TranslationCheck"/>
@@ -29,7 +29,7 @@
 <module name="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.ArrayTypeStyleCheck"/>
 <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"/>
+        <property name="tagOrder" value="@param, @author, @version, @serial, @return, @throws, @exception,             @serialData, @serialField, @see, @since, @deprecated"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.CatchParameterNameCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.ClassTypeParameterNameCheck"/>
@@ -43,16 +43,16 @@
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.GenericWhitespaceCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.InterfaceTypeParameterNameCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck">
-    <property name="allowMissingPropertyJavadoc" value="true"/>
-<property name="validateThrows" value="true"/>
-<property name="scope" value="package"/>
+        <property name="allowMissingPropertyJavadoc" value="true"/>
+        <property name="scope" value="package"/>
+        <property name="validateThrows" value="true"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck">
-    <property name="max" value="120"/>
+        <property name="max" value="120"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.LocalFinalVariableNameCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck"/>
@@ -69,8 +69,8 @@
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoLineWrapCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceAfterCheck">
-    <property name="tokens" value="DOT"/>
-<property name="allowLineBreaks" value="false"/>
+        <property name="allowLineBreaks" value="false"/>
+        <property name="tokens" value="DOT"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceBeforeCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.OneStatementPerLineCheck"/>
@@ -78,29 +78,29 @@
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.OverloadMethodsDeclarationOrderCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.PackageDeclarationCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck">
-    <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]+)*$"/>
+        <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]+)*$"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.ParenPadCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.blocks.RightCurlyCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.SeparatorWrapCheck">
-    <property name="tokens" value="DOT"/>
-<property name="option" value="nl"/>
+        <property name="option" value="nl"/>
+        <property name="tokens" value="DOT"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.SingleSpaceSeparatorCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.StaticVariableNameCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.annotation.SuppressWarningsCheck">
-    <property name="format" value="^constantname|covariantequals|equalshashcode|noclone|onetoplevelclass|outertypefilename|packagedeclaration|typename|visibilitymodifier$"/>
+        <property name="format" value="^constantname|covariantequals|equalshashcode|noclone|onetoplevelclass|outertypefilename|packagedeclaration|typename|visibilitymodifier$"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.SuppressWarningsHolder"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.TodoCommentCheck">
-    <property name="format" value="^(\s*\*).*((TODO)|(FIXME))"/>
+        <property name="format" value="^(\s*\*).*((TODO)|(FIXME))"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.TrailingCommentCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.TypecastParenPadCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.TypeNameCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.UncommentedMainCheck">
-    <property name="excludedClasses" value="(Main|Application)$"/>
+        <property name="excludedClasses" value="(Main|Application)$"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.UnnecessaryParenthesesCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck"/>
diff --git a/ruleset/src/main/resources/net/kemitix/checkstyle-4-tweaks.xml b/ruleset/src/main/resources/net/kemitix/checkstyle-4-tweaks.xml
index c30f4f8..4507b73 100644
--- a/ruleset/src/main/resources/net/kemitix/checkstyle-4-tweaks.xml
+++ b/ruleset/src/main/resources/net/kemitix/checkstyle-4-tweaks.xml
@@ -5,17 +5,17 @@
 <module name="Checker">
 
     <module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpOnFilenameCheck">
-    <property name="fileNamePattern" value="(.sync-conflict-| conflicted copy )"/>
-<property name="match" value="true"/>
+        <property name="fileNamePattern" value="(.sync-conflict-| conflicted copy )"/>
+        <property name="match" value="true"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.FileTabCharacterCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck">
-    <property name="fileExtensions" value="java"/>
-<property name="headerFile" value="LICENSE.txt"/>
+        <property name="fileExtensions" value="java"/>
+        <property name="headerFile" value="LICENSE.txt"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocPackageCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck">
-    <property name="lineSeparator" value="lf"/>
+        <property name="lineSeparator" value="lf"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.filters.SuppressWarningsFilter"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.TranslationCheck"/>
@@ -29,10 +29,10 @@
 <module name="com.puppycrawl.tools.checkstyle.checks.annotation.AnnotationUseStyleCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.ArrayTypeStyleCheck"/>
 <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"/>
+        <property name="tagOrder" value="@param, @author, @version, @serial, @return, @throws, @exception,             @serialData, @serialField, @see, @since, @deprecated"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.AvoidEscapedUnicodeCharactersCheck">
-    <property name="allowEscapesForControlCharacters" value="true"/>
+        <property name="allowEscapesForControlCharacters" value="true"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.CatchParameterNameCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.ClassTypeParameterNameCheck"/>
@@ -42,21 +42,21 @@
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.DefaultComesLastCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.blocks.EmptyBlockCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.blocks.EmptyCatchBlockCheck">
-    <property name="commentFormat" value="expected|ignore"/>
+        <property name="commentFormat" value="expected|ignore"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyForInitializerPadCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyForIteratorPadCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.EmptyStatementCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.EqualsAvoidNullCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.ExplicitInitializationCheck">
-    <property name="onlyObjectReferences" value="true"/>
+        <property name="onlyObjectReferences" value="true"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.FallThroughCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.FinalParametersCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.GenericWhitespaceCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.HiddenFieldCheck">
-    <property name="ignoreConstructorParameter" value="true"/>
-<property name="ignoreSetter" value="true"/>
+        <property name="ignoreConstructorParameter" value="true"/>
+        <property name="ignoreSetter" value="true"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.design.HideUtilityClassConstructorCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.IllegalCatchCheck"/>
@@ -64,22 +64,22 @@
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.IllegalThrowsCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.IllegalTokenCheck"/>
 <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"/>
+        <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="com.puppycrawl.tools.checkstyle.checks.coding.InnerAssignmentCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.design.InnerTypeLastCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.InterfaceTypeParameterNameCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck">
-    <property name="allowMissingPropertyJavadoc" value="true"/>
-<property name="validateThrows" value="true"/>
-<property name="scope" value="package"/>
+        <property name="allowMissingPropertyJavadoc" value="true"/>
+        <property name="scope" value="package"/>
+        <property name="validateThrows" value="true"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck">
-    <property name="max" value="120"/>
+        <property name="max" value="120"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.LocalFinalVariableNameCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck"/>
@@ -91,7 +91,7 @@
 <module name="com.puppycrawl.tools.checkstyle.checks.annotation.MissingDeprecatedCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.MissingSwitchDefaultCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.ModifiedControlVariableCheck">
-    <property name="skipEnhancedForLoopVariable" value="true"/>
+        <property name="skipEnhancedForLoopVariable" value="true"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.modifier.ModifierOrderCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.MultipleStringLiteralsCheck"/>
@@ -103,8 +103,8 @@
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoLineWrapCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceAfterCheck">
-    <property name="tokens" value="DOT"/>
-<property name="allowLineBreaks" value="false"/>
+        <property name="allowLineBreaks" value="false"/>
+        <property name="tokens" value="DOT"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceBeforeCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.OneStatementPerLineCheck"/>
@@ -115,34 +115,34 @@
 <module name="com.puppycrawl.tools.checkstyle.checks.annotation.PackageAnnotationCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.PackageDeclarationCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck">
-    <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]+)*$"/>
+        <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]+)*$"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.ParenPadCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.modifier.RedundantModifierCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck">
-    <property name="checkMethods" value="false"/>
+        <property name="checkMethods" value="false"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.blocks.RightCurlyCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.SeparatorWrapCheck">
-    <property name="tokens" value="DOT"/>
-<property name="option" value="nl"/>
+        <property name="option" value="nl"/>
+        <property name="tokens" value="DOT"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.SingleSpaceSeparatorCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.StaticVariableNameCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.StringLiteralEqualityCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.annotation.SuppressWarningsCheck">
-    <property name="format" value="^constantname|covariantequals|equalshashcode|noclone|onetoplevelclass|outertypefilename|packagedeclaration|typename|visibilitymodifier$"/>
+        <property name="format" value="^constantname|covariantequals|equalshashcode|noclone|onetoplevelclass|outertypefilename|packagedeclaration|typename|visibilitymodifier$"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.SuppressWarningsHolder"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.TodoCommentCheck">
-    <property name="format" value="^(\s*\*).*((TODO)|(FIXME))"/>
+        <property name="format" value="^(\s*\*).*((TODO)|(FIXME))"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.TrailingCommentCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.TypecastParenPadCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.TypeNameCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.UncommentedMainCheck">
-    <property name="excludedClasses" value="(Main|Application)$"/>
+        <property name="excludedClasses" value="(Main|Application)$"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.UnnecessaryParenthesesCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck"/>
diff --git a/ruleset/src/main/resources/net/kemitix/checkstyle-5-complexity.xml b/ruleset/src/main/resources/net/kemitix/checkstyle-5-complexity.xml
index 374a07f..aff64d6 100644
--- a/ruleset/src/main/resources/net/kemitix/checkstyle-5-complexity.xml
+++ b/ruleset/src/main/resources/net/kemitix/checkstyle-5-complexity.xml
@@ -5,20 +5,20 @@
 <module name="Checker">
 
     <module name="com.puppycrawl.tools.checkstyle.checks.regexp.RegexpOnFilenameCheck">
-    <property name="fileNamePattern" value="(.sync-conflict-| conflicted copy )"/>
-<property name="match" value="true"/>
+        <property name="fileNamePattern" value="(.sync-conflict-| conflicted copy )"/>
+        <property name="match" value="true"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.sizes.FileLengthCheck">
-    <property name="max" value="500"/>
+        <property name="max" value="500"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.FileTabCharacterCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.header.HeaderCheck">
-    <property name="fileExtensions" value="java"/>
-<property name="headerFile" value="LICENSE.txt"/>
+        <property name="fileExtensions" value="java"/>
+        <property name="headerFile" value="LICENSE.txt"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocPackageCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.NewlineAtEndOfFileCheck">
-    <property name="lineSeparator" value="lf"/>
+        <property name="lineSeparator" value="lf"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.filters.SuppressWarningsFilter"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.TranslationCheck"/>
@@ -33,15 +33,15 @@
 <module name="com.puppycrawl.tools.checkstyle.checks.sizes.AnonInnerLengthCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.ArrayTypeStyleCheck"/>
 <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"/>
+        <property name="tagOrder" value="@param, @author, @version, @serial, @return, @throws, @exception,             @serialData, @serialField, @see, @since, @deprecated"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.AvoidEscapedUnicodeCharactersCheck">
-    <property name="allowEscapesForControlCharacters" value="true"/>
+        <property name="allowEscapesForControlCharacters" value="true"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.AvoidInlineConditionalsCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.blocks.AvoidNestedBlocksCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.metrics.BooleanExpressionComplexityCheck">
-    <property name="max" value="2"/>
+        <property name="max" value="2"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.CatchParameterNameCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.metrics.ClassDataAbstractionCouplingCheck"/>
@@ -51,14 +51,14 @@
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.ConstantNameCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.CovariantEqualsCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.metrics.CyclomaticComplexityCheck">
-    <property name="max" value="5"/>
+        <property name="max" value="5"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.DeclarationOrderCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.DefaultComesLastCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.design.DesignForExtensionCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.blocks.EmptyBlockCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.blocks.EmptyCatchBlockCheck">
-    <property name="commentFormat" value="expected|ignore"/>
+        <property name="commentFormat" value="expected|ignore"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyForInitializerPadCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.EmptyForIteratorPadCheck"/>
@@ -67,15 +67,15 @@
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.EqualsHashCodeCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.sizes.ExecutableStatementCountCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.ExplicitInitializationCheck">
-    <property name="onlyObjectReferences" value="true"/>
+        <property name="onlyObjectReferences" value="true"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.FallThroughCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.design.FinalClassCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.FinalParametersCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.GenericWhitespaceCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.HiddenFieldCheck">
-    <property name="ignoreConstructorParameter" value="true"/>
-<property name="ignoreSetter" value="true"/>
+        <property name="ignoreConstructorParameter" value="true"/>
+        <property name="ignoreSetter" value="true"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.design.HideUtilityClassConstructorCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.IllegalCatchCheck"/>
@@ -83,38 +83,38 @@
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.IllegalThrowsCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.IllegalTokenCheck"/>
 <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"/>
+        <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="com.puppycrawl.tools.checkstyle.checks.coding.InnerAssignmentCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.design.InnerTypeLastCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.design.InterfaceIsTypeCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.InterfaceTypeParameterNameCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocMethodCheck">
-    <property name="allowMissingPropertyJavadoc" value="true"/>
-<property name="validateThrows" value="true"/>
-<property name="scope" value="package"/>
+        <property name="allowMissingPropertyJavadoc" value="true"/>
+        <property name="scope" value="package"/>
+        <property name="validateThrows" value="true"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocParagraphCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocStyleCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.JavadocTypeCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.metrics.JavaNCSSCheck">
-    <property name="classMaximum" value="250"/>
-<property name="fileMaximum" value="250"/>
-<property name="methodMaximum" value="12"/>
+        <property name="classMaximum" value="250"/>
+        <property name="fileMaximum" value="250"/>
+        <property name="methodMaximum" value="12"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.blocks.LeftCurlyCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.sizes.LineLengthCheck">
-    <property name="max" value="120"/>
+        <property name="max" value="120"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.LocalFinalVariableNameCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.LocalVariableNameCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.MagicNumberCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.MemberNameCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.sizes.MethodCountCheck">
-    <property name="maxTotal" value="10"/>
+        <property name="maxTotal" value="10"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.sizes.MethodLengthCheck">
-    <property name="max" value="30"/>
+        <property name="max" value="30"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.MethodNameCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.MethodParamPadCheck"/>
@@ -122,7 +122,7 @@
 <module name="com.puppycrawl.tools.checkstyle.checks.annotation.MissingDeprecatedCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.MissingSwitchDefaultCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.ModifiedControlVariableCheck">
-    <property name="skipEnhancedForLoopVariable" value="true"/>
+        <property name="skipEnhancedForLoopVariable" value="true"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.modifier.ModifierOrderCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.MultipleStringLiteralsCheck"/>
@@ -132,19 +132,19 @@
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.NestedForDepthCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.NestedIfDepthCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.NestedTryDepthCheck">
-    <property name="max" value="0"/>
+        <property name="max" value="0"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.NoCloneCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.NoFinalizerCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoLineWrapCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.javadoc.NonEmptyAtclauseDescriptionCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceAfterCheck">
-    <property name="tokens" value="DOT"/>
-<property name="allowLineBreaks" value="false"/>
+        <property name="allowLineBreaks" value="false"/>
+        <property name="tokens" value="DOT"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.NoWhitespaceBeforeCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.metrics.NPathComplexityCheck">
-    <property name="max" value="5"/>
+        <property name="max" value="5"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.OneStatementPerLineCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.design.OneTopLevelClassCheck"/>
@@ -154,22 +154,22 @@
 <module name="com.puppycrawl.tools.checkstyle.checks.annotation.PackageAnnotationCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.PackageDeclarationCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.PackageNameCheck">
-    <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]+)*$"/>
+        <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]+)*$"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.ParameterNameCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.sizes.ParameterNumberCheck">
-    <property name="ignoreOverriddenMethods" value="true"/>
+        <property name="ignoreOverriddenMethods" value="true"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.ParenPadCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.modifier.RedundantModifierCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.RequireThisCheck">
-    <property name="checkMethods" value="false"/>
+        <property name="checkMethods" value="false"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.ReturnCountCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.blocks.RightCurlyCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.SeparatorWrapCheck">
-    <property name="tokens" value="DOT"/>
-<property name="option" value="nl"/>
+        <property name="option" value="nl"/>
+        <property name="tokens" value="DOT"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.SimplifyBooleanExpressionCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.SimplifyBooleanReturnCheck"/>
@@ -177,18 +177,18 @@
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.StaticVariableNameCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.StringLiteralEqualityCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.annotation.SuppressWarningsCheck">
-    <property name="format" value="^constantname|covariantequals|equalshashcode|noclone|onetoplevelclass|outertypefilename|packagedeclaration|typename|visibilitymodifier$"/>
+        <property name="format" value="^constantname|covariantequals|equalshashcode|noclone|onetoplevelclass|outertypefilename|packagedeclaration|typename|visibilitymodifier$"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.SuppressWarningsHolder"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.design.ThrowsCountCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.TodoCommentCheck">
-    <property name="format" value="^(\s*\*).*((TODO)|(FIXME))"/>
+        <property name="format" value="^(\s*\*).*((TODO)|(FIXME))"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.TrailingCommentCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.whitespace.TypecastParenPadCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.naming.TypeNameCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.UncommentedMainCheck">
-    <property name="excludedClasses" value="(Main|Application)$"/>
+        <property name="excludedClasses" value="(Main|Application)$"/>
 </module>
 <module name="com.puppycrawl.tools.checkstyle.checks.coding.UnnecessaryParenthesesCheck"/>
 <module name="com.puppycrawl.tools.checkstyle.checks.imports.UnusedImportsCheck"/>